Changeset 12435 in main


Ignore:
Timestamp:
12/02/16 13:19:27 (6 years ago)
Author:
Tong Zheng
Message:

fix brfss map

Location:
adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss
Files:
2 added
1 deleted
25 edited

Legend:

Unmodified
Added
Removed
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/BRFSSAgeAdj8.xml

    r11719 r12435  
    1069610696    <ibis:include href="dimension/LandlineCell_Fall.xml"/>
    1069710697     <ibis:include href="dimension/GeoProxy.xml" />
    10698     <ibis:include href="dimension/GeoLHD2014Bef.xml" />
     10698    <ibis:include href="dimension/GeoLHD.xml" />
    1069910699    <ibis:include href="dimension/GeoCnty.xml" />
    1070010700        <ibis:include href="dimension/GeoSarea.xml" />
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/BRFSSAgeAdj8NoSex.xml

    r11719 r12435  
    866866       
    867867        <ibis:include href="dimension/GeoProxy.xml"/>                                               <ibis:include href="dimension/GeoSarea.xml"/>       
    868     <ibis:include href="dimension/GeoLHD2014Bef.xml" />
     868    <ibis:include href="dimension/GeoLHD.xml" />
    869869    <ibis:include href="dimension/GeoCnty.xml"/>
    870870    <ibis:include href="dimension/GeoUrban.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/BRFSSAgeAdj8_18-44FolicDay.xml

    r11719 r12435  
    285285       
    286286         <ibis:include href="dimension/GeoProxy.xml"/>
    287     <ibis:include href="dimension/GeoLHD2014Bef.xml" />
     287    <ibis:include href="dimension/GeoLHD.xml" />
    288288        <ibis:include href="dimension/Geosarea.xml"/>
    289289       
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/BRFSSAgeAdj8_RecCCS1.xml

    r11719 r12435  
    436436       
    437437     <ibis:include href="dimension/GeoProxy.xml"/>
    438     <ibis:include href="dimension/GeoLHD2014Bef.xml" />
     438    <ibis:include href="dimension/GeoLHD.xml" />
    439439    <ibis:include href="dimension/GeoCnty.xml"/>
    440440        <ibis:include href="dimension/GeoSarea.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/BRFSSCrude.xml

    r11719 r12435  
    1057310573    <ibis:include href="dimension/LandlineCell_Fall.xml"/>
    1057410574    <ibis:include href="dimension/GeoProxy.xml" />
    10575     <ibis:include href="dimension/GeoLHD2014Bef.xml" />
     10575    <ibis:include href="dimension/GeoLHD.xml" />
    1057610576    <ibis:include href="dimension/GeoSarea.xml"/>
    1057710577    <ibis:include href="dimension/GeoCnty.xml" />
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/BRFSSCrude18-44.xml

    r11719 r12435  
    257257               
    258258                <ibis:include href="dimension/GeoProxy.xml"/>                                               <ibis:include href="dimension/GeoSarea.xml"/>       
    259                 <ibis:include href="dimension/GeoLHD2014Bef.xml" />
     259                <ibis:include href="dimension/GeoLHD.xml" />
    260260                <ibis:include href="dimension/GeoCnty.xml"/>
    261261                <ibis:include href="dimension/GeoUrban.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/BRFSSCrude40.xml

    r11719 r12435  
    460460            <ibis:include href="dimension/GeoProxy.xml"/>                                             
    461461                 <ibis:include href="dimension/GeoSarea.xml"/>       
    462     <ibis:include href="dimension/GeoLHD2014Bef.xml" />
     462    <ibis:include href="dimension/GeoLHD.xml" />
    463463    <ibis:include href="dimension/GeoCnty.xml"/>
    464464    <ibis:include href="dimension/GeoUrban.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/BRFSSCrude50.xml

    r11719 r12435  
    339339       
    340340         <ibis:include href="dimension/GeoProxy.xml"/>                                               <ibis:include href="dimension/GeoSarea.xml"/>       
    341     <ibis:include href="dimension/GeoLHD2014Bef.xml" />
     341    <ibis:include href="dimension/GeoLHD.xml" />
    342342    <ibis:include href="dimension/GeoCnty.xml"/>
    343343    <ibis:include href="dimension/GeoUrban.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/LandlineCellAgeAdj8_BMI.xml

    r11719 r12435  
    6161      <VALUE>year&gt;=2009</VALUE>
    6262    </PARAMETER>
     63        <!--PARAMETER>
     64          <NAME>_SeriesGroupByDimensionName</NAME>
     65          <VALUE>LandlineCell_BMI_ageadjust</VALUE>
     66    </PARAMETER-->
     67               
    6368    <PARAMETER>
    6469      <NAME>func</NAME>
     
    166171        <PARAMETER>
    167172          <NAME>filter_exclude</NAME>
    168           <VALUE>LandlineCell_BMI</VALUE>
     173          <VALUE>LandlineCell_BMI_ageadjust</VALUE>
    169174        </PARAMETER>
    170175        <PARAMETER>
    171176          <NAME>spvar1</NAME>
    172           <VALUE>%LandlineCell_BMI%</VALUE>
     177          <VALUE>%LandlineCell_BMI_ageadjust%</VALUE>
    173178        </PARAMETER>
    174179        <PARAMETER>
     
    205210            <SELECTION>
    206211              <NAME>IndicatorProxyLandlineCell</NAME>
    207               <VALUE>LandlineCell_BMI</VALUE>
     212              <VALUE>LandlineCell_BMI_ageadjust</VALUE>
    208213            </SELECTION>
    209214          </SELECTIONS>
     
    221226      <!--ibis:include href="section/VarLevel.xml" /-->
    222227     
    223       <ibis:include href="section/LandlineCell_BMI.xml" />
     228      <ibis:include href="section/LandlineCell_BMI_ageadjust.xml" />
    224229     
    225230      <ibis:include href="section/YearLandlineCell.xml" />
     
    307312    <ibis:include href="dimension/LandlineCell_PhysMS.xml" />
    308313        <ibis:include href="dimension/LandlineCell_OverWtObese.xml" />
    309     <ibis:include href="dimension/LandlineCell_BMI.xml" />
     314    <ibis:include href="dimension/LandlineCell_BMI_ageadjust.xml" />
    310315    <ibis:include href="dimension/LandlineCell_FruitDay.xml" />
    311316    <ibis:include href="dimension/LandlineCell_VegDay.xml" />
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/LandlineCellCrude_GeneralHlthStat.xml

    r11719 r12435  
    196196      <!--ibis:include href="section/IndicatorLandlineCell.xml"/-->
    197197      <ibis:include href="section/IndicatorLandlineCell.xml" />
    198       <ibis:include href="section/Geo.xml" />
     198      <ibis:include href="section/Geo_2015.xml" />
    199199    </SECTIONS>
    200200  </CRITERIA>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/dimension/GeoLHD.xml

    r12100 r12435  
    33<DIMENSION>
    44        <NAME>GeoLHD</NAME>
    5         <TITLE>Local Health District</TITLE>
     5        <TITLE>Local Health District 2014</TITLE>
    66        <PROXY_DIMENSION_NAME>GeoProxy</PROXY_DIMENSION_NAME>
    77        <VALUES>
     
    1010                <VALUE>3<TITLE>Davis County LHD</TITLE><SORT_ORDER>3</SORT_ORDER></VALUE>
    1111                <VALUE>4<TITLE>Salt Lake County LHD</TITLE><SORT_ORDER>4</SORT_ORDER></VALUE>
    12                 <VALUE>13<TITLE>San Juan, LHD (2015 and after)</TITLE><SORT_ORDER>5</SORT_ORDER></VALUE>
     12                <VALUE>13<TITLE>San Juan, LHD (2015 and after)</TITLE><NOT_SELECTABLE_FLAG/><SORT_ORDER>5</SORT_ORDER></VALUE>
    1313                <VALUE>5<TITLE>Southeast Utah LHD (2014 and before)</TITLE><SORT_ORDER>6</SORT_ORDER></VALUE>
    14                 <VALUE>5.1<TITLE>Southeast Utah LHD (2015 and after) </TITLE><SORT_ORDER>7</SORT_ORDER></VALUE>
     14                <VALUE>5.1<TITLE>Southeast Utah LHD (2015 and after) </TITLE><NOT_SELECTABLE_FLAG/><SORT_ORDER>7</SORT_ORDER></VALUE>
    1515                <VALUE>6<TITLE>Southwest Utah LHD</TITLE><SORT_ORDER>8</SORT_ORDER></VALUE>
    1616                <VALUE>7<TITLE>Summit County LHD</TITLE><SORT_ORDER>9</SORT_ORDER></VALUE>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/dimensions/Landline.xml

    r11719 r12435  
    8484    <ibis:include href="../dimension/LandlineCell_Fall.xml"/>
    8585     <ibis:include href="../dimension/GeoProxy.xml" />
    86     <ibis:include href="../dimension/GeoLHD2014Bef.xml" />
     86    <ibis:include href="../dimension/GeoLHD.xml" />                                          <ibis:include href="../dimension/GeoLHD_2015.xml" />
    8787    <ibis:include href="../dimension/GeoCnty.xml" />
    8888        <ibis:include href="../dimension/GeoSarea.xml" />
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/dimensions/Landline18_44.xml

    r11725 r12435  
    6363  <ibis:include href="../dimension/GeoProxy.xml"/>
    6464  <ibis:include href="../dimension/GeoSarea.xml"/>
    65   <ibis:include href="../dimension/GeoLHD2014Bef.xml" />
     65  <ibis:include href="../dimension/GeoLHD.xml" />                                         
     66  <ibis:include href="../dimension/GeoLHD_2015.xml" />
    6667  <ibis:include href="../dimension/GeoCnty.xml"/>
    6768  <ibis:include href="../dimension/GeoUrban.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/dimensions/Landline18_44_NoAge.xml

    r11719 r12435  
    6161       
    6262         <ibis:include href="../dimension/GeoProxy.xml"/>
    63     <ibis:include href="../dimension/GeoLHD2014Bef.xml" />
     63    <ibis:include href="../dimension/GeoLHD.xml" />                                         
     64        <ibis:include href="../dimension/GeoLHD_2015.xml" />
    6465        <ibis:include href="../dimension/Geosarea.xml"/>
    6566       
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/dimensions/Landline40+.xml

    r11719 r12435  
    6565            <ibis:include href="../dimension/GeoProxy.xml"/>                                             
    6666                 <ibis:include href="../dimension/GeoSarea.xml"/>       
    67     <ibis:include href="../dimension/GeoLHD2014Bef.xml" />
     67    <ibis:include href="../dimension/GeoLHD.xml" />                                         
     68         <ibis:include href="../dimension/GeoLHD_2015.xml" />
    6869    <ibis:include href="../dimension/GeoCnty.xml"/>
    6970    <ibis:include href="../dimension/GeoUrban.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/dimensions/Landline40+_NoAge.xml

    r11719 r12435  
    6363            <ibis:include href="../dimension/GeoProxy.xml"/>                                             
    6464                 <ibis:include href="../dimension/GeoSarea.xml"/>       
    65     <ibis:include href="../dimension/GeoLHD2014Bef.xml" />
     65    <ibis:include href="../dimension/GeoLHD.xml" />                                         
     66        <ibis:include href="../dimension/GeoLHD_2015.xml" />
    6667    <ibis:include href="../dimension/GeoCnty.xml"/>
    6768    <ibis:include href="../dimension/GeoUrban.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/dimensions/Landline50+.xml

    r11719 r12435  
    6969       
    7070         <ibis:include href="../dimension/GeoProxy.xml"/>                                               <ibis:include href="../dimension/GeoSarea.xml"/>       
    71     <ibis:include href="../dimension/GeoLHD2014Bef.xml" />
     71    <ibis:include href="../dimension/GeoLHD.xml" />                                         
     72        <ibis:include href="../dimension/GeoLHD_2015.xml" />
    7273    <ibis:include href="../dimension/GeoCnty.xml"/>
    7374    <ibis:include href="../dimension/GeoUrban.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/dimensions/Landline50+_NoAge.xml

    r11719 r12435  
    7070         <ibis:include href="../dimension/GeoProxy.xml"/>                                               
    7171         <ibis:include href="../dimension/GeoSarea.xml"/>       
    72     <ibis:include href="../dimension/GeoLHD2014Bef.xml" />
     72    <ibis:include href="../dimension/GeoLHD.xml" />                                         
     73        <ibis:include href="../dimension/GeoLHD_2015.xml" />
    7374    <ibis:include href="../dimension/GeoCnty.xml"/>
    7475    <ibis:include href="../dimension/GeoUrban.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/dimensions/LandlineCell.xml

    r11719 r12435  
    9797       
    9898  <ibis:include href="../dimension/GeoProxy.xml" />
    99   <ibis:include href="../dimension/GeoLHD.xml" />
     99  <ibis:include href="../dimension/GeoLHD.xml" />                                         
     100  <ibis:include href="../dimension/GeoLHD_2015.xml" />
     101  <ibis:include href="../dimension/GeoLHD_2015.xml" />
    100102  <ibis:include href="../dimension/GeoCnty.xml" />
    101103  <ibis:include href="../dimension/GeoSarea.xml" />
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/dimensions/LandlineCell_NoAge.xml

    r11719 r12435  
    7575        <ibis:include href="../dimension/LandlineCell_OverWtObese.xml" />
    7676    <ibis:include href="../dimension/LandlineCell_BMI.xml" />
     77        <ibis:include href="../dimension/LandlineCell_BMI_ageadjust.xml" />
    7778    <ibis:include href="../dimension/LandlineCell_FruitDay.xml" />
    7879    <ibis:include href="../dimension/LandlineCell_VegDay.xml" />
     
    102103        <ibis:include href="../dimension/GeoProxy.xml" />
    103104        <ibis:include href="../dimension/GeoSarea.xml" />
    104     <ibis:include href="../dimension/GeoLHD.xml" />
     105    <ibis:include href="../dimension/GeoLHD.xml" />                                         
     106         <ibis:include href="../dimension/GeoLHD_2015.xml" />
    105107    <ibis:include href="../dimension/GeoCnty.xml" />
    106108    <ibis:include href="../dimension/GeoUrban.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/dimensions/Landline_NoAge.xml

    r11719 r12435  
    8282    <ibis:include href="../dimension/LandlineCell_Fall.xml"/>
    8383     <ibis:include href="../dimension/GeoProxy.xml" />
    84     <ibis:include href="../dimension/GeoLHD2014Bef.xml" />
     84    <ibis:include href="../dimension/GeoLHD.xml" />                                         
     85        <ibis:include href="../dimension/GeoLHD_2015.xml" />
    8586    <ibis:include href="../dimension/GeoCnty.xml" />
    8687        <ibis:include href="../dimension/GeoSarea.xml" />
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/dimensions/Landline_NoSex_NoAge.xml

    r11719 r12435  
    6363        <ibis:include href="../dimension/GeoProxy.xml"/>                                             
    6464         <ibis:include href="../dimension/GeoSarea.xml"/>       
    65     <ibis:include href="../dimension/GeoLHD2014Bef.xml" />
     65    <ibis:include href="../dimension/GeoLHD.xml" />                                         
     66        <ibis:include href="../dimension/GeoLHD_2015.xml" />
    6667    <ibis:include href="../dimension/GeoCnty.xml"/>
    6768    <ibis:include href="../dimension/GeoUrban.xml"/>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/section/Geo.xml

    r11344 r12435  
    88                <SELECTED_DIMENSION>
    99                        <NAME>GeoProxy</NAME>
    10                         <VALUES><VALUE>GeoLHD</VALUE></VALUES>
     10                        <VALUES><VALUE>GeoLHD_2015</VALUE></VALUES>
    1111                </SELECTED_DIMENSION>
    1212        </SELECTED_DIMENSIONS>
     
    1919                        <SINGLE/>
    2020                </SELECTION_TYPE>
    21                 <!--ibis:include href="../help/Geo.xml"/-->
     21                <ibis:include href="../help/Geo.xml"/>
    2222
    2323                <SELECTION>
    24                         <TITLE>Local Health District</TITLE>
     24                        <TITLE>Local health district 2014</TITLE>
    2525                        <VALUE>GeoLHD</VALUE>
    2626                        <SELECTIONS>
    2727                                <SELECTION><TITLE>All local health districts</TITLE></SELECTION>
    2828                                <DIMENSION_NAME>GeoLHD</DIMENSION_NAME>
     29                                <SELECTION_TYPE>
     30                                        <LIST>
     31                                                <SIZE>6</SIZE>
     32                                                <MULTIPLE/>
     33                                        </LIST>
     34                                </SELECTION_TYPE>
     35                        </SELECTIONS>
     36                </SELECTION>
     37
     38                <SELECTION>
     39                        <TITLE>Local health district 2015</TITLE>
     40                        <VALUE>GeoLHD_2015</VALUE>
     41                        <SELECTIONS>
     42                                <SELECTION><TITLE>All local health districts</TITLE></SELECTION>
     43                                <DIMENSION_NAME>GeoLHD_2015</DIMENSION_NAME>
    2944                                <SELECTION_TYPE>
    3045                                        <LIST>
     
    4964                        </SELECTIONS>
    5065                </SELECTION>
    51                
    52                 <SELECTION>
    53                         <TITLE>Utah Small Areas</TITLE>
    54                         <VALUE>GeoSarea</VALUE>
    55                         <SELECTIONS>
    56                                 <SELECTION><TITLE>All small areas</TITLE></SELECTION>
    57                                 <DIMENSION_NAME>GeoSarea</DIMENSION_NAME>
    58                                 <SELECTION_TYPE>
    59                                         <LIST>
    60                                                 <SIZE>6</SIZE>
    61                                                 <MULTIPLE/>
    62                                         </LIST>
    63                                 </SELECTION_TYPE>
    64                         </SELECTIONS>
    65                 </SELECTION>
    66                
    67                 <SELECTION>
    68                         <TITLE>Urban</TITLE>
    69                         <VALUE>GeoUrban</VALUE>
    70                         <SELECTIONS>
    71                                 <SELECTION><TITLE>All</TITLE></SELECTION>
    72                                 <DIMENSION_NAME>GeoUrban</DIMENSION_NAME>
    73                                 <SELECTION_TYPE>
    74                                         <LIST>
    75                                                 <SIZE>3</SIZE>
    76                                                 <MULTIPLE/>
    77                                         </LIST>
    78                                 </SELECTION_TYPE>
    79                         </SELECTIONS>
    80                 </SELECTION>
    81                
    8266        </SELECTIONS>
    8367</SECTION>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/section/Geo2014Bef.xml

    r11344 r12435  
    88                <SELECTED_DIMENSION>
    99                        <NAME>GeoProxy</NAME>
    10                         <VALUES><VALUE>GeoLHD2014Bef</VALUE></VALUES>
     10                        <VALUES><VALUE>GeoLHD</VALUE></VALUES>
    1111                </SELECTED_DIMENSION>
    1212        </SELECTED_DIMENSIONS>
     
    2323                <SELECTION>
    2424                        <TITLE>Local Health District</TITLE>
    25                         <VALUE>GeoLHD2014Bef</VALUE>
     25                        <VALUE>GeoLHD</VALUE>
    2626                        <SELECTIONS>
    2727                                <SELECTION><TITLE>All local health districts</TITLE></SELECTION>
    28                                 <DIMENSION_NAME>GeoLHD2014Bef</DIMENSION_NAME>
     28                                <DIMENSION_NAME>GeoLHD</DIMENSION_NAME>
    2929                                <SELECTION_TYPE>
    3030                                        <LIST>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/brfss/section/LandlineCell_BMI_ageadjust.xml

    r10761 r12435  
    77        <SELECTED_DIMENSIONS>
    88                <SELECTED_DIMENSION>
    9                         <NAME>LandlineCell_BMI</NAME>
     9                        <NAME>LandlineCell_BMI_ageadjust</NAME>
    1010                        <VALUES><VALUE>3</VALUE></VALUES>
    1111                </SELECTED_DIMENSION>
     
    1414        <SELECTIONS>
    1515                                <!--SELECTION><TITLE>Both categories (Percentage=100% unless you cross by at-risk category)</TITLE></SELECTION-->
    16                                 <DIMENSION_NAME>LandlineCell_BMI</DIMENSION_NAME>
     16                                <DIMENSION_NAME>LandlineCell_BMI_ageadjust</DIMENSION_NAME>
    1717                                <SELECTION_TYPE>
    1818                                        <SINGLE/>
Note: See TracChangeset for help on using the changeset viewer.