Changeset 20669 in main


Ignore:
Timestamp:
06/01/20 15:39:25 (4 weeks ago)
Author:
GarthBraithwaite_STG
Message:

java, db, admin - added IPV measure title override.

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/db/src/main/scripts/mysql/data-iv_measure_name.sql

    r19586 r20669  
    66        can be specified if needed.
    77*/
     8
     9
     10
     11/* TODO: GARTH, LOIS, PAUL - need to determine how best to convert and update.
     12alter table INDICATOR_VIEW change column  Y_TITLE   MEASURE_TITLE_OVERRIDE varchar(100);
     13*/
     14
     15
    816update INDICATOR_VIEW set MEASURE_NAME = 'DEFAULT';
    917
  • trunk/db/src/main/scripts/mysql/tab_c-indicator.sql

    r18447 r20669  
    7474  /* */
    7575  MEASURE_NAME                    varchar  (100)  not null,             /* This is needed for building the title and for determining which IP datasets */
     76  MEASURE_TITLE_OVERRIDE          varchar  (100),
    7677  PERIOD_DIMENSION_NAME           varchar  (100)  not null,             /* This is needed for building the title and for determining which IP datasets */
    7778  /* */
  • trunk/db/src/main/scripts/mysql/update_cleanup.sql

    r20318 r20669  
    3737
    3838alter table INDICATOR_VIEW drop column PERIOD_TITLE;
    39 alter table INDICATOR_VIEW drop column Y_TITLE;
    4039alter table INDICATOR_VIEW drop column DATASET_SERIES_NAME;
    4140alter table INDICATOR_VIEW drop column DATASET_CATEGORY_NAME;
  • trunk/db/src/main/scripts/mysql/update_tabs.sql

    r18468 r20669  
    5858alter table INDICATOR_VIEW add column MAP_DIMENSION_NAME varchar  (100);
    5959
     60
     61
     62
     63/* TODO: GARTH, LOIS, PAUL - need to determine how best to convert and update.
     64alter table INDICATOR_VIEW change column  Y_TITLE   MEASURE_TITLE_OVERRIDE varchar(100);
     65*/
     66alter table INDICATOR_VIEW add column MEASURE_TITLE_OVERRIDE  varchar  (100);
     67
     68
     69
     70
    6071alter table INDICATOR_VIEW change column SUPPLEMENTAL_IMAGE_TITLE     EXTERNAL_DATAVIZ_TITLE     varchar  (250);
    6172alter table INDICATOR_VIEW change column SUPPLEMENTAL_IMAGE_URL       EXTERNAL_DATAVIZ_VALUE     varchar (4000);
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/indicator_view.xml

    r18468 r20669  
    125125                                <entry key="viewTemplateName"     value="VIEW_TEMPLATE_NAME"/>
    126126                                <entry key="measureName"          value="MEASURE_NAME"/>
     127                                <entry key="measureTitleOverride" value="MEASURE_TITLE_OVERRIDE"/>
     128
    127129                                <entry key="periodDimensionName"  value="PERIOD_DIMENSION_NAME"/>
    128130                                <entry key="dataNote"             value="DATA_NOTE"/>
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/_help.jsp

    r19714 r20669  
    8080        NOTE: Please contact your IBIS-PH data administrator to have this value changed.
    8181</c:set>
     82<c:set var="measureTitleOverrideHelp">
     83        Leave blank to use the default measure title.  If that title is somehow insufficient, enter a new title here.
     84</c:set>
    8285
    8386<c:set var="periodDimensionNameHelp">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/detail.jsp

    r19714 r20669  
    1414                .TabbedContent
    1515                {
    16                         min-height:     810px;
     16                        min-height:     870px;
    1717                }
    1818        </jsp:attribute>
     
    115115                                                options="${measures}" selectedValue="${indicatorView.measureName}"
    116116                                        />
     117                                        <tag:detailTableRowInput
     118                                                label="Measure Title Override" name="measureTitleOverride"
     119                                                maxlength="100" disabled="${disabled}"
     120                                                value="${indicatorView.measureTitleOverride}"
     121                                                title="If specified this text overrides the default measure title (must be 100% inclusive)"
     122                                                help="${measureTitleOverrideHelp}"
     123                                                note="(Leave blank to use the default, measure title.)"
     124                                        />
     125
    117126                                        <tag:detailTableRowSelect label="Period" name="periodDimensionName"
    118127                                                title="Period to be used for this view: '${indicatorView.periodDimensionName}'"
  • trunk/ibisph-view/src/main/webapp/xsd/indicator_view.xsd

    r18454 r20669  
    2222                                <xsd:element name="EXTERNAL_CONTENT_SELECTOR" type="xsd:string" minOccurs="0"/>
    2323
    24                                 <xsd:element name="MEASURE_NAME"          type="xsd:string" minOccurs="1"/>
     24                                <xsd:element name="MEASURE_NAME"           type="xsd:string" minOccurs="1"/>
     25                                <xsd:element name="MEASURE_TITLE_OVERRIDE" type="xsd:string" minOccurs="0"/>
     26
    2527                                <xsd:element name="PERIOD_DIMENSION_NAME" type="xsd:string" minOccurs="1"/>
    2628
  • trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/databean/IndicatorView.java

    r18468 r20669  
    3030
    3131    addField("MEASURE_NAME",              Field.TYPE_STRING, false, true);
     32    addField("MEASURE_TITLE_OVERRIDE",    Field.TYPE_STRING);
    3233    addField("PERIOD_DIMENSION_NAME",     Field.TYPE_STRING, false, true);
    3334    addField("DATA_NOTE",                 Field.TYPE_STRING);
     
    8081    return( getStringFieldValue("MEASURE_NAME") );
    8182  }
     83  public String getMeasureTitleOverride() {
     84    return( getStringFieldValue("MEASURE_TITLE_OVERRIDE") );
     85  }
     86
    8287  public String getPeriodDimensionName() {
    8388    return( getStringFieldValue("PERIOD_DIMENSION_NAME") );
Note: See TracChangeset for help on using the changeset viewer.