Changeset 24358 in main


Ignore:
Timestamp:
12/22/21 14:35:29 (8 months ago)
Author:
LoisHaggard_STG
Message:

HI 3.0 hhdw-content yrbs adding geo section for state so state will show up in disiplay-by step

Location:
adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs
Files:
202 edited
1 moved

Legend:

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

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>AbusedByDate_HS_ST</NAME>
    46                         <TITLE>Physical abuse - by partner, past 12 months, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Physical abuse - by partner, past 12 months, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/AbusedByDate.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Physical abuse - by partner, past 12 months</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
    10498                <CONFIGURATION><NAME>AbusedByDate_MS_ST</NAME>
    105                         <TITLE>Physical abuse - by partner, past 12 months, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     99                        <TITLE>Physical abuse - by partner, past 12 months, Middle Schools, State-level</TITLE>
    106100                        <DESCRIPTION><ibis:include href="text/AbusedByDate.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     103                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    110104                        <MEASURE_TITLE_OVERRIDE>Physical abuse - by partner, past 12 months</MEASURE_TITLE_OVERRIDE>
    111105                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    152146                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    153147                        </DATA_ISSUES>
    154                         <CRITERIA>
    155                                 <EXCLUDE>
    156                                         <MAP_NAMES>
    157                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    158                                         </MAP_NAMES>
    159                                 </EXCLUDE>
    160                         </CRITERIA>
     148                        <CRITERIA/>
    161149                </CONFIGURATION>
    162150
     
    164152                        <TITLE>Physical abuse - by partner, past 12 months, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    165153                        <DESCRIPTION><ibis:include href="text/AbusedByDate.xml"/></DESCRIPTION>
    166                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     154                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    167155                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    168156                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    222210                </CONFIGURATION>
    223211                <CONFIGURATION><NAME>AbusedByDate_MS_CNTY</NAME>
    224                         <TITLE>Physical abuse - by partner, past 12 months, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     212                        <TITLE>Physical abuse - by partner, past 12 months, Middle Schools, County-level</TITLE>
    225213                        <DESCRIPTION><ibis:include href="text/AbusedByDate.xml"/></DESCRIPTION>
    226                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     214                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    227215                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    228216                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    322310               
    323311                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="AbusedByDate_HS_CNTY,AbusedByDate_MS_CNTY"/>
    324                 <ibis:include href="dimension/State.xml" configuration-name-list="AbusedByDate_HS_ST,AbusedByDate_MS_ST"/>
     312                <ibis:include href="dimension/GeoState.xml" configuration-name-list="AbusedByDate_HS_ST,AbusedByDate_MS_ST"/>
    325313                <ibis:include href="dimension/GradeProxy.xml"/>
    326314                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="AbusedByDate_HS_ST,AbusedByDate_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/AdultCare.xml

    r24300 r24358  
    4444               
    4545                <CONFIGURATION><NAME>AdultCare_MS_ST</NAME>
    46                         <TITLE>Support - adult who really cares at school, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Support - adult who really cares at school, Middle Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/AdultCare.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Support - adult who really cares at school</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    103103               
    104104                <CONFIGURATION><NAME>AdultCare_MS_CNTY</NAME>
    105                         <TITLE>Support - adult who really cares at school, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     105                        <TITLE>Support - adult who really cares at school, Middle Schools, County-level</TITLE>
    106106                        <DESCRIPTION><ibis:include href="text/AdultCare.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     107                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    108108                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109109                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    202202               
    203203                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="AdultCare_MS_CNTY"/>
    204                 <ibis:include href="dimension/State.xml" configuration-name-list="AdultCare_MS_ST"/>
     204                <ibis:include href="dimension/GeoState.xml" configuration-name-list="AdultCare_MS_ST"/>
    205205                <ibis:include href="dimension/GradeProxy.xml"/>
    206206                <ibis:include href="dimension/GradeMS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/AdultTalk.xml

    r24302 r24358  
    4444
    4545                <CONFIGURATION><NAME>AdultTalk_HS_ST</NAME>
    46                         <TITLE>Support - adult or teacher at school, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Support - adult or teacher at school, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/AdultTalk.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                        <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Support - adult or teacher at school</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
    10498                <CONFIGURATION><NAME>AdultTalk_MS_ST</NAME>
    105                         <TITLE>Support - adult or teacher at school, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     99                        <TITLE>Support - adult or teacher at school, Middle Schools, State-level</TITLE>
    106100                        <DESCRIPTION><ibis:include href="text/AdultTalk.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     103                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    110104                        <MEASURE_TITLE_OVERRIDE>Support - adult or teacher at school</MEASURE_TITLE_OVERRIDE>
    111105                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    152146                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    153147                        </DATA_ISSUES>
    154                         <CRITERIA>
    155                                 <EXCLUDE>
    156                                         <MAP_NAMES>
    157                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    158                                         </MAP_NAMES>
    159                                 </EXCLUDE>
    160                         </CRITERIA>
     148                        <CRITERIA/>
    161149                </CONFIGURATION>
    162150
     
    164152                        <TITLE>Support - adult or teacher at school, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    165153                        <DESCRIPTION><ibis:include href="text/AdultTalk.xml"/></DESCRIPTION>
    166                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     154                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    167155                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    168156                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    229217                </CONFIGURATION>
    230218                <CONFIGURATION><NAME>AdultTalk_MS_CNTY</NAME>
    231                         <TITLE>Support - adult or teacher at school, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     219                        <TITLE>Support - adult or teacher at school, Middle Schools, County-level</TITLE>
    232220                        <DESCRIPTION><ibis:include href="text/AdultTalk.xml"/></DESCRIPTION>
    233                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     221                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    234222                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    235223                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    312300                        <!-- Include all other sections needed for this module, and excluded unwanted sections as needed in each configuration -->
    313301                        <ibis:include href="section/Geo.xml" configuration-name-list="AdultTalk_HS_CNTY,AdultTalk_MS_CNTY"/>
     302                        <ibis:include href="section/Geo_ST.xml" configuration-name-list="AdultTalk_HS_ST,AdultTalk_MS_ST"/>
    314303                        <ibis:include href="section/YearOdd_09_19.xml" configuration-name-list="AdultTalk_HS_ST,AdultTalk_HS_CNTY"/>
    315304                        <ibis:include href="section/YearOdd_11_19.xml" configuration-name-list="AdultTalk_MS_ST,AdultTalk_MS_CNTY"/>
     
    331320               
    332321                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="AdultTalk_HS_CNTY,AdultTalk_MS_CNTY"/>
    333                 <ibis:include href="dimension/State.xml" configuration-name-list="AdultTalk_HS_ST,AdultTalk_MS_ST"/>
     322                <ibis:include href="dimension/GeoState.xml" configuration-name-list="AdultTalk_HS_ST,AdultTalk_MS_ST"/>
    334323                <ibis:include href="dimension/GradeProxy.xml"/>
    335324                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="AdultTalk_HS_ST,AdultTalk_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/AlcoholAtSchool.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>AlcoholAtSchool_HS_ST</NAME>
    46                         <TITLE>Alcohol - on school property, past 30 days, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Alcohol - on school property, past 30 days, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/AlcoholAtSchool.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Alcohol - on school property, past 30 days</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
    10498                <CONFIGURATION><NAME>AlcoholAtSchool_MS_ST</NAME>
    105                         <TITLE>Alcohol - on school property, past 30 days, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     99                        <TITLE>Alcohol - on school property, past 30 days, Middle Schools, State-level</TITLE>
    106100                        <DESCRIPTION><ibis:include href="text/AlcoholAtSchool.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     103                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    110104                        <MEASURE_TITLE_OVERRIDE>Alcohol - on school property, past 30 days</MEASURE_TITLE_OVERRIDE>
    111105                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    152146                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    153147                        </DATA_ISSUES>
    154                         <CRITERIA>
    155                                 <EXCLUDE>
    156                                         <MAP_NAMES>
    157                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    158                                         </MAP_NAMES>
    159                                 </EXCLUDE>
    160                         </CRITERIA>
     148                        <CRITERIA/>
    161149                </CONFIGURATION>
    162150
     
    164152                        <TITLE>Alcohol - on school property, past 30 days, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    165153                        <DESCRIPTION><ibis:include href="text/AlcoholAtSchool.xml"/></DESCRIPTION>
    166                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     154                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    167155                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    168156                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    228216                </CONFIGURATION>
    229217                <CONFIGURATION><NAME>AlcoholAtSchool_MS_CNTY</NAME>
    230                         <TITLE>Alcohol - on school property, past 30 days, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     218                        <TITLE>Alcohol - on school property, past 30 days, Middle Schools, County-level</TITLE>
    231219                        <DESCRIPTION><ibis:include href="text/AlcoholAtSchool.xml"/></DESCRIPTION>
    232                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     220                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    233221                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    234222                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    333321               
    334322                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="AlcoholAtSchool_HS_CNTY,AlcoholAtSchool_MS_CNTY"/>
    335                 <ibis:include href="dimension/State.xml" configuration-name-list="AlcoholAtSchool_HS_ST,AlcoholAtSchool_MS_ST"/>
     323                <ibis:include href="dimension/GeoState.xml" configuration-name-list="AlcoholAtSchool_HS_ST,AlcoholAtSchool_MS_ST"/>
    336324                <ibis:include href="dimension/GradeProxy.xml"/>
    337325                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="AlcoholAtSchool_HS_ST,AlcoholAtSchool_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/AlcoholB413.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>AlcoholB413_HS_ST</NAME>
    46                         <TITLE>Alcohol - first drink before age 13, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Alcohol - first drink before age 13, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/AlcoholB413.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Alcohol - first drink before age 13</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
    10498                <CONFIGURATION><NAME>AlcoholB413_MS_ST</NAME>
    105                         <TITLE>Alcohol - first drink before age 13, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     99                        <TITLE>Alcohol - first drink before age 13, Middle Schools, State-level</TITLE>
    106100                        <DESCRIPTION><ibis:include href="text/AlcoholB413.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     103                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    110104                        <MEASURE_TITLE_OVERRIDE>Alcohol - first drink before age 13</MEASURE_TITLE_OVERRIDE>
    111105                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    152146                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    153147                        </DATA_ISSUES>
    154                         <CRITERIA>
    155                                 <EXCLUDE>
    156                                         <MAP_NAMES>
    157                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    158                                         </MAP_NAMES>
    159                                 </EXCLUDE>
    160                         </CRITERIA>
     148                        <CRITERIA/>
    161149                </CONFIGURATION>
    162150
     
    164152                        <TITLE>Alcohol - first drink before age 13, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    165153                        <DESCRIPTION><ibis:include href="text/AlcoholB413.xml"/></DESCRIPTION>
    166                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     154                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    167155                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    168156                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    232220               
    233221                <CONFIGURATION><NAME>AlcoholB413_MS_CNTY</NAME>
    234                         <TITLE>Alcohol - first drink before age 13, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     222                        <TITLE>Alcohol - first drink before age 13, Middle Schools, County-level</TITLE>
    235223                        <DESCRIPTION><ibis:include href="text/AlcoholB413.xml"/></DESCRIPTION>
    236                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     224                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    237225                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    238226                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    341329               
    342330                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="AlcoholB413_HS_CNTY,AlcoholB413_MS_CNTY"/>
    343                 <ibis:include href="dimension/State.xml" configuration-name-list="AlcoholB413_HS_ST,AlcoholB413_MS_ST"/>
     331                <ibis:include href="dimension/GeoState.xml" configuration-name-list="AlcoholB413_HS_ST,AlcoholB413_MS_ST"/>
    344332                <ibis:include href="dimension/GradeProxy.xml"/>
    345333                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="AlcoholB413_HS_ST,AlcoholB413_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/AlcoholMarj30D.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>AlcoholMarj30D_HS_ST</NAME>
    46                         <TITLE>Substance abuse - alcohol or marijuana use, past 30 days, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Substance abuse - alcohol or marijuana use, past 30 days, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/AlcoholMarj30D.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Substance abuse - alcohol or marijuana use, past 30 days</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
    10498                <CONFIGURATION><NAME>AlcoholMarj30D_MS_ST</NAME>
    105                         <TITLE>Substance abuse - alcohol or marijuana use, past 30 days, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     99                        <TITLE>Substance abuse - alcohol or marijuana use, past 30 days, Middle Schools, State-level</TITLE>
    106100                        <DESCRIPTION><ibis:include href="text/AlcoholMarj30D.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     103                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    110104                        <MEASURE_TITLE_OVERRIDE>Substance abuse - alcohol or marijuana use, past 30 days</MEASURE_TITLE_OVERRIDE>
    111105                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    152146                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    153147                        </DATA_ISSUES>
    154                         <CRITERIA>
    155                                 <EXCLUDE>
    156                                         <MAP_NAMES>
    157                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    158                                         </MAP_NAMES>
    159                                 </EXCLUDE>
    160                         </CRITERIA>
     148                        <CRITERIA/>
    161149                </CONFIGURATION>
    162150
     
    164152                        <TITLE>Substance abuse - alcohol or marijuana use, past 30 days, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    165153                        <DESCRIPTION><ibis:include href="text/AlcoholMarj30D.xml"/></DESCRIPTION>
    166                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     154                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    167155                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    168156                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    232220               
    233221                <CONFIGURATION><NAME>AlcoholMarj30D_MS_CNTY</NAME>
    234                         <TITLE>Substance abuse - alcohol or marijuana use, past 30 days, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     222                        <TITLE>Substance abuse - alcohol or marijuana use, past 30 days, Middle Schools, County-level</TITLE>
    235223                        <DESCRIPTION><ibis:include href="text/AlcoholMarj30D.xml"/></DESCRIPTION>
    236                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     224                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    237225                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    238226                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    344332               
    345333                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="AlcoholMarj30D_HS_CNTY,AlcoholMarj30D_MS_CNTY"/>
    346                 <ibis:include href="dimension/State.xml" configuration-name-list="AlcoholMarj30D_HS_ST,AlcoholMarj30D_MS_ST"/>
     334                <ibis:include href="dimension/GeoState.xml" configuration-name-list="AlcoholMarj30D_HS_ST,AlcoholMarj30D_MS_ST"/>
    347335                <ibis:include href="dimension/GradeProxy.xml"/>
    348336                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="AlcoholMarj30D_HS_ST,AlcoholMarj30D_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/AlcoholParentsWrong.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>AlcoholParentsWrong_HS_ST</NAME>
    46                         <TITLE>Alcohol - parents think student drinking is wrong, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Alcohol - parents think student drinking is wrong, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/AlcoholParentsWrong.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Alcohol - parents think student drinking is wrong</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
    10498                <CONFIGURATION><NAME>AlcoholParentsWrong_MS_ST</NAME>
    105                         <TITLE>Alcohol - parents think student drinking is wrong, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     99                        <TITLE>Alcohol - parents think student drinking is wrong, Middle Schools, State-level</TITLE>
    106100                        <DESCRIPTION><ibis:include href="text/AlcoholParentsWrong.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     103                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    110104                        <MEASURE_TITLE_OVERRIDE>Alcohol - parents think student drinking is wrong</MEASURE_TITLE_OVERRIDE>
    111105                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    152146                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    153147                        </DATA_ISSUES>
    154                         <CRITERIA>
    155                                 <EXCLUDE>
    156                                         <MAP_NAMES>
    157                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    158                                         </MAP_NAMES>
    159                                 </EXCLUDE>
    160                         </CRITERIA>
     148                        <CRITERIA/>
    161149                </CONFIGURATION>
    162150
     
    164152                        <TITLE>Alcohol - parents think student drinking is wrong, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    165153                        <DESCRIPTION><ibis:include href="text/AlcoholParentsWrong.xml"/></DESCRIPTION>
    166                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     154                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    167155                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    168156                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    228216                </CONFIGURATION>
    229217                <CONFIGURATION><NAME>AlcoholParentsWrong_MS_CNTY</NAME>
    230                         <TITLE>Alcohol - parents think student drinking is wrong, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     218                        <TITLE>Alcohol - parents think student drinking is wrong, Middle Schools, County-level</TITLE>
    231219                        <DESCRIPTION><ibis:include href="text/AlcoholParentsWrong.xml"/></DESCRIPTION>
    232                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     220                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    233221                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    234222                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    328316               
    329317                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="AlcoholParentsWrong_HS_CNTY,AlcoholParentsWrong_MS_CNTY"/>
    330                 <ibis:include href="dimension/State.xml" configuration-name-list="AlcoholParentsWrong_HS_ST,AlcoholParentsWrong_MS_ST"/>
     318                <ibis:include href="dimension/GeoState.xml" configuration-name-list="AlcoholParentsWrong_HS_ST,AlcoholParentsWrong_MS_ST"/>
    331319                <ibis:include href="dimension/GradeProxy.xml"/>
    332320                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="AlcoholParentsWrong_HS_ST,AlcoholParentsWrong_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/AlcoholSource7Cat.xml

    r24317 r24358  
    3636
    3737                <CONFIGURATION><NAME>AlcoholSource7Cat_HS_ST</NAME>
    38                         <TITLE>Alcohol - usual source, past 30 days, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>Alcohol - usual source, past 30 days, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/AlcoholSource7Cat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>   <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> 
    4141                        <DEFAULT_SERIES_DIMENSION_NAME>AlcoholSource7Cat</DEFAULT_SERIES_DIMENSION_NAME>
    4242                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    43                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     43                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4444                        <MEASURE_TITLE_OVERRIDE>Alcohol - usual source, past 30 days</MEASURE_TITLE_OVERRIDE>
    4545                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    102102
    103103                <CONFIGURATION><NAME>AlcoholSource7Cat_HS_CNTY</NAME>
    104                         <TITLE>Alcohol - usual source, past 30 days, High Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     104                        <TITLE>Alcohol - usual source, past 30 days, High Schools, County-level</TITLE>
    105105                        <DESCRIPTION><ibis:include href="text/AlcoholSource7Cat.xml"/></DESCRIPTION>
    106                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     106                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    107107                        <DEFAULT_SERIES_DIMENSION_NAME>AlcoholSource7Cat</DEFAULT_SERIES_DIMENSION_NAME>
    108108                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    197197               
    198198                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="AlcoholSource7Cat_HS_CNTY"/>
    199                 <ibis:include href="dimension/State.xml" configuration-name-list="AlcoholSource7Cat_HS_ST"/>
     199                <ibis:include href="dimension/GeoState.xml" configuration-name-list="AlcoholSource7Cat_HS_ST"/>
    200200                <ibis:include href="dimension/GradeProxy.xml"/>
    201201                <ibis:include href="dimension/GradeHS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/AlcoholSource7CatAny.xml

    r24300 r24358  
    3636
    3737                <CONFIGURATION><NAME>AlcoholSource7CatAny_HS_ST</NAME>
    38                         <TITLE>Alcohol - usual source, past 30 days, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>Alcohol - usual source, past 30 days, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/AlcoholSource7Cat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>   <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> 
    4141                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    42                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     42                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4343                        <MEASURE_TITLE_OVERRIDE>Alcohol - usual source, past 30 days</MEASURE_TITLE_OVERRIDE>
    4444                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    109109
    110110                <CONFIGURATION><NAME>AlcoholSource7CatAny_HS_CNTY</NAME>
    111                         <TITLE>Alcohol - usual source, past 30 days, High Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     111                        <TITLE>Alcohol - usual source, past 30 days, High Schools, County-level</TITLE>
    112112                        <DESCRIPTION><ibis:include href="text/AlcoholSource7Cat.xml"/></DESCRIPTION>
    113                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     113                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    114114                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    115115                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    231231               
    232232                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="AlcoholSource7CatAny_HS_CNTY"/>
    233                 <ibis:include href="dimension/State.xml" configuration-name-list="AlcoholSource7CatAny_HS_ST"/>
     233                <ibis:include href="dimension/GeoState.xml" configuration-name-list="AlcoholSource7CatAny_HS_ST"/>
    234234                <ibis:include href="dimension/GradeProxy.xml"/>
    235235                <ibis:include href="dimension/GradeHS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/AsthCur.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>AsthCur_HS_ST</NAME>
    46                         <TITLE>Asthma - current, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Asthma - current, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/AsthCur.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Asthma - current</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    109109
    110110                <CONFIGURATION><NAME>AsthCur_MS_ST</NAME>
    111                         <TITLE>Asthma - current, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     111                        <TITLE>Asthma - current, Middle Schools, State-level</TITLE>
    112112                        <DESCRIPTION><ibis:include href="text/AsthCur.xml"/></DESCRIPTION>
    113                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     113                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    114114                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    115                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     115                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    116116                        <MEASURE_TITLE_OVERRIDE>Asthma - current</MEASURE_TITLE_OVERRIDE>
    117117                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    176176                        <TITLE>Asthma - current, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    177177                        <DESCRIPTION><ibis:include href="text/AsthCur.xml"/></DESCRIPTION>
    178                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     178                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    179179                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    180180                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    245245               
    246246                <CONFIGURATION><NAME>AsthCur_MS_CNTY</NAME>
    247                         <TITLE>Asthma - current, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     247                        <TITLE>Asthma - current, Middle Schools, County-level</TITLE>
    248248                        <DESCRIPTION><ibis:include href="text/AsthCur.xml"/></DESCRIPTION>
    249                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     249                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    250250                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    251251                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    356356               
    357357                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="AsthCur_HS_CNTY,AsthCur_MS_CNTY"/>
    358                 <ibis:include href="dimension/State.xml" configuration-name-list="AsthCur_HS_ST,AsthCur_MS_ST"/>
     358                <ibis:include href="dimension/GeoState.xml" configuration-name-list="AsthCur_HS_ST,AsthCur_MS_ST"/>
    359359                <ibis:include href="dimension/GradeProxy.xml"/>
    360360                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="AsthCur_HS_ST,AsthCur_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/AsthEver.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>AsthEver_HS_ST</NAME>
    46                         <TITLE>Asthma - ever diagnosed, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Asthma - ever diagnosed, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/AsthEver.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Asthma - ever diagnosed</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    109109
    110110                <CONFIGURATION><NAME>AsthEver_MS_ST</NAME>
    111                         <TITLE>Asthma - ever diagnosed, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     111                        <TITLE>Asthma - ever diagnosed, Middle Schools, State-level</TITLE>
    112112                        <DESCRIPTION><ibis:include href="text/AsthEver.xml"/></DESCRIPTION>
    113                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     113                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    114114                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    115                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     115                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    116116                        <MEASURE_TITLE_OVERRIDE>Asthma - ever diagnosed</MEASURE_TITLE_OVERRIDE>
    117117                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    176176                        <TITLE>Asthma - ever diagnosed, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    177177                        <DESCRIPTION><ibis:include href="text/AsthEver.xml"/></DESCRIPTION>
    178                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     178                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    179179                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    180180                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    244244               
    245245                <CONFIGURATION><NAME>AsthEver_MS_CNTY</NAME>
    246                         <TITLE>Asthma - ever diagnosed, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     246                        <TITLE>Asthma - ever diagnosed, Middle Schools, County-level</TITLE>
    247247                        <DESCRIPTION><ibis:include href="text/AsthEver.xml"/></DESCRIPTION>
    248                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     248                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    249249                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    250250                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    354354               
    355355                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="AsthEver_HS_CNTY,AsthEver_MS_CNTY"/>
    356                 <ibis:include href="dimension/State.xml" configuration-name-list="AsthEver_HS_ST,AsthEver_MS_ST"/>
     356                <ibis:include href="dimension/GeoState.xml" configuration-name-list="AsthEver_HS_ST,AsthEver_MS_ST"/>
    357357                <ibis:include href="dimension/GradeProxy.xml"/>
    358358                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="AsthEver_HS_ST,AsthEver_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/BikeWalkToSchool.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>BikeWalkToSchool_HS_ST</NAME>
    46                         <TITLE>Physical Activity - active transport to/from school, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Physical Activity - active transport to/from school, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/BikeWalkToSchool.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Physical Activity - active transport to/from school</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
    10498                <CONFIGURATION><NAME>BikeWalkToSchool_MS_ST</NAME>
    105                         <TITLE>Physical Activity - active transport to/from school, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     99                        <TITLE>Physical Activity - active transport to/from school, Middle Schools, State-level</TITLE>
    106100                        <DESCRIPTION><ibis:include href="text/BikeWalkToSchool.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     103                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    110104                        <MEASURE_TITLE_OVERRIDE>Physical Activity - active transport to/from school</MEASURE_TITLE_OVERRIDE>
    111105                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    152146                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    153147                        </DATA_ISSUES>
    154                         <CRITERIA>
    155                                 <EXCLUDE>
    156                                         <MAP_NAMES>
    157                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    158                                         </MAP_NAMES>
    159                                 </EXCLUDE>
    160                         </CRITERIA>
     148                        <CRITERIA/>
    161149                </CONFIGURATION>
    162150
     
    164152                        <TITLE>Physical Activity - active transport to/from school, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    165153                        <DESCRIPTION><ibis:include href="text/BikeWalkToSchool.xml"/></DESCRIPTION>
    166                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     154                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    167155                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    168156                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    222210                </CONFIGURATION>
    223211                <CONFIGURATION><NAME>BikeWalkToSchool_MS_CNTY</NAME>
    224                         <TITLE>Physical Activity - active transport to/from school, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     212                        <TITLE>Physical Activity - active transport to/from school, Middle Schools, County-level</TITLE>
    225213                        <DESCRIPTION><ibis:include href="text/BikeWalkToSchool.xml"/></DESCRIPTION>
    226                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     214                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    227215                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    228216                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    322310               
    323311                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="BikeWalkToSchool_HS_CNTY,BikeWalkToSchool_MS_CNTY"/>
    324                 <ibis:include href="dimension/State.xml" configuration-name-list="BikeWalkToSchool_HS_ST,BikeWalkToSchool_MS_ST"/>
     312                <ibis:include href="dimension/GeoState.xml" configuration-name-list="BikeWalkToSchool_HS_ST,BikeWalkToSchool_MS_ST"/>
    325313                <ibis:include href="dimension/GradeProxy.xml"/>
    326314                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="BikeWalkToSchool_HS_ST,BikeWalkToSchool_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/BikeWalkToSchoolDaysCat.xml

    r24317 r24358  
    3636
    3737                <CONFIGURATION><NAME>BikeWalkToSchoolDaysCat_HS_ST</NAME>
    38                         <TITLE>Physical Activity - active transport to/from school, avg days, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>Physical Activity - active transport to/from school, avg days, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/BikeWalkToSchoolDaysCat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>   <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> 
    4141                        <DEFAULT_SERIES_DIMENSION_NAME>BikeWalkToSchoolDaysCat</DEFAULT_SERIES_DIMENSION_NAME>
    4242                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    43                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     43                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4444                        <MEASURE_TITLE_OVERRIDE>Physical Activity - active transport to/from school, avg days</MEASURE_TITLE_OVERRIDE>
    4545                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    8585                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    8686                        </DATA_ISSUES>
    87                         <CRITERIA>
    88                                 <EXCLUDE>
    89                                         <MAP_NAMES>
    90                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    91                                         </MAP_NAMES>
    92                                 </EXCLUDE>
    93                         </CRITERIA>
     87                        <CRITERIA/>
    9488                </CONFIGURATION>
    9589
    9690                <CONFIGURATION><NAME>BikeWalkToSchoolDaysCat_MS_ST</NAME>
    97                         <TITLE>Physical Activity - active transport to/from school, avg days, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     91                        <TITLE>Physical Activity - active transport to/from school, avg days, Middle Schools, State-level</TITLE>
    9892                        <DESCRIPTION><ibis:include href="text/BikeWalkToSchoolDaysCat.xml"/></DESCRIPTION>
    99                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>   <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     93                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> 
    10094                        <DEFAULT_SERIES_DIMENSION_NAME>BikeWalkToSchoolDaysCat</DEFAULT_SERIES_DIMENSION_NAME>
    10195                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    102                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     96                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    10397                        <MEASURE_TITLE_OVERRIDE>Physical Activity - active transport to/from school, avg days</MEASURE_TITLE_OVERRIDE>
    10498                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    144138                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    145139                        </DATA_ISSUES>
    146                         <CRITERIA>
    147                                 <EXCLUDE>
    148                                         <MAP_NAMES>
    149                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    150                                         </MAP_NAMES>
    151                                 </EXCLUDE>
    152                         </CRITERIA>
     140                        <CRITERIA/>
    153141                </CONFIGURATION>
    154142
     
    156144                        <TITLE>Physical Activity - active transport to/from school, avg days, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    157145                        <DESCRIPTION><ibis:include href="text/BikeWalkToSchoolDaysCat.xml"/></DESCRIPTION>
    158                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     146                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    159147                        <DEFAULT_SERIES_DIMENSION_NAME>BikeWalkToSchoolDaysCat</DEFAULT_SERIES_DIMENSION_NAME>
    160148                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    214202                </CONFIGURATION>
    215203                <CONFIGURATION><NAME>BikeWalkToSchoolDaysCat_MS_CNTY</NAME>
    216                         <TITLE>Physical Activity - active transport to/from school, avg days, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     204                        <TITLE>Physical Activity - active transport to/from school, avg days, Middle Schools, County-level</TITLE>
    217205                        <DESCRIPTION><ibis:include href="text/BikeWalkToSchoolDaysCat.xml"/></DESCRIPTION>
    218                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     206                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    219207                        <DEFAULT_SERIES_DIMENSION_NAME>BikeWalkToSchoolDaysCat</DEFAULT_SERIES_DIMENSION_NAME>
    220208                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    298286
    299287                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="BikeWalkToSchoolDaysCat_HS_CNTY,BikeWalkToSchoolDaysCat_MS_CNTY"/>
    300                 <ibis:include href="dimension/State.xml"/>
     288                <ibis:include href="dimension/GeoState.xml"/>
    301289                <ibis:include href="dimension/GradeProxy.xml"/>
    302290                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="BikeWalkToSchoolDaysCat_HS_ST,BikeWalkToSchoolDaysCat_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/BikeWalkToSchoolDaysCatAny.xml

    r24300 r24358  
    3636
    3737                <CONFIGURATION><NAME>BikeWalkToSchoolDaysCatAny_HS_ST</NAME>
    38                         <TITLE>Physical Activity - active transport to/from school, avg days, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>Physical Activity - active transport to/from school, avg days, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/BikeWalkToSchoolDaysCat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>   <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> 
    4141                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    42                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     42                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4343                        <MEASURE_TITLE_OVERRIDE>Physical Activity - active transport to/from school, avg days</MEASURE_TITLE_OVERRIDE>
    4444                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9292                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9393                        </DATA_ISSUES>
    94                         <CRITERIA>
    95                                 <EXCLUDE>
    96                                         <MAP_NAMES>
    97                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    98                                         </MAP_NAMES>
    99                                 </EXCLUDE>
    100                         </CRITERIA>
     94                        <CRITERIA/>
    10195                </CONFIGURATION>
    10296
    10397                <CONFIGURATION><NAME>BikeWalkToSchoolDaysCatAny_MS_ST</NAME>
    104                         <TITLE>Physical Activity - active transport to/from school, avg days, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     98                        <TITLE>Physical Activity - active transport to/from school, avg days, Middle Schools, State-level</TITLE>
    10599                        <DESCRIPTION><ibis:include href="text/BikeWalkToSchoolDaysCat.xml"/></DESCRIPTION>
    106                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     100                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    107101                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    108                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     102                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    109103                        <MEASURE_TITLE_OVERRIDE>Physical Activity - active transport to/from school, avg days</MEASURE_TITLE_OVERRIDE>
    110104                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    158152                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    159153                        </DATA_ISSUES>
    160                         <CRITERIA>
    161                                 <EXCLUDE>
    162                                         <MAP_NAMES>
    163                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    164                                         </MAP_NAMES>
    165                                 </EXCLUDE>
    166                         </CRITERIA>
     154                        <CRITERIA/>
    167155                </CONFIGURATION>
    168156
     
    170158                        <TITLE>Physical Activity - active transport to/from school, avg days, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    171159                        <DESCRIPTION><ibis:include href="text/BikeWalkToSchoolDaysCat.xml"/></DESCRIPTION>
    172                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     160                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    173161                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    174162                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    236224               
    237225                <CONFIGURATION><NAME>BikeWalkToSchoolDaysCatAny_MS_CNTY</NAME>
    238                         <TITLE>Physical Activity - active transport to/from school, avg days, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     226                        <TITLE>Physical Activity - active transport to/from school, avg days, Middle Schools, County-level</TITLE>
    239227                        <DESCRIPTION><ibis:include href="text/BikeWalkToSchoolDaysCat.xml"/></DESCRIPTION>
    240                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     228                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    241229                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    242230                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    347335
    348336                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="BikeWalkToSchoolDaysCatAny_HS_CNTY,BikeWalkToSchoolDaysCatAny_MS_CNTY"/>
    349                 <ibis:include href="dimension/State.xml" configuration-name-list="BikeWalkToSchoolDaysCatAny_HS_ST,BikeWalkToSchoolDaysCatAny_MS_ST"/>
     337                <ibis:include href="dimension/GeoState.xml" configuration-name-list="BikeWalkToSchoolDaysCatAny_HS_ST,BikeWalkToSchoolDaysCatAny_MS_ST"/>
    350338                <ibis:include href="dimension/GradeProxy.xml"/>
    351339                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="BikeWalkToSchoolDaysCatAny_HS_ST,BikeWalkToSchoolDaysCatAny_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/BingeDrink.xml

    r24300 r24358  
    221221               
    222222                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="BingeDrink_MS_CNTY"/>
    223                 <ibis:include href="dimension/State.xml" configuration-name-list="BingeDrink_MS_ST"/>
     223                <ibis:include href="dimension/GeoState.xml" configuration-name-list="BingeDrink_MS_ST"/>
    224224                <ibis:include href="dimension/GradeProxy.xml"/>
    225225                <ibis:include href="dimension/GradeMS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/BingeDrink1.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>BingeDrink1_HS_ST</NAME>
    46                         <TITLE>Alcohol - binge drinking (new) (HS), High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Alcohol - binge drinking (new) (HS), High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/BingeDrink1.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Alcohol - binge drinking (new) (HS)</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397               
     
    10599                        <TITLE>Alcohol - binge drinking (new) (HS), High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    106100                        <DESCRIPTION><ibis:include href="text/BingeDrink1.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109103                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    207201               
    208202                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="BingeDrink1_HS_CNTY"/>
    209                 <ibis:include href="dimension/State.xml" configuration-name-list="BingeDrink1_HS_ST"/>
     203                <ibis:include href="dimension/GeoState.xml" configuration-name-list="BingeDrink1_HS_ST"/>
    210204                <ibis:include href="dimension/GradeProxy.xml"/>
    211205                <ibis:include href="dimension/GradeHS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/BirthCntrl.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>BirthCntrl_HS_ST</NAME>
    46                         <TITLE>Sex (curr) - used birth control last intercourse, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Sex (curr) - used birth control last intercourse, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/BirthCntrl.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Sex (curr) - used birth control last intercourse</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
     
    10599                        <TITLE>Sex (curr) - used birth control last intercourse, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    106100                        <DESCRIPTION><ibis:include href="text/BirthCntrl.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109103                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    217211               
    218212                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="BirthCntrl_HS_CNTY"/>
    219                 <ibis:include href="dimension/State.xml" configuration-name-list="BirthCntrl_HS_ST"/>
     213                <ibis:include href="dimension/GeoState.xml" configuration-name-list="BirthCntrl_HS_ST"/>
    220214                <ibis:include href="dimension/GradeProxy.xml"/>
    221215                <ibis:include href="dimension/GradeHS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/BrkfstDaysEat4Cat.xml

    r24317 r24358  
    3636
    3737                <CONFIGURATION><NAME>BrkfstDaysEat4Cat_HS_ST</NAME>
    38                         <TITLE>Nutrition - weekly frequency of breakfast, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>Nutrition - weekly frequency of breakfast, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/BrkfstDaysEat4Cat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>   <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> 
    4141                        <DEFAULT_SERIES_DIMENSION_NAME>BrkfstDaysEat4Cat</DEFAULT_SERIES_DIMENSION_NAME>
    4242                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    43                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     43                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4444                        <MEASURE_TITLE_OVERRIDE>Nutrition - weekly frequency of breakfast</MEASURE_TITLE_OVERRIDE>
    4545                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    8585                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    8686                        </DATA_ISSUES>
    87                         <CRITERIA>
    88                                 <EXCLUDE>
    89                                         <MAP_NAMES>
    90                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    91                                         </MAP_NAMES>
    92                                 </EXCLUDE>
    93                         </CRITERIA>
     87                        <CRITERIA/>
    9488                </CONFIGURATION>
    9589
    9690                <CONFIGURATION><NAME>BrkfstDaysEat4Cat_MS_ST</NAME>
    97                         <TITLE>Nutrition - weekly frequency of breakfast, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     91                        <TITLE>Nutrition - weekly frequency of breakfast, Middle Schools, State-level</TITLE>
    9892                        <DESCRIPTION><ibis:include href="text/BrkfstDaysEat4Cat.xml"/></DESCRIPTION>
    99                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>   <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     93                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> 
    10094                        <DEFAULT_SERIES_DIMENSION_NAME>BrkfstDaysEat4Cat</DEFAULT_SERIES_DIMENSION_NAME>
    10195                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    102                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     96                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    10397                        <MEASURE_TITLE_OVERRIDE>Nutrition - weekly frequency of breakfast</MEASURE_TITLE_OVERRIDE>
    10498                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    144138                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    145139                        </DATA_ISSUES>
    146                         <CRITERIA>
    147                                 <EXCLUDE>
    148                                         <MAP_NAMES>
    149                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    150                                         </MAP_NAMES>
    151                                 </EXCLUDE>
    152                         </CRITERIA>
     140                        <CRITERIA/>
    153141                </CONFIGURATION>
    154142
     
    156144                        <TITLE>Nutrition - weekly frequency of breakfast, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    157145                        <DESCRIPTION><ibis:include href="text/BrkfstDaysEat4Cat.xml"/></DESCRIPTION>
    158                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     146                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    159147                        <DEFAULT_SERIES_DIMENSION_NAME>BrkfstDaysEat4Cat</DEFAULT_SERIES_DIMENSION_NAME>
    160148                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    214202                </CONFIGURATION>
    215203                <CONFIGURATION><NAME>BrkfstDaysEat4Cat_MS_CNTY</NAME>
    216                         <TITLE>Nutrition - weekly frequency of breakfast, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     204                        <TITLE>Nutrition - weekly frequency of breakfast, Middle Schools, County-level</TITLE>
    217205                        <DESCRIPTION><ibis:include href="text/BrkfstDaysEat4Cat.xml"/></DESCRIPTION>
    218                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     206                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    219207                        <DEFAULT_SERIES_DIMENSION_NAME>BrkfstDaysEat4Cat</DEFAULT_SERIES_DIMENSION_NAME>
    220208                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    298286
    299287                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="BrkfstDaysEat4Cat_HS_CNTY,BrkfstDaysEat4Cat_MS_CNTY"/>
    300                 <ibis:include href="dimension/State.xml"/>
     288                <ibis:include href="dimension/GeoState.xml"/>
    301289                <ibis:include href="dimension/GradeProxy.xml"/>
    302290                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="BrkfstDaysEat4Cat_HS_ST,BrkfstDaysEat4Cat_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/BrkfstDaysEat4CatAny.xml

    r24300 r24358  
    3636
    3737                <CONFIGURATION><NAME>BrkfstDaysEat4CatAny_HS_ST</NAME>
    38                         <TITLE>Nutrition - weekly frequency of breakfast, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>Nutrition - weekly frequency of breakfast, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/BrkfstDaysEat4Cat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>   <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> 
    4141                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    42                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     42                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4343                        <MEASURE_TITLE_OVERRIDE>Nutrition - weekly frequency of breakfast</MEASURE_TITLE_OVERRIDE>
    4444                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9292                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9393                        </DATA_ISSUES>
    94                         <CRITERIA>
    95                                 <EXCLUDE>
    96                                         <MAP_NAMES>
    97                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    98                                         </MAP_NAMES>
    99                                 </EXCLUDE>
    100                         </CRITERIA>
     94                        <CRITERIA/>
    10195                </CONFIGURATION>
    10296
    10397                <CONFIGURATION><NAME>BrkfstDaysEat4CatAny_MS_ST</NAME>
    104                         <TITLE>Nutrition - weekly frequency of breakfast, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     98                        <TITLE>Nutrition - weekly frequency of breakfast, Middle Schools, State-level</TITLE>
    10599                        <DESCRIPTION><ibis:include href="text/BrkfstDaysEat4Cat.xml"/></DESCRIPTION>
    106                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>   <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     100                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> 
    107101                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    108                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     102                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    109103                        <MEASURE_TITLE_OVERRIDE>Nutrition - weekly frequency of breakfast</MEASURE_TITLE_OVERRIDE>
    110104                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    158152                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    159153                        </DATA_ISSUES>
    160                         <CRITERIA>
    161                                 <EXCLUDE>
    162                                         <MAP_NAMES>
    163                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    164                                         </MAP_NAMES>
    165                                 </EXCLUDE>
    166                         </CRITERIA>
     154                        <CRITERIA/>
    167155                </CONFIGURATION>
    168156
     
    170158                        <TITLE>Nutrition - weekly frequency of breakfast, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    171159                        <DESCRIPTION><ibis:include href="text/BrkfstDaysEat4Cat.xml"/></DESCRIPTION>
    172                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     160                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    173161                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    174162                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    235223                </CONFIGURATION>
    236224                <CONFIGURATION><NAME>BrkfstDaysEat4CatAny_MS_CNTY</NAME>
    237                         <TITLE>Nutrition - weekly frequency of breakfast, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     225                        <TITLE>Nutrition - weekly frequency of breakfast, Middle Schools, County-level</TITLE>
    238226                        <DESCRIPTION><ibis:include href="text/BrkfstDaysEat4Cat.xml"/></DESCRIPTION>
    239                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     227                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    240228                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    241229                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    346334
    347335                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="BrkfstDaysEat4CatAny_HS_CNTY,BrkfstDaysEat4CatAny_MS_CNTY"/>
    348                 <ibis:include href="dimension/State.xml" configuration-name-list="BrkfstDaysEat4CatAny_HS_ST,BrkfstDaysEat4CatAny_MS_ST"/>
     336                <ibis:include href="dimension/GeoState.xml" configuration-name-list="BrkfstDaysEat4CatAny_HS_ST,BrkfstDaysEat4CatAny_MS_ST"/>
    349337                <ibis:include href="dimension/GradeProxy.xml"/>
    350338                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="BrkfstDaysEat4CatAny_HS_ST,BrkfstDaysEat4CatAny_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/Bullied.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>Bullied_MS_ST</NAME>
    46                         <TITLE>Bullied - on school property, ever, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Bullied - on school property, ever, Middle Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/Bullied.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Bullied - on school property, ever</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397                <CONFIGURATION><NAME>Bullied_MS_CNTY</NAME>
    104                         <TITLE>Bullied - on school property, ever, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     98                        <TITLE>Bullied - on school property, ever, Middle Schools, County-level</TITLE>
    10599                        <DESCRIPTION><ibis:include href="text/Bullied.xml"/></DESCRIPTION>
    106                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     100                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    107101                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    108102                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    201195               
    202196                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="Bullied_MS_CNTY"/>
    203                 <ibis:include href="dimension/State.xml" configuration-name-list="Bullied_MS_ST"/>
     197                <ibis:include href="dimension/GeoState.xml" configuration-name-list="Bullied_MS_ST"/>
    204198                <ibis:include href="dimension/GradeProxy.xml"/>
    205199                <ibis:include href="dimension/GradeMS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/Bullied12M.xml

    r24300 r24358  
    9595                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9696                        </DATA_ISSUES>
    97                         <CRITERIA>
    98                                 <EXCLUDE>
    99                                         <MAP_NAMES>
    100                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    101                                         </MAP_NAMES>
    102                                 </EXCLUDE>
    103                         </CRITERIA>
     97                        <CRITERIA/>
    10498                </CONFIGURATION>
    10599
     
    213207               
    214208                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="Bullied12M_HS_CNTY"/>
    215                 <ibis:include href="dimension/State.xml" configuration-name-list="Bullied12M_HS_ST"/>
     209                <ibis:include href="dimension/GeoState.xml" configuration-name-list="Bullied12M_HS_ST"/>
    216210                <ibis:include href="dimension/GradeProxy.xml"/>
    217211                <ibis:include href="dimension/GradeHS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/BullyElec.xml

    r24300 r24358  
    4444               
    4545                <CONFIGURATION><NAME>BullyElec_MS_ST</NAME>
    46                         <TITLE>Bullied - electronically, ever, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Bullied - electronically, ever, Middle Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/BullyElec.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Bullied - electronically, ever</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397                <CONFIGURATION><NAME>BullyElec_MS_CNTY</NAME>
    104                         <TITLE>Bullied - electronically, ever, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     98                        <TITLE>Bullied - electronically, ever, Middle Schools, County-level</TITLE>
    10599                        <DESCRIPTION><ibis:include href="text/BullyElec.xml"/></DESCRIPTION>
    106                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     100                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    107101                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    108102                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    201195               
    202196                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="BullyElec_MS_CNTY"/>
    203                 <ibis:include href="dimension/State.xml" configuration-name-list="BullyElec_MS_ST"/>
     197                <ibis:include href="dimension/GeoState.xml" configuration-name-list="BullyElec_MS_ST"/>
    204198                <ibis:include href="dimension/GradeProxy.xml"/>
    205199                <ibis:include href="dimension/GradeMS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/BullyElec12M.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>BullyElec12M_HS_ST</NAME>
    46                         <TITLE>Bullied - electronically, past 12 months, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Bullied - electronically, past 12 months, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/BullyElec12M.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Bullied - electronically, past 12 months</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
     
    10599                        <TITLE>Bullied - electronically, past 12 months, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    106100                        <DESCRIPTION><ibis:include href="text/BullyElec12M.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109103                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    214208               
    215209                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="BullyElec12M_HS_CNTY"/>
    216                 <ibis:include href="dimension/State.xml" configuration-name-list="BullyElec12M_HS_ST"/>
     210                <ibis:include href="dimension/GeoState.xml" configuration-name-list="BullyElec12M_HS_ST"/>
    217211                <ibis:include href="dimension/GradeProxy.xml"/>
    218212                <ibis:include href="dimension/GradeHS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/BullyElecSchoolHS.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>BullyElecSchoolHS_HS_ST</NAME>
    46                         <TITLE>Bullied - on school property or electronically, past 12 months, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Bullied - on school property or electronically, past 12 months, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/BullyElecSchoolHS.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Bullied - on school property or electronically, past 12 months</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
     
    10599                        <TITLE>Bullied - on school property or electronically, past 12 months, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    106100                        <DESCRIPTION><ibis:include href="text/BullyElecSchoolHS.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109103                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    208202               
    209203                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="BullyElecSchoolHS_HS_CNTY"/>
    210                 <ibis:include href="dimension/State.xml" configuration-name-list="BullyElecSchoolHS_HS_ST"/>
     204                <ibis:include href="dimension/GeoState.xml" configuration-name-list="BullyElecSchoolHS_HS_ST"/>
    211205                <ibis:include href="dimension/GradeProxy.xml"/>
    212206                <ibis:include href="dimension/GradeHS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/BullyElecSchoolMS.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>BullyElecSchoolMS_MS_ST</NAME>
    46                         <TITLE>Bullied - on school property or electronically, ever, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Bullied - on school property or electronically, ever, Middle Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/BullyElecSchoolMS.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Bullied - on school property or electronically, ever</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
    10498                <CONFIGURATION><NAME>BullyElecSchoolMS_MS_CNTY</NAME>
    105                         <TITLE>Bullied - on school property or electronically, ever, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     99                        <TITLE>Bullied - on school property or electronically, ever, Middle Schools, County-level</TITLE>
    106100                        <DESCRIPTION><ibis:include href="text/BullyElecSchoolMS.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109103                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    202196               
    203197                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="BullyElecSchoolMS_MS_CNTY"/>
    204                 <ibis:include href="dimension/State.xml" configuration-name-list="BullyElecSchoolMS_MS_ST"/>
     198                <ibis:include href="dimension/GeoState.xml" configuration-name-list="BullyElecSchoolMS_MS_ST"/>
    205199                <ibis:include href="dimension/GradeProxy.xml"/>
    206200                <ibis:include href="dimension/GradeMS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CRAFFTAll4Cat.xml

    r24317 r24358  
    3636
    3737                <CONFIGURATION><NAME>CRAFFTAll4Cat_HS_ST</NAME>
    38                         <TITLE>Substance abuse - CRAFFT index, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>Substance abuse - CRAFFT index, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/CRAFFTAll4Cat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4141                        <DEFAULT_SERIES_DIMENSION_NAME>CRAFFTAll4Cat</DEFAULT_SERIES_DIMENSION_NAME>
    4242                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    43                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     43                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4444                        <MEASURE_TITLE_OVERRIDE>Substance abuse - CRAFFT index</MEASURE_TITLE_OVERRIDE>
    4545                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    8585                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    8686                        </DATA_ISSUES>
    87                         <CRITERIA>
    88                                 <EXCLUDE>
    89                                         <MAP_NAMES>
    90                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    91                                         </MAP_NAMES>
    92                                 </EXCLUDE>
    93                         </CRITERIA>
     87                        <CRITERIA/>
    9488                </CONFIGURATION>
    9589
    9690                <CONFIGURATION><NAME>CRAFFTAll4Cat_MS_ST</NAME>
    97                         <TITLE>Substance abuse - CRAFFT index, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     91                        <TITLE>Substance abuse - CRAFFT index, Middle Schools, State-level</TITLE>
    9892                        <DESCRIPTION><ibis:include href="text/CRAFFTAll4Cat.xml"/></DESCRIPTION>
    99                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     93                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    10094                        <DEFAULT_SERIES_DIMENSION_NAME>CRAFFTAll4Cat</DEFAULT_SERIES_DIMENSION_NAME>
    10195                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    102                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     96                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    10397                        <MEASURE_TITLE_OVERRIDE>Substance abuse - CRAFFT index</MEASURE_TITLE_OVERRIDE>
    10498                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    144138                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    145139                        </DATA_ISSUES>
    146                         <CRITERIA>
    147                                 <EXCLUDE>
    148                                         <MAP_NAMES>
    149                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    150                                         </MAP_NAMES>
    151                                 </EXCLUDE>
    152                         </CRITERIA>
     140                        <CRITERIA/>
    153141                </CONFIGURATION>
    154142
     
    156144                        <TITLE>Substance abuse - CRAFFT index, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    157145                        <DESCRIPTION><ibis:include href="text/CRAFFTAll4Cat.xml"/></DESCRIPTION>
    158                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     146                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    159147                        <DEFAULT_SERIES_DIMENSION_NAME>CRAFFTAll4Cat</DEFAULT_SERIES_DIMENSION_NAME>
    160148                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    221209               
    222210                <CONFIGURATION><NAME>CRAFFTAll4Cat_MS_CNTY</NAME>
    223                         <TITLE>Substance abuse - CRAFFT index, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     211                        <TITLE>Substance abuse - CRAFFT index, Middle Schools, County-level</TITLE>
    224212                        <DESCRIPTION><ibis:include href="text/CRAFFTAll4Cat.xml"/></DESCRIPTION>
    225213                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or something named STATE so no map -->
     
    307295
    308296                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CRAFFTAll4Cat_HS_CNTY,CRAFFTAll4Cat_MS_CNTY"/>
    309                 <ibis:include href="dimension/State.xml"/>
     297                <ibis:include href="dimension/GeoState.xml"/>
    310298                <ibis:include href="dimension/GradeProxy.xml"/>
    311299                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="CRAFFTAll4Cat_HS_ST,CRAFFTAll4Cat_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CRAFFTAll4CatAny.xml

    r24300 r24358  
    3636
    3737                <CONFIGURATION><NAME>CRAFFTAll4CatAny_HS_ST</NAME>
    38                         <TITLE>Substance abuse - CRAFFT index, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>Substance abuse - CRAFFT index, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/CRAFFTAll4Cat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4141                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    42                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     42                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4343                        <MEASURE_TITLE_OVERRIDE>Substance abuse - CRAFFT index</MEASURE_TITLE_OVERRIDE>
    4444                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9292                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9393                        </DATA_ISSUES>
    94                         <CRITERIA>
    95                                 <EXCLUDE>
    96                                         <MAP_NAMES>
    97                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    98                                         </MAP_NAMES>
    99                                 </EXCLUDE>
    100                         </CRITERIA>
     94                        <CRITERIA/>
    10195                </CONFIGURATION>
    10296
    10397                <CONFIGURATION><NAME>CRAFFTAll4CatAny_MS_ST</NAME>
    104                         <TITLE>Substance abuse - CRAFFT index, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     98                        <TITLE>Substance abuse - CRAFFT index, Middle Schools, State-level</TITLE>
    10599                        <DESCRIPTION><ibis:include href="text/CRAFFTAll4Cat.xml"/></DESCRIPTION>
    106                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     100                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    107101                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    108                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     102                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    109103                        <MEASURE_TITLE_OVERRIDE>Substance abuse - CRAFFT index</MEASURE_TITLE_OVERRIDE>
    110104                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    158152                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    159153                        </DATA_ISSUES>
    160                         <CRITERIA>
    161                                 <EXCLUDE>
    162                                         <MAP_NAMES>
    163                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    164                                         </MAP_NAMES>
    165                                 </EXCLUDE>
    166                         </CRITERIA>
     154                        <CRITERIA/>
    167155                </CONFIGURATION>
    168156
     
    170158                        <TITLE>Substance abuse - CRAFFT index, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    171159                        <DESCRIPTION><ibis:include href="text/CRAFFTAll4Cat.xml"/></DESCRIPTION>
    172                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     160                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    173161                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    174162                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    241229                </CONFIGURATION>
    242230                <CONFIGURATION><NAME>CRAFFTAll4CatAny_MS_CNTY</NAME>
    243                         <TITLE>Substance abuse - CRAFFT index, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     231                        <TITLE>Substance abuse - CRAFFT index, Middle Schools, County-level</TITLE>
    244232                        <DESCRIPTION><ibis:include href="text/CRAFFTAll4Cat.xml"/></DESCRIPTION>
    245233                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or something named STATE so no map -->
     
    354342
    355343                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CRAFFTAll4CatAny_HS_CNTY,CRAFFTAll4CatAny_MS_CNTY"/>
    356                 <ibis:include href="dimension/State.xml" configuration-name-list="CRAFFTAll4CatAny_HS_ST,CRAFFTAll4CatAny_MS_ST"/>
     344                <ibis:include href="dimension/GeoState.xml" configuration-name-list="CRAFFTAll4CatAny_HS_ST,CRAFFTAll4CatAny_MS_ST"/>
    357345                <ibis:include href="dimension/GradeProxy.xml"/>
    358346                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="CRAFFTAll4CatAny_HS_ST,CRAFFTAll4CatAny_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CRAFFTCS4Cat.xml

    r24317 r24358  
    3636
    3737                <CONFIGURATION><NAME>CRAFFTCS4Cat_HS_ST</NAME>
    38                         <TITLE>Substance abuse - CRAFFT index, current users, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>Substance abuse - CRAFFT index, current users, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/CRAFFTCS4Cat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4141                        <DEFAULT_SERIES_DIMENSION_NAME>CRAFFTCS4Cat</DEFAULT_SERIES_DIMENSION_NAME>
    4242                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    43                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     43                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4444                        <MEASURE_TITLE_OVERRIDE>Substance abuse - CRAFFT index, current users</MEASURE_TITLE_OVERRIDE>
    4545                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    8585                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    8686                        </DATA_ISSUES>
    87                         <CRITERIA>
    88                                 <EXCLUDE>
    89                                         <MAP_NAMES>
    90                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    91                                         </MAP_NAMES>
    92                                 </EXCLUDE>
    93                         </CRITERIA>
     87                        <CRITERIA/>
    9488                </CONFIGURATION>
    9589
    9690                <CONFIGURATION><NAME>CRAFFTCS4Cat_MS_ST</NAME>
    97                         <TITLE>Substance abuse - CRAFFT index, current users, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     91                        <TITLE>Substance abuse - CRAFFT index, current users, Middle Schools, State-level</TITLE>
    9892                        <DESCRIPTION><ibis:include href="text/CRAFFTCS4Cat.xml"/></DESCRIPTION>
    99                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     93                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    10094                        <DEFAULT_SERIES_DIMENSION_NAME>CRAFFTCS4Cat</DEFAULT_SERIES_DIMENSION_NAME>
    10195                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    102                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     96                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    10397                        <MEASURE_TITLE_OVERRIDE>Substance abuse - CRAFFT index, current users</MEASURE_TITLE_OVERRIDE>
    10498                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    144138                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    145139                        </DATA_ISSUES>
    146                         <CRITERIA>
    147                                 <EXCLUDE>
    148                                         <MAP_NAMES>
    149                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    150                                         </MAP_NAMES>
    151                                 </EXCLUDE>
    152                         </CRITERIA>
     140                        <CRITERIA/>
    153141                </CONFIGURATION>
    154142
     
    156144                        <TITLE>Substance abuse - CRAFFT index, current users, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    157145                        <DESCRIPTION><ibis:include href="text/CRAFFTCS4Cat.xml"/></DESCRIPTION>
    158                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     146                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    159147                        <DEFAULT_SERIES_DIMENSION_NAME>CRAFFTCS4Cat</DEFAULT_SERIES_DIMENSION_NAME>
    160148                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    221209               
    222210                <CONFIGURATION><NAME>CRAFFTCS4Cat_MS_CNTY</NAME>
    223                         <TITLE>Substance abuse - CRAFFT index, current users, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     211                        <TITLE>Substance abuse - CRAFFT index, current users, Middle Schools, County-level</TITLE>
    224212                        <DESCRIPTION><ibis:include href="text/CRAFFTCS4Cat.xml"/></DESCRIPTION>
    225213                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or something named STATE so no map -->
     
    307295
    308296                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CRAFFTCS4Cat_HS_CNTY,CRAFFTCS4Cat_MS_CNTY"/>
    309                 <ibis:include href="dimension/State.xml"/>
     297                <ibis:include href="dimension/GeoState.xml"/>
    310298                <ibis:include href="dimension/GradeProxy.xml"/>
    311299                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="CRAFFTCS4Cat_HS_ST,CRAFFTCS4Cat_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CRAFFTCS4CatAny.xml

    r24300 r24358  
    3636
    3737                <CONFIGURATION><NAME>CRAFFTCS4CatAny_HS_ST</NAME>
    38                         <TITLE>Substance abuse - CRAFFT index, current users, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>Substance abuse - CRAFFT index, current users, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/CRAFFTCS4Cat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4141                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    42                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     42                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4343                        <MEASURE_TITLE_OVERRIDE>Substance abuse - CRAFFT index, current users</MEASURE_TITLE_OVERRIDE>
    4444                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9292                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9393                        </DATA_ISSUES>
    94                         <CRITERIA>
    95                                 <EXCLUDE>
    96                                         <MAP_NAMES>
    97                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    98                                         </MAP_NAMES>
    99                                 </EXCLUDE>
    100                         </CRITERIA>
     94                        <CRITERIA/>
    10195                </CONFIGURATION>
    10296
    10397                <CONFIGURATION><NAME>CRAFFTCS4CatAny_MS_ST</NAME>
    104                         <TITLE>Substance abuse - CRAFFT index, current users, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     98                        <TITLE>Substance abuse - CRAFFT index, current users, Middle Schools, State-level</TITLE>
    10599                        <DESCRIPTION><ibis:include href="text/CRAFFTCS4Cat.xml"/></DESCRIPTION>
    106                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     100                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    107101                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    108                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     102                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    109103                        <MEASURE_TITLE_OVERRIDE>Substance abuse - CRAFFT index, current users</MEASURE_TITLE_OVERRIDE>
    110104                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    158152                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    159153                        </DATA_ISSUES>
    160                         <CRITERIA>
    161                                 <EXCLUDE>
    162                                         <MAP_NAMES>
    163                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    164                                         </MAP_NAMES>
    165                                 </EXCLUDE>
    166                         </CRITERIA>
     154                        <CRITERIA/>
    167155                </CONFIGURATION>
    168156
     
    170158                        <TITLE>Substance abuse - CRAFFT index, current users, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    171159                        <DESCRIPTION><ibis:include href="text/CRAFFTCS4Cat.xml"/></DESCRIPTION>
    172                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     160                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    173161                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    174162                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    242230               
    243231                <CONFIGURATION><NAME>CRAFFTCS4CatAny_MS_CNTY</NAME>
    244                         <TITLE>Substance abuse - CRAFFT index, current users, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     232                        <TITLE>Substance abuse - CRAFFT index, current users, Middle Schools, County-level</TITLE>
    245233                        <DESCRIPTION><ibis:include href="text/CRAFFTCS4Cat.xml"/></DESCRIPTION>
    246234                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or something named STATE so no map -->
     
    355343
    356344                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CRAFFTCS4CatAny_HS_CNTY,CRAFFTCS4CatAny_MS_CNTY"/>
    357                 <ibis:include href="dimension/State.xml" configuration-name-list="CRAFFTCS4CatAny_HS_ST,CRAFFTCS4CatAny_MS_ST"/>
     345                <ibis:include href="dimension/GeoState.xml" configuration-name-list="CRAFFTCS4CatAny_HS_ST,CRAFFTCS4CatAny_MS_ST"/>
    358346                <ibis:include href="dimension/GradeProxy.xml"/>
    359347                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="CRAFFTCS4CatAny_HS_ST,CRAFFTCS4CatAny_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CensusRaceCat.xml

    r24317 r24358  
    3636
    3737                <CONFIGURATION><NAME>CensusRaceCat_HS_ST</NAME>
    38                         <TITLE>Census Race, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>Census Race, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/CensusRaceCat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4141                        <DEFAULT_SERIES_DIMENSION_NAME>CensusRaceCat</DEFAULT_SERIES_DIMENSION_NAME>
    4242                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    43                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     43                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4444                        <MEASURE_TITLE_OVERRIDE>Census Race</MEASURE_TITLE_OVERRIDE>
    4545                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    8585                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    8686                        </DATA_ISSUES>
    87                         <CRITERIA>
    88                                 <EXCLUDE>
    89                                         <MAP_NAMES>
    90                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    91                                         </MAP_NAMES>
    92                                 </EXCLUDE>
    93                         </CRITERIA>
     87                        <CRITERIA/>
    9488                </CONFIGURATION>
    9589
    9690                <CONFIGURATION><NAME>CensusRaceCat_MS_ST</NAME>
    97                         <TITLE>Census Race, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     91                        <TITLE>Census Race, Middle Schools, State-level</TITLE>
    9892                        <DESCRIPTION><ibis:include href="text/CensusRaceCat.xml"/></DESCRIPTION>
    99                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     93                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    10094                        <DEFAULT_SERIES_DIMENSION_NAME>CensusRaceCat</DEFAULT_SERIES_DIMENSION_NAME>
    10195                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    102                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     96                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    10397                        <MEASURE_TITLE_OVERRIDE>Census Race</MEASURE_TITLE_OVERRIDE>
    10498                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    144138                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    145139                        </DATA_ISSUES>
    146                         <CRITERIA>
    147                                 <EXCLUDE>
    148                                         <MAP_NAMES>
    149                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    150                                         </MAP_NAMES>
    151                                 </EXCLUDE>
    152                         </CRITERIA>
     140                        <CRITERIA/>
    153141                </CONFIGURATION>
    154142
     
    156144                        <TITLE>Census Race, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    157145                        <DESCRIPTION><ibis:include href="text/CensusRaceCat.xml"/></DESCRIPTION>
    158                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     146                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    159147                        <DEFAULT_SERIES_DIMENSION_NAME>CensusRaceCat</DEFAULT_SERIES_DIMENSION_NAME>
    160148                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    223211                </CONFIGURATION>
    224212                <CONFIGURATION><NAME>CensusRaceCat_MS_CNTY</NAME>
    225                         <TITLE>Census Race, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     213                        <TITLE>Census Race, Middle Schools, County-level</TITLE>
    226214                        <DESCRIPTION><ibis:include href="text/CensusRaceCat.xml"/></DESCRIPTION>
    227215                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or something named STATE so no map -->
     
    314302
    315303                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CensusRaceCat_HS_CNTY,CensusRaceCat_MS_CNTY"/>
    316                 <ibis:include href="dimension/State.xml"/>
     304                <ibis:include href="dimension/GeoState.xml"/>
    317305                <ibis:include href="dimension/GradeProxy.xml"/>
    318306                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="CensusRaceCat_HS_ST,CensusRaceCat_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CigPuffB413.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>CigPuffB413_HS_ST</NAME>
    46                         <TITLE>Cigarettes - first puff before age 13, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Cigarettes - first puff before age 13, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/CigPuffB413.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Cigarettes - first puff before age 13</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
    10498                <CONFIGURATION><NAME>CigPuffB413_MS_ST</NAME>
    105                         <TITLE>Cigarettes - first puff before age 13, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     99                        <TITLE>Cigarettes - first puff before age 13, Middle Schools, State-level</TITLE>
    106100                        <DESCRIPTION><ibis:include href="text/CigPuffB413.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     103                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    110104                        <MEASURE_TITLE_OVERRIDE>Cigarettes - first puff before age 13</MEASURE_TITLE_OVERRIDE>
    111105                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    152146                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    153147                        </DATA_ISSUES>
    154                         <CRITERIA>
    155                                 <EXCLUDE>
    156                                         <MAP_NAMES>
    157                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    158                                         </MAP_NAMES>
    159                                 </EXCLUDE>
    160                         </CRITERIA>
     148                        <CRITERIA/>
    161149                </CONFIGURATION>
    162150
     
    164152                        <TITLE>Cigarettes - first puff before age 13, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    165153                        <DESCRIPTION><ibis:include href="text/CigPuffB413.xml"/></DESCRIPTION>
    166                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     154                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    167155                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    168156                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    222210                </CONFIGURATION>
    223211                <CONFIGURATION><NAME>CigPuffB413_MS_CNTY</NAME>
    224                         <TITLE>Cigarettes - first puff before age 13, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     212                        <TITLE>Cigarettes - first puff before age 13, Middle Schools, County-level</TITLE>
    225213                        <DESCRIPTION><ibis:include href="text/CigPuffB413.xml"/></DESCRIPTION>
    226                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     214                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    227215                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    228216                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    322310               
    323311                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CigPuffB413_HS_CNTY,CigPuffB413_MS_CNTY"/>
    324                 <ibis:include href="dimension/State.xml" configuration-name-list="CigPuffB413_HS_ST,CigPuffB413_MS_ST"/>
     312                <ibis:include href="dimension/GeoState.xml" configuration-name-list="CigPuffB413_HS_ST,CigPuffB413_MS_ST"/>
    325313                <ibis:include href="dimension/GradeProxy.xml"/>
    326314                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="CigPuffB413_HS_ST,CigPuffB413_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CigQuit12M.xml

    r24183 r24358  
    4444
    4545                <CONFIGURATION><NAME>CigQuit12M_HS_ST</NAME>
    46                         <TITLE>Cigarette cessation - tried to quit, past 12 months, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Cigarette cessation - tried to quit, past 12 months, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/CigQuit12M.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Cigarette cessation - tried to quit, past 12 months</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397        </CONFIGURATIONS>
     
    144138                <ibis:include href="dimension/YearOdd_07_11.xml"/>
    145139               
    146                 <ibis:include href="dimension/State.xml"/>
     140                <ibis:include href="dimension/GeoState.xml"/>
    147141                <ibis:include href="dimension/GradeProxy.xml"/>
    148142                <ibis:include href="dimension/GradeHS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CigVaporCurr.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>CigVaporCurr_HS_ST</NAME>
    46                         <TITLE>Cigarettes or elec vapor products - use, past 30 days, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Cigarettes or elec vapor products - use, past 30 days, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/CigVaporCurr.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Cigarettes or elec vapor products - use, past 30 days</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
    10498                <CONFIGURATION><NAME>CigVaporCurr_MS_ST</NAME>
    105                         <TITLE>Cigarettes or elec vapor products - use, past 30 days, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     99                        <TITLE>Cigarettes or elec vapor products - use, past 30 days, Middle Schools, State-level</TITLE>
    106100                        <DESCRIPTION><ibis:include href="text/CigVaporCurr.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     103                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    110104                        <MEASURE_TITLE_OVERRIDE>Cigarettes or elec vapor products - use, past 30 days</MEASURE_TITLE_OVERRIDE>
    111105                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    152146                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    153147                        </DATA_ISSUES>
    154                         <CRITERIA>
    155                                 <EXCLUDE>
    156                                         <MAP_NAMES>
    157                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    158                                         </MAP_NAMES>
    159                                 </EXCLUDE>
    160                         </CRITERIA>
     148                        <CRITERIA/>
    161149                </CONFIGURATION>
    162150
     
    164152                        <TITLE>Cigarettes or elec vapor products - use, past 30 days, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    165153                        <DESCRIPTION><ibis:include href="text/CigVaporCurr.xml"/></DESCRIPTION>
    166                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     154                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    167155                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    168156                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    222210                </CONFIGURATION>
    223211                <CONFIGURATION><NAME>CigVaporCurr_MS_CNTY</NAME>
    224                         <TITLE>Cigarettes or elec vapor products - use, past 30 days, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     212                        <TITLE>Cigarettes or elec vapor products - use, past 30 days, Middle Schools, County-level</TITLE>
    225213                        <DESCRIPTION><ibis:include href="text/CigVaporCurr.xml"/></DESCRIPTION>
    226                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     214                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    227215                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    228216                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    322310               
    323311                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CigVaporCurr_HS_CNTY,CigVaporCurr_MS_CNTY"/>
    324                 <ibis:include href="dimension/State.xml" configuration-name-list="CigVaporCurr_HS_ST,CigVaporCurr_MS_ST"/>
     312                <ibis:include href="dimension/GeoState.xml" configuration-name-list="CigVaporCurr_HS_ST,CigVaporCurr_MS_ST"/>
    325313                <ibis:include href="dimension/GradeProxy.xml"/>
    326314                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="CigVaporCurr_HS_ST,CigVaporCurr_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CigWholeB413.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>CigWholeB413_HS_ST</NAME>
    46                         <TITLE>Cigarettes - first whole cig before age 13, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Cigarettes - first whole cig before age 13, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/CigWholeB413.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Cigarettes - first whole cig before age 13</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
    10498                <CONFIGURATION><NAME>CigWholeB413_MS_ST</NAME>
    105                         <TITLE>Cigarettes - first whole cig before age 13, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     99                        <TITLE>Cigarettes - first whole cig before age 13, Middle Schools, State-level</TITLE>
    106100                        <DESCRIPTION><ibis:include href="text/CigWholeB413.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     103                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    110104                        <MEASURE_TITLE_OVERRIDE>Cigarettes - first whole cig before age 13</MEASURE_TITLE_OVERRIDE>
    111105                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    173167                        <TITLE>Cigarettes - first whole cig before age 13, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    174168                        <DESCRIPTION><ibis:include href="text/CigWholeB413.xml"/></DESCRIPTION>
    175                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     169                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    176170                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    177171                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    237231                </CONFIGURATION>
    238232                                <CONFIGURATION><NAME>CigWholeB413_MS_CNTY</NAME>
    239                         <TITLE>Cigarettes - first whole cig before age 13, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     233                        <TITLE>Cigarettes - first whole cig before age 13, Middle Schools, County-level</TITLE>
    240234                        <DESCRIPTION><ibis:include href="text/CigWholeB413.xml"/></DESCRIPTION>
    241                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     235                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    242236                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    243237                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    350344               
    351345                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CigWholeB413_HS_CNTY,CigWholeB413_MS_CNTY"/>
    352                 <ibis:include href="dimension/State.xml" configuration-name-list="CigWholeB413_HS_ST,CigWholeB413_MS_ST"/>
     346                <ibis:include href="dimension/GeoState.xml" configuration-name-list="CigWholeB413_HS_ST,CigWholeB413_MS_ST"/>
    353347                <ibis:include href="dimension/GradeProxy.xml"/>
    354348                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="CigWholeB413_HS_ST,CigWholeB413_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CigsCurr.xml

    r24300 r24358  
    9595                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9696                        </DATA_ISSUES>
    97                         <CRITERIA>
    98                                 <EXCLUDE>
    99                                         <MAP_NAMES>
    100                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    101                                         </MAP_NAMES>
    102                                 </EXCLUDE>
    103                         </CRITERIA>
     97                        <CRITERIA/>
    10498                </CONFIGURATION>
    10599
     
    345339               
    346340                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CigsCurr_HS_CNTY,CigsCurr_MS_CNTY"/>
    347                 <ibis:include href="dimension/State.xml" configuration-name-list="CigsCurr_HS_ST,CigsCurr_MS_ST"/>
     341                <ibis:include href="dimension/GeoState.xml" configuration-name-list="CigsCurr_HS_ST,CigsCurr_MS_ST"/>
    348342                <ibis:include href="dimension/GradeProxy.xml"/>
    349343                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="CigsCurr_HS_ST,CigsCurr_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CigsEver.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>CigsEver_HS_ST</NAME>
    46                         <TITLE>Cigarettes - ever, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Cigarettes - ever, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/CigsEver.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Cigarettes - ever</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    109109
    110110                <CONFIGURATION><NAME>CigsEver_MS_ST</NAME>
    111                         <TITLE>Cigarettes - ever, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     111                        <TITLE>Cigarettes - ever, Middle Schools, State-level</TITLE>
    112112                        <DESCRIPTION><ibis:include href="text/CigsEver.xml"/></DESCRIPTION>
    113                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     113                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    114114                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    115                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     115                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    116116                        <MEASURE_TITLE_OVERRIDE>Cigarettes - ever</MEASURE_TITLE_OVERRIDE>
    117117                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    178178                        <TITLE>Cigarettes - ever, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    179179                        <DESCRIPTION><ibis:include href="text/CigsEver.xml"/></DESCRIPTION>
    180                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     180                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    181181                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    182182                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    244244               
    245245                <CONFIGURATION><NAME>CigsEver_MS_CNTY</NAME>
    246                         <TITLE>Cigarettes - ever, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     246                        <TITLE>Cigarettes - ever, Middle Schools, County-level</TITLE>
    247247                        <DESCRIPTION><ibis:include href="text/CigsEver.xml"/></DESCRIPTION>
    248                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     248                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    249249                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    250250                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    357357               
    358358                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CigsEver_HS_CNTY,CigsEver_MS_CNTY"/>
    359                 <ibis:include href="dimension/State.xml" configuration-name-list="CigsEver_HS_ST,CigsEver_MS_ST"/>
     359                <ibis:include href="dimension/GeoState.xml" configuration-name-list="CigsEver_HS_ST,CigsEver_MS_ST"/>
    360360                <ibis:include href="dimension/GradeProxy.xml"/>
    361361                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="CigsEver_HS_ST,CigsEver_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CigsFreq.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>CigsFreq_HS_ST</NAME>
    46                         <TITLE>Cigarettes - frequent use, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Cigarettes - frequent use, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/CigsFreq.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Cigarettes - frequent use</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
    10498                <CONFIGURATION><NAME>CigsFreq_MS_ST</NAME>
    105                         <TITLE>Cigarettes - frequent use, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     99                        <TITLE>Cigarettes - frequent use, Middle Schools, State-level</TITLE>
    106100                        <DESCRIPTION><ibis:include href="text/CigsFreq.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     103                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    110104                        <MEASURE_TITLE_OVERRIDE>Cigarettes - frequent use</MEASURE_TITLE_OVERRIDE>
    111105                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    152146                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    153147                        </DATA_ISSUES>
    154                         <CRITERIA>
    155                                 <EXCLUDE>
    156                                         <MAP_NAMES>
    157                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    158                                         </MAP_NAMES>
    159                                 </EXCLUDE>
    160                         </CRITERIA>
     148                        <CRITERIA/>
    161149                </CONFIGURATION>
    162150
     
    164152                        <TITLE>Cigarettes - frequent use, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    165153                        <DESCRIPTION><ibis:include href="text/CigsFreq.xml"/></DESCRIPTION>
    166                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     154                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    167155                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    168156                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    232220               
    233221                <CONFIGURATION><NAME>CigsFreq_MS_CNTY</NAME>
    234                         <TITLE>Cigarettes - frequent use, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     222                        <TITLE>Cigarettes - frequent use, Middle Schools, County-level</TITLE>
    235223                        <DESCRIPTION><ibis:include href="text/CigsFreq.xml"/></DESCRIPTION>
    236                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     224                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    237225                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    238226                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    345333               
    346334                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CigsFreq_HS_CNTY,CigsFreq_MS_CNTY"/>
    347                 <ibis:include href="dimension/State.xml" configuration-name-list="CigsFreq_HS_ST,CigsFreq_MS_ST"/>
     335                <ibis:include href="dimension/GeoState.xml" configuration-name-list="CigsFreq_HS_ST,CigsFreq_MS_ST"/>
    348336                <ibis:include href="dimension/GradeProxy.xml"/>
    349337                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="CigsFreq_HS_ST,CigsFreq_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CompleteHS5Cat.xml

    r24317 r24358  
    3636
    3737                <CONFIGURATION><NAME>CompleteHS5Cat_MS_ST</NAME>
    38                         <TITLE>High school - likelihood of completion, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>High school - likelihood of completion, Middle Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/CompleteHS5Cat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4141                        <DEFAULT_SERIES_DIMENSION_NAME>CompleteHS5Cat</DEFAULT_SERIES_DIMENSION_NAME>
    4242                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    43                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     43                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4444                        <MEASURE_TITLE_OVERRIDE>High school - likelihood of completion</MEASURE_TITLE_OVERRIDE>
    4545                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    8585                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    8686                        </DATA_ISSUES>
    87                         <CRITERIA>
    88                                 <EXCLUDE>
    89                                         <MAP_NAMES>
    90                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    91                                         </MAP_NAMES>
    92                                 </EXCLUDE>
    93                         </CRITERIA>
     87                        <CRITERIA/>
    9488                </CONFIGURATION>
    9589
    9690                <CONFIGURATION><NAME>CompleteHS5Cat_MS_CNTY</NAME>
    97                         <TITLE>High school - likelihood of completion, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     91                        <TITLE>High school - likelihood of completion, Middle Schools, County-level</TITLE>
    9892                        <DESCRIPTION><ibis:include href="text/CompleteHS5Cat.xml"/></DESCRIPTION>
    9993                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or something named STATE so no map -->
     
    185179
    186180                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CompleteHS5Cat_MS_CNTY"/>
    187                 <ibis:include href="dimension/State.xml" configuration-name-list="CompleteHS5Cat_MS_ST"/>
     181                <ibis:include href="dimension/GeoState.xml" configuration-name-list="CompleteHS5Cat_MS_ST"/>
    188182                <ibis:include href="dimension/GradeProxy.xml"/>
    189183                <ibis:include href="dimension/GradeMS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CompleteHS5CatAny.xml

    r24300 r24358  
    3636
    3737                <CONFIGURATION><NAME>CompleteHS5CatAny_MS_ST</NAME>
    38                         <TITLE>High school - likelihood of completion, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>High school - likelihood of completion, Middle Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/CompleteHS5Cat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4141                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    42                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     42                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4343                        <MEASURE_TITLE_OVERRIDE>High school - likelihood of completion</MEASURE_TITLE_OVERRIDE>
    4444                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9292                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9393                        </DATA_ISSUES>
    94                         <CRITERIA>
    95                                 <EXCLUDE>
    96                                         <MAP_NAMES>
    97                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    98                                         </MAP_NAMES>
    99                                 </EXCLUDE>
    100                         </CRITERIA>
     94                        <CRITERIA/>
    10195                </CONFIGURATION>
    10296
    10397                <CONFIGURATION><NAME>CompleteHS5CatAny_MS_CNTY</NAME>
    104                         <TITLE>High school - likelihood of completion, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     98                        <TITLE>High school - likelihood of completion, Middle Schools, County-level</TITLE>
    10599                        <DESCRIPTION><ibis:include href="text/CompleteHS5Cat.xml"/></DESCRIPTION>
    106100                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or something named STATE so no map -->
     
    219213
    220214                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CompleteHS5CatAny_MS_CNTY"/>
    221                 <ibis:include href="dimension/State.xml" configuration-name-list="CompleteHS5CatAny_MS_ST"/>
     215                <ibis:include href="dimension/GeoState.xml" configuration-name-list="CompleteHS5CatAny_MS_ST"/>
    222216                <ibis:include href="dimension/GradeProxy.xml"/>
    223217                <ibis:include href="dimension/GradeMS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CompletePostHS5Cat.xml

    r24236 r24358  
    4141                        <DEFAULT_SERIES_DIMENSION_NAME>CompletePostHS5Cat</DEFAULT_SERIES_DIMENSION_NAME>
    4242                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    43                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     43                        <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4444                        <MEASURE_TITLE_OVERRIDE>Education after high school - likelihood of attending</MEASURE_TITLE_OVERRIDE>
    4545                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9090               
    9191                <CONFIGURATION><NAME>CompletePostHS5Cat_HS_CNTY</NAME>
    92                         <TITLE>Education after high school - likelihood of attending, High Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     92                        <TITLE>Education after high school - likelihood of attending, High Schools, County-level</TITLE>
    9393                        <DESCRIPTION><ibis:include href="text/CompletePostHS5Cat.xml"/></DESCRIPTION>
    9494                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
     
    178178
    179179                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CompletePostHS5Cat_HS_CNTY"/>
    180                 <ibis:include href="dimension/State.xml"/>
     180                <ibis:include href="dimension/GeoState.xml"/>
    181181                <ibis:include href="dimension/GradeProxy.xml"/>
    182182                <ibis:include href="dimension/GradeHS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CompletePostHS5CatAny.xml

    r24300 r24358  
    3636
    3737                <CONFIGURATION><NAME>CompletePostHS5CatAny_HS_ST</NAME>
    38                         <TITLE>Education after high school - likelihood of attending, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>Education after high school - likelihood of attending, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/CompletePostHS5Cat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4141                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    42                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     42                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4343                        <MEASURE_TITLE_OVERRIDE>Education after high school - likelihood of attending</MEASURE_TITLE_OVERRIDE>
    4444                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9292                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9393                        </DATA_ISSUES>
    94                         <CRITERIA>
    95                                 <EXCLUDE>
    96                                         <MAP_NAMES>
    97                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    98                                         </MAP_NAMES>
    99                                 </EXCLUDE>
    100                         </CRITERIA>
     94                        <CRITERIA/>
    10195                </CONFIGURATION>
    10296               
    10397                <CONFIGURATION><NAME>CompletePostHS5CatAny_HS_CNTY</NAME>
    104                         <TITLE>Education after high school - likelihood of attending, High Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     98                        <TITLE>Education after high school - likelihood of attending, High Schools, County-level</TITLE>
    10599                        <DESCRIPTION><ibis:include href="text/CompletePostHS5Cat.xml"/></DESCRIPTION>
    106100                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or something named STATE so no map -->
     
    222216
    223217                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CompletePostHS5CatAny_HS_CNTY"/>
    224                 <ibis:include href="dimension/State.xml" configuration-name-list="CompletePostHS5CatAny_HS_ST"/>
     218                <ibis:include href="dimension/GeoState.xml" configuration-name-list="CompletePostHS5CatAny_HS_ST"/>
    225219                <ibis:include href="dimension/GradeProxy.xml"/>
    226220                <ibis:include href="dimension/GradeHS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/Concussion.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>Concussion_HS_ST</NAME>
    46                         <TITLE>Injury - concussion, past 12 months, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Injury - concussion, past 12 months, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/Concussion.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Injury - concussion, past 12 months</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
    10498                <CONFIGURATION><NAME>Concussion_MS_ST</NAME>
    105                         <TITLE>Injury - concussion, past 12 months, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     99                        <TITLE>Injury - concussion, past 12 months, Middle Schools, State-level</TITLE>
    106100                        <DESCRIPTION><ibis:include href="text/Concussion.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     103                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    110104                        <MEASURE_TITLE_OVERRIDE>Injury - concussion, past 12 months</MEASURE_TITLE_OVERRIDE>
    111105                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    152146                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    153147                        </DATA_ISSUES>
    154                         <CRITERIA>
    155                                 <EXCLUDE>
    156                                         <MAP_NAMES>
    157                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    158                                         </MAP_NAMES>
    159                                 </EXCLUDE>
    160                         </CRITERIA>
     148                        <CRITERIA/>
    161149                </CONFIGURATION>
    162150
     
    164152                        <TITLE>Injury - concussion, past 12 months, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    165153                        <DESCRIPTION><ibis:include href="text/Concussion.xml"/></DESCRIPTION>
    166                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     154                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    167155                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    168156                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    222210                </CONFIGURATION>
    223211                <CONFIGURATION><NAME>Concussion_MS_CNTY</NAME>
    224                         <TITLE>Injury - concussion, past 12 months, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     212                        <TITLE>Injury - concussion, past 12 months, Middle Schools, County-level</TITLE>
    225213                        <DESCRIPTION><ibis:include href="text/Concussion.xml"/></DESCRIPTION>
    226                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     214                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    227215                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    228216                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    324312               
    325313                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="Concussion_HS_CNTY,Concussion_MS_CNTY"/>
    326                 <ibis:include href="dimension/State.xml" configuration-name-list="Concussion_HS_ST,Concussion_MS_ST"/>
     314                <ibis:include href="dimension/GeoState.xml" configuration-name-list="Concussion_HS_ST,Concussion_MS_ST"/>
    327315                <ibis:include href="dimension/GradeProxy.xml"/>
    328316                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="Concussion_HS_ST,Concussion_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/ConcussionCountCat.xml

    r24317 r24358  
    3636
    3737                <CONFIGURATION><NAME>ConcussionCountCat_HS_ST</NAME>
    38                         <TITLE>Injury - number of concussions, past 12 months, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>Injury - number of concussions, past 12 months, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/ConcussionCountCat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>   <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> 
    4141                        <DEFAULT_SERIES_DIMENSION_NAME>ConcussionCountCat</DEFAULT_SERIES_DIMENSION_NAME>
    4242                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    43                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     43                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4444                        <MEASURE_TITLE_OVERRIDE>Injury - number of concussions, past 12 months</MEASURE_TITLE_OVERRIDE>
    4545                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    8585                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    8686                        </DATA_ISSUES>
    87                         <CRITERIA>
    88                                 <EXCLUDE>
    89                                         <MAP_NAMES>
    90                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    91                                         </MAP_NAMES>
    92                                 </EXCLUDE>
    93                         </CRITERIA>
     87                        <CRITERIA/>
    9488                </CONFIGURATION>
    9589
    9690                <CONFIGURATION><NAME>ConcussionCountCat_MS_ST</NAME>
    97                         <TITLE>Injury - number of concussions, past 12 months, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     91                        <TITLE>Injury - number of concussions, past 12 months, Middle Schools, State-level</TITLE>
    9892                        <DESCRIPTION><ibis:include href="text/ConcussionCountCat.xml"/></DESCRIPTION>
    99                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>   <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     93                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> 
    10094                        <DEFAULT_SERIES_DIMENSION_NAME>ConcussionCountCat</DEFAULT_SERIES_DIMENSION_NAME>
    10195                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    102                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     96                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    10397                        <MEASURE_TITLE_OVERRIDE>Injury - number of concussions, past 12 months</MEASURE_TITLE_OVERRIDE>
    10498                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    144138                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    145139                        </DATA_ISSUES>
    146                         <CRITERIA>
    147                                 <EXCLUDE>
    148                                         <MAP_NAMES>
    149                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    150                                         </MAP_NAMES>
    151                                 </EXCLUDE>
    152                         </CRITERIA>
     140                        <CRITERIA/>
    153141                </CONFIGURATION>
    154142
     
    156144                        <TITLE>Injury - number of concussions, past 12 months, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    157145                        <DESCRIPTION><ibis:include href="text/ConcussionCountCat.xml"/></DESCRIPTION>
    158                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     146                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    159147                        <DEFAULT_SERIES_DIMENSION_NAME>ConcussionCountCat</DEFAULT_SERIES_DIMENSION_NAME>
    160148                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    214202                </CONFIGURATION>
    215203                <CONFIGURATION><NAME>ConcussionCountCat_MS_CNTY</NAME>
    216                         <TITLE>Injury - number of concussions, past 12 months, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     204                        <TITLE>Injury - number of concussions, past 12 months, Middle Schools, County-level</TITLE>
    217205                        <DESCRIPTION><ibis:include href="text/ConcussionCountCat.xml"/></DESCRIPTION>
    218                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     206                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    219207                        <DEFAULT_SERIES_DIMENSION_NAME>ConcussionCountCat</DEFAULT_SERIES_DIMENSION_NAME>
    220208                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    300288
    301289                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="ConcussionCountCat_HS_CNTY,ConcussionCountCat_MS_CNTY"/>
    302                 <ibis:include href="dimension/State.xml"/>
     290                <ibis:include href="dimension/GeoState.xml"/>
    303291                <ibis:include href="dimension/GradeProxy.xml"/>
    304292                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="ConcussionCountCat_HS_ST,ConcussionCountCat_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/ConcussionCountCatAny.xml

    r24300 r24358  
    3636
    3737                <CONFIGURATION><NAME>ConcussionCountCatAny_HS_ST</NAME>
    38                         <TITLE>Injury - number of concussions, past 12 months, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>Injury - number of concussions, past 12 months, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/ConcussionCountCat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>   <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> 
    4141                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    42                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     42                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4343                        <MEASURE_TITLE_OVERRIDE>Injury - number of concussions, past 12 months</MEASURE_TITLE_OVERRIDE>
    4444                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9292                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9393                        </DATA_ISSUES>
    94                         <CRITERIA>
    95                                 <EXCLUDE>
    96                                         <MAP_NAMES>
    97                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    98                                         </MAP_NAMES>
    99                                 </EXCLUDE>
    100                         </CRITERIA>
     94                        <CRITERIA/>
    10195                </CONFIGURATION>
    10296
    10397                <CONFIGURATION><NAME>ConcussionCountCatAny_MS_ST</NAME>
    104                         <TITLE>Injury - number of concussions, past 12 months, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     98                        <TITLE>Injury - number of concussions, past 12 months, Middle Schools, State-level</TITLE>
    10599                        <DESCRIPTION><ibis:include href="text/ConcussionCountCat.xml"/></DESCRIPTION>
    106                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     100                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    107101                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    108                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     102                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    109103                        <MEASURE_TITLE_OVERRIDE>Injury - number of concussions, past 12 months</MEASURE_TITLE_OVERRIDE>
    110104                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    158152                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    159153                        </DATA_ISSUES>
    160                         <CRITERIA>
    161                                 <EXCLUDE>
    162                                         <MAP_NAMES>
    163                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    164                                         </MAP_NAMES>
    165                                 </EXCLUDE>
    166                         </CRITERIA>
     154                        <CRITERIA/>
    167155                </CONFIGURATION>
    168156
     
    170158                        <TITLE>Injury - number of concussions, past 12 months, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    171159                        <DESCRIPTION><ibis:include href="text/ConcussionCountCat.xml"/></DESCRIPTION>
    172                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     160                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    173161                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    174162                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    236224               
    237225                <CONFIGURATION><NAME>ConcussionCountCatAny_MS_CNTY</NAME>
    238                         <TITLE>Injury - number of concussions, past 12 months, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     226                        <TITLE>Injury - number of concussions, past 12 months, Middle Schools, County-level</TITLE>
    239227                        <DESCRIPTION><ibis:include href="text/ConcussionCountCat.xml"/></DESCRIPTION>
    240                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     228                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    241229                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    242230                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    349337
    350338                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="ConcussionCountCatAny_HS_CNTY,ConcussionCountCatAny_MS_CNTY"/>
    351                 <ibis:include href="dimension/State.xml" configuration-name-list="ConcussionCountCatAny_HS_ST,ConcussionCountCatAny_MS_ST"/>
     339                <ibis:include href="dimension/GeoState.xml" configuration-name-list="ConcussionCountCatAny_HS_ST,ConcussionCountCatAny_MS_ST"/>
    352340                <ibis:include href="dimension/GradeProxy.xml"/>
    353341                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="ConcussionCountCatAny_HS_ST,ConcussionCountCatAny_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/Controlled.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>Controlled_HS_ST</NAME>
    46                         <TITLE>Emotional abuse - by partner, past 12 months, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Emotional abuse - by partner, past 12 months, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/Controlled.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Emotional abuse - by partner, past 12 months</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
    10498                <CONFIGURATION><NAME>Controlled_MS_ST</NAME>
    105                         <TITLE>Emotional abuse - by partner, past 12 months, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     99                        <TITLE>Emotional abuse - by partner, past 12 months, Middle Schools, State-level</TITLE>
    106100                        <DESCRIPTION><ibis:include href="text/Controlled.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     103                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    110104                        <MEASURE_TITLE_OVERRIDE>Emotional abuse - by partner, past 12 months</MEASURE_TITLE_OVERRIDE>
    111105                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    152146                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    153147                        </DATA_ISSUES>
    154                         <CRITERIA>
    155                                 <EXCLUDE>
    156                                         <MAP_NAMES>
    157                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    158                                         </MAP_NAMES>
    159                                 </EXCLUDE>
    160                         </CRITERIA>
     148                        <CRITERIA/>
    161149                </CONFIGURATION>
    162150
     
    164152                        <TITLE>Emotional abuse - by partner, past 12 months, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    165153                        <DESCRIPTION><ibis:include href="text/Controlled.xml"/></DESCRIPTION>
    166                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     154                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    167155                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    168156                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    222210                </CONFIGURATION>
    223211                <CONFIGURATION><NAME>Controlled_MS_CNTY</NAME>
    224                         <TITLE>Emotional abuse - by partner, past 12 months, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     212                        <TITLE>Emotional abuse - by partner, past 12 months, Middle Schools, County-level</TITLE>
    225213                        <DESCRIPTION><ibis:include href="text/Controlled.xml"/></DESCRIPTION>
    226                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     214                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    227215                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    228216                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    324312               
    325313                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="Controlled_HS_CNTY,Controlled_MS_CNTY"/>
    326                 <ibis:include href="dimension/State.xml" configuration-name-list="Controlled_HS_ST,Controlled_MS_ST"/>
     314                <ibis:include href="dimension/GeoState.xml" configuration-name-list="Controlled_HS_ST,Controlled_MS_ST"/>
    327315                <ibis:include href="dimension/GradeProxy.xml"/>
    328316                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="Controlled_HS_ST,Controlled_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CountyIndCat.xml

    r24317 r24358  
    3636
    3737                <CONFIGURATION><NAME>CountyIndCat_HS_ST</NAME>
    38                         <TITLE>County, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>County, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/CountyIndCat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4141                        <DEFAULT_SERIES_DIMENSION_NAME>CountyIndCat</DEFAULT_SERIES_DIMENSION_NAME>
    4242                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    43                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     43                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4444                        <MEASURE_TITLE_OVERRIDE>County</MEASURE_TITLE_OVERRIDE>
    4545                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    8686                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    8787                        </DATA_ISSUES>
    88                         <CRITERIA>
    89                                 <EXCLUDE>
    90                                         <MAP_NAMES>
    91                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    92                                         </MAP_NAMES>
    93                                 </EXCLUDE>
    94                         </CRITERIA>
     88                        <CRITERIA/>
    9589                </CONFIGURATION>
    9690
    9791                <CONFIGURATION><NAME>CountyIndCat_MS_ST</NAME>
    98                         <TITLE>County, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     92                        <TITLE>County, Middle Schools, State-level</TITLE>
    9993                        <DESCRIPTION><ibis:include href="text/CountyIndCat.xml"/></DESCRIPTION>
    100                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     94                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    10195                        <DEFAULT_SERIES_DIMENSION_NAME>CountyIndCat</DEFAULT_SERIES_DIMENSION_NAME>
    10296                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    103                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     97                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    10498                        <MEASURE_TITLE_OVERRIDE>County</MEASURE_TITLE_OVERRIDE>
    10599                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    145139                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    146140                        </DATA_ISSUES>
    147                         <CRITERIA>
    148                                 <EXCLUDE>
    149                                         <MAP_NAMES>
    150                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    151                                         </MAP_NAMES>
    152                                 </EXCLUDE>
    153                         </CRITERIA>
     141                        <CRITERIA/>
    154142                </CONFIGURATION>
    155143
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/CurAlcoholUse.xml

    r24300 r24358  
    9595                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9696                        </DATA_ISSUES>
    97                         <CRITERIA>
    98                                 <EXCLUDE>
    99                                         <MAP_NAMES>
    100                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    101                                         </MAP_NAMES>
    102                                 </EXCLUDE>
    103                         </CRITERIA>
     97                        <CRITERIA/>
    10498                </CONFIGURATION>
    10599
     
    154148                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    155149                        </DATA_ISSUES>
    156                         <CRITERIA>
    157                                 <EXCLUDE>
    158                                         <MAP_NAMES>
    159                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    160                                         </MAP_NAMES>
    161                                 </EXCLUDE>
    162                         </CRITERIA>
     150                        <CRITERIA/>
    163151                </CONFIGURATION>
    164152
     
    343331
    344332                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="CurAlcoholUse_HS_CNTY,CurAlcoholUse_MS_CNTY"/>
    345                 <ibis:include href="dimension/State.xml" configuration-name-list="CurAlcoholUse_HS_ST,CurAlcoholUse_MS_ST"/>
     333                <ibis:include href="dimension/GeoState.xml" configuration-name-list="CurAlcoholUse_HS_ST,CurAlcoholUse_MS_ST"/>
    346334                <ibis:include href="dimension/GradeProxy.xml"/>
    347335                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="CurAlcoholUse_HS_ST,CurAlcoholUse_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/DOHRaceCat.xml

    r24317 r24358  
    3636
    3737                <CONFIGURATION><NAME>DOHRaceCat_HS_ST</NAME>
    38                         <TITLE>DOH Race Ethnicity, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     38                        <TITLE>DOH Race Ethnicity, High Schools, State-level</TITLE>
    3939                        <DESCRIPTION><ibis:include href="text/DOHRaceCat.xml"/></DESCRIPTION>
    40                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     40                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4141                        <DEFAULT_SERIES_DIMENSION_NAME>DOHRaceCat</DEFAULT_SERIES_DIMENSION_NAME>
    4242                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    43                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     43                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    4444                        <MEASURE_TITLE_OVERRIDE>DOH Race Ethnicity</MEASURE_TITLE_OVERRIDE>
    4545                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    8585                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    8686                        </DATA_ISSUES>
    87                         <CRITERIA>
    88                                 <EXCLUDE>
    89                                         <MAP_NAMES>
    90                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    91                                         </MAP_NAMES>
    92                                 </EXCLUDE>
    93                         </CRITERIA>
     87                        <CRITERIA/>
    9488                </CONFIGURATION>
    9589
    9690                <CONFIGURATION><NAME>DOHRaceCat_MS_ST</NAME>
    97                         <TITLE>DOH Race Ethnicity, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     91                        <TITLE>DOH Race Ethnicity, Middle Schools, State-level</TITLE>
    9892                        <DESCRIPTION><ibis:include href="text/DOHRaceCat.xml"/></DESCRIPTION>
    99                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     93                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    10094                        <DEFAULT_SERIES_DIMENSION_NAME>DOHRaceCat</DEFAULT_SERIES_DIMENSION_NAME>
    10195                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    102                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     96                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    10397                        <MEASURE_TITLE_OVERRIDE>DOH Race Ethnicity</MEASURE_TITLE_OVERRIDE>
    10498                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    144138                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    145139                        </DATA_ISSUES>
    146                         <CRITERIA>
    147                                 <EXCLUDE>
    148                                         <MAP_NAMES>
    149                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    150                                         </MAP_NAMES>
    151                                 </EXCLUDE>
    152                         </CRITERIA>
     140                        <CRITERIA/>
    153141                </CONFIGURATION>
    154142
     
    156144                        <TITLE>DOH Race Ethnicity, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    157145                        <DESCRIPTION><ibis:include href="text/DOHRaceCat.xml"/></DESCRIPTION>
    158                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     146                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    159147                        <DEFAULT_SERIES_DIMENSION_NAME>DOHRaceCat</DEFAULT_SERIES_DIMENSION_NAME>
    160148                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
     
    223211                </CONFIGURATION>
    224212                <CONFIGURATION><NAME>DOHRaceCat_MS_CNTY</NAME>
    225                         <TITLE>DOH Race Ethnicity, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     213                        <TITLE>DOH Race Ethnicity, Middle Schools, County-level</TITLE>
    226214                        <DESCRIPTION><ibis:include href="text/DOHRaceCat.xml"/></DESCRIPTION>
    227215                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or something named STATE so no map -->
     
    314302
    315303                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="DOHRaceCat_HS_CNTY,DOHRaceCat_MS_CNTY"/>
    316                 <ibis:include href="dimension/State.xml"/>
     304                <ibis:include href="dimension/GeoState.xml"/>
    317305                <ibis:include href="dimension/GradeProxy.xml"/>
    318306                <ibis:include href="dimension/GradeHS.xml" configuration-name-list="DOHRaceCat_HS_ST,DOHRaceCat_HS_CNTY"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/DeprsStopAct.xml

    r24300 r24358  
    9595                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9696                        </DATA_ISSUES>
    97                         <CRITERIA>
    98                                 <EXCLUDE>
    99                                         <MAP_NAMES>
    100                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    101                                         </MAP_NAMES>
    102                                 </EXCLUDE>
    103                         </CRITERIA>
     97                        <CRITERIA/>
    10498                </CONFIGURATION>
    10599
     
    216210               
    217211                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="DeprsStopAct_HS_CNTY"/>
    218                 <ibis:include href="dimension/State.xml" configuration-name-list="DeprsStopAct_HS_ST"/>
     212                <ibis:include href="dimension/GeoState.xml" configuration-name-list="DeprsStopAct_HS_ST"/>
    219213                <ibis:include href="dimension/GradeProxy.xml"/>
    220214                <ibis:include href="dimension/GradeHS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/DeprsStopActEver.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>DeprsStopActEver_MS_ST</NAME>
    46                         <TITLE>Depression - ever, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Depression - ever, Middle Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/DeprsStopActEver.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Depression - ever</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397               
    10498                <CONFIGURATION><NAME>DeprsStopActEver_MS_CNTY</NAME>
    105                         <TITLE>Depression - ever, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     99                        <TITLE>Depression - ever, Middle Schools, County-level</TITLE>
    106100                        <DESCRIPTION><ibis:include href="text/DeprsStopActEver.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109103                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    202196               
    203197                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="DeprsStopActEver_MS_CNTY"/>
    204                 <ibis:include href="dimension/State.xml" configuration-name-list="DeprsStopActEver_MS_ST"/>
     198                <ibis:include href="dimension/GeoState.xml" configuration-name-list="DeprsStopActEver_MS_ST"/>
    205199                <ibis:include href="dimension/GradeProxy.xml"/>
    206200                <ibis:include href="dimension/GradeMS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/DidBullyElec12M.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>DidBullyElec12M_HS_ST</NAME>
    46                         <TITLE>Bullied - someone else electronically, past 12 months, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Bullied - someone else electronically, past 12 months, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/DidBullyElec12M.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Bullied - someone else electronically, past 12 months</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
     
    10599                        <TITLE>Bullied - someone else electronically, past 12 months, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    106100                        <DESCRIPTION><ibis:include href="text/DidBullyElec12M.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109103                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    208202               
    209203                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="DidBullyElec12M_HS_CNTY"/>
    210                 <ibis:include href="dimension/State.xml" configuration-name-list="DidBullyElec12M_HS_ST"/>
     204                <ibis:include href="dimension/GeoState.xml" configuration-name-list="DidBullyElec12M_HS_ST"/>
    211205                <ibis:include href="dimension/GradeProxy.xml"/>
    212206                <ibis:include href="dimension/GradeHS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/DidBullyElecEver.xml

    r24300 r24358  
    4444               
    4545                <CONFIGURATION><NAME>DidBullyElecEver_MS_ST</NAME>
    46                         <TITLE>Bullied - someone else electronically, ever, Middle Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Bullied - someone else electronically, ever, Middle Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/DidBullyElecEver.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Bullied - someone else electronically, ever</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397                <CONFIGURATION><NAME>DidBullyElecEver_MS_CNTY</NAME>
    104                         <TITLE>Bullied - someone else electronically, ever, Middle Schools, County-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     98                        <TITLE>Bullied - someone else electronically, ever, Middle Schools, County-level</TITLE>
    10599                        <DESCRIPTION><ibis:include href="text/DidBullyElecEver.xml"/></DESCRIPTION>
    106                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>  <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     100                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    107101                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    108102                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    201195               
    202196                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="DidBullyElecEver_MS_CNTY"/>
    203                 <ibis:include href="dimension/State.xml" configuration-name-list="DidBullyElecEver_MS_ST"/>
     197                <ibis:include href="dimension/GeoState.xml" configuration-name-list="DidBullyElecEver_MS_ST"/>
    204198                <ibis:include href="dimension/GradeProxy.xml"/>
    205199                <ibis:include href="dimension/GradeMS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/DrkJuice1Plus.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>DrkJuice1Plus_HS_ST</NAME>
    46                         <TITLE>Nutrition - juice drink, 1+ per day, past 7 days, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Nutrition - juice drink, 1+ per day, past 7 days, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/DrkJuice1Plus.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    50                          <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME> <!-- Part of not having a map displayed -->
     50                         <DEFAULT_MAP_NAME>None</DEFAULT_MAP_NAME>
    5151                        <MEASURE_TITLE_OVERRIDE>Nutrition - juice drink, 1+ per day, past 7 days</MEASURE_TITLE_OVERRIDE>
    5252                        <MEASURE_NAME>Pct</MEASURE_NAME>
     
    9393                                <ibis:include href="data_issue/AsymConfInt.xml"/>
    9494                        </DATA_ISSUES>
    95                         <CRITERIA>
    96                                 <EXCLUDE>
    97                                         <MAP_NAMES>
    98                                                 <ALL_FLAG/> <!-- This will turn off all selection of  maps -->
    99                                         </MAP_NAMES>
    100                                 </EXCLUDE>
    101                         </CRITERIA>
     95                        <CRITERIA/>
    10296                </CONFIGURATION>
    10397
     
    10599                        <TITLE>Nutrition - juice drink, 1+ per day, past 7 days, High Schools, County-level</TITLE><!-- Short Title, - this is the title on the Query Builder page -->
    106100                        <DESCRIPTION><ibis:include href="text/DrkJuice1Plus.xml"/></DESCRIPTION>
    107                         <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     101                        <DEFAULT_CATEGORY_DIMENSION_NAME>GeoCnty</DEFAULT_CATEGORY_DIMENSION_NAME>
    108102                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHART_NAME>
    109103                        <DEFAULT_MAP_NAME>DEFAULT_YelOrRed</DEFAULT_MAP_NAME>
     
    208202               
    209203                <ibis:include href="dimension/GeoCnty.xml" configuration-name-list="DrkJuice1Plus_HS_CNTY"/>
    210                 <ibis:include href="dimension/State.xml" configuration-name-list="DrkJuice1Plus_HS_ST"/>
     204                <ibis:include href="dimension/GeoState.xml" configuration-name-list="DrkJuice1Plus_HS_ST"/>
    211205                <ibis:include href="dimension/GradeProxy.xml"/>
    212206                <ibis:include href="dimension/GradeHS.xml"/>
  • adopters/hi/trunk/src/main/webapps/hhdw-content/xml/query/module/yrbs/DrkMilk3Plus.xml

    r24300 r24358  
    4444
    4545                <CONFIGURATION><NAME>DrkMilk3Plus_HS_ST</NAME>
    46                         <TITLE>Nutrition - milk, 3+ per day, past 7 days, High Schools, State-level</TITLE><!-- Short Title, this is the title on the Query Builder page -->
     46                        <TITLE>Nutrition - milk, 3+ per day, past 7 days, High Schools, State-level</TITLE>
    4747                        <DESCRIPTION><ibis:include href="text/DrkMilk3Plus.xml"/></DESCRIPTION>
    48                         <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME> <!-- Defines what the default category dimension be, year, or if Geo, GeoProxy, or someting named STATE so no map -->
     48                        <DEFAULT_CATEGORY_DIMENSION_NAME>YearProxy</DEFAULT_CATEGORY_DIMENSION_NAME>
    4949                        <DEFAULT_CHART_NAME>GroupedHorzBar</DEFAULT_CHA