Changeset 21745 in main


Ignore:
Timestamp:
10/07/20 15:50:16 (3 weeks ago)
Author:
TongZheng_UT
Message:

add GeoUrban? and some adjustment

Location:
adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/pop
Files:
1 added
4 edited

Legend:

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

    r20991 r21745  
    123123    <ibis:include href="dimension/GeoProxy.xml"/>
    124124    <ibis:include href="dimension/GeoLHD.xml"/>
    125     <ibis:include href="dimension/GeoCnty.xml"/>
     125    <ibis:include href="dimension/GeoCnty.xml"/>                                                                 <ibis:include href="dimension/GeoUrban.xml"/>
    126126    <ibis:include href="dimension/Year.xml"/>
    127127  </DIMENSIONS>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/pop/PopMain.xml

    r21525 r21745  
    118118    <SECTIONS>
    119119      <ibis:include href="section/Year.xml"/>
    120       <SECTION>
    121         <NAME>AgeGrp</NAME>
    122         <TITLE>Select age</TITLE>
    123         <SELECTED_DIMENSIONS>
    124           <SELECTED_DIMENSION>
    125             <NAME>AgeGrpProxy</NAME>
    126             <VALUES>
    127               <VALUE>AgeGrp11</VALUE>
    128             </VALUES>
    129           </SELECTED_DIMENSION>
    130         </SELECTED_DIMENSIONS>
    131         <SELECTIONS>
    132           <NAME>AgeGrpProxy</NAME>
    133           <TITLE>First choose a coding scheme to use for age groups. Default is age adjustment age groups, all ages.</TITLE>
    134           <DESCRIPTION>Filter by sub age group</DESCRIPTION>
    135           <SELECTION_TYPE>
    136             <SINGLE/>
    137           </SELECTION_TYPE>
    138           <SELECTION>
    139             <TITLE>Age adjustment age groups (Younger than 1, 1-4, 5-14, 15-24, 25-34, 35-44, 45-54, 55-64, 65-74, 75-84, 85 years and older)</TITLE>
    140             <VALUE>AgeGrp11</VALUE>
    141             <ibis:include href="selections/_range/AgeGrp11.xml"/>
    142           </SELECTION>
    143           <SELECTION>
    144             <TITLE>Four age groups (0-14, 15-44, 45-64, 65+)</TITLE>
    145             <VALUE>AgeGrp4</VALUE>
    146             <ibis:include href="selections/_range/AgeGrp4.xml"/>
    147           </SELECTION>
    148           <SELECTION>
    149             <TITLE>Seven age groups (0, 1-14, 15-24, 25-44, 45-64, 65-84, 85 years and older)</TITLE>
    150             <VALUE>AgeGrp7</VALUE>
    151             <ibis:include href="selections/_range/AgeGrp7.xml"/>
    152           </SELECTION>
    153           <SELECTION>
    154             <TITLE>Eight age groups (0-17, 18-24, 25-34, 35-44, 45-54, 55-64, 65-74, 75+)</TITLE>
    155             <VALUE>AgeGrp8</VALUE>
    156             <ibis:include href="selections/_range/AgeGrp8.xml"/>
    157           </SELECTION>
    158           <SELECTION>
    159             <TITLE>5-year age groups (0-4, 5-9, 10-14, 15-19, 20-24, 25-29, 30-34, 35-39, 40-44, 45-49, 50-54, 55-59, 60-64, 65-69, 70-74, 75-79, 80-84,
    160               85 years and older)</TITLE>
    161             <VALUE>AgeGrp18</VALUE>
    162             <ibis:include href="selections/_range/AgeGrp18.xml"/>
    163           </SELECTION>
    164           <SELECTION>
    165             <VALUE>AgeGrp9</VALUE>
    166             <TITLE>Enter custom age group</TITLE>
    167             <ibis:include href="help/AgeGrpCustom.xml"/>
    168             <ibis:include href="selections/AgeGrp9.xml"/>
    169           </SELECTION>
    170         </SELECTIONS>
    171       </SECTION>
     120      <ibis:include href="section/AgeGrp.xml"/>
    172121      <ibis:include href="section/Sex.xml"/>
    173122      <ibis:include href="section/Geo.xml"/>
     
    177126    <ibis:include href="dimension/Year.xml"/>
    178127    <ibis:include href="dimension/AgeGrpProxy.xml"/>
    179     <ibis:include href="dimension/_range/AgeGrp11.xml"/>
    180     <ibis:include href="dimension/_range/AgeGrp4.xml"/>
    181     <ibis:include href="dimension/_range/AgeGrp7.xml"/>
    182     <ibis:include href="dimension/_range/AgeGrp8.xml"/>
    183     <ibis:include href="dimension/_range/AgeGrp18.xml"/>
     128    <ibis:include href="dimension/AgeGrp11.xml"/>
     129    <ibis:include href="dimension/AgeGrp4.xml"/>
     130    <ibis:include href="dimension/AgeGrp7.xml"/>
     131    <ibis:include href="dimension/AgeGrp8.xml"/>
     132    <ibis:include href="dimension/AgeGrp18.xml"/>
    184133    <ibis:include href="dimension/AgeGrp9.xml"/>
    185134    <ibis:include href="dimension/Sex.xml"/>
     
    188137        <ibis:include href="dimension/GeoLHD_2015.xml"/>
    189138        <ibis:include href="dimension/GeoLHD.xml"/>
    190     <ibis:include href="dimension/GeoCnty.xml"/>
     139    <ibis:include href="dimension/GeoCnty.xml"/>                                                                 <ibis:include href="dimension/GeoUrban.xml"/>
    191140  </DIMENSIONS>
    192141</QUERY_MODULE>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/pop/PopRaceAlone.xml

    r20991 r21745  
    140140                <ibis:include href="dimension/GeoProxy.xml"/>
    141141                <ibis:include href="dimension/GeoLHD.xml"/>
    142                 <ibis:include href="dimension/GeoCnty.xml"/>
     142                <ibis:include href="dimension/GeoCnty.xml"/>                                                                 <ibis:include href="dimension/GeoUrban.xml"/>
    143143        </DIMENSIONS>
    144144</QUERY_MODULE>
  • adopters/ut/trunk/src/main/webapps/ibisph-content/xml/query/module/pop/PopRaceComb.xml

    r20991 r21745  
    138138                <ibis:include href="dimension/GeoProxy.xml"/>
    139139                <ibis:include href="dimension/GeoLHD.xml"/>
    140                 <ibis:include href="dimension/GeoCnty.xml"/>
     140                <ibis:include href="dimension/GeoCnty.xml"/>                                                                 <ibis:include href="dimension/GeoUrban.xml"/>
    141141        </DIMENSIONS>
    142142</QUERY_MODULE>
Note: See TracChangeset for help on using the changeset viewer.