Changeset 17719 in main


Ignore:
Timestamp:
01/08/19 22:04:43 (5 months ago)
Author:
GarthBraithwaite_STG
Message:

db, admin, java, view - Updated IP status from A to C as per CoP. Standardized AV LCL and UCL to be: LowerConfidenceLimit? from LowerLimit? to match IBISQ. Updated PublishAllApprovedIndicatorsToXMLFileController.java to PublishAllIndicatorsToXMLFileController and changed approved property to publishable. Updated kendo css to include fonts and misc css updates. Updated IP alpha index css to look better. Removed background footer image to get rid of 404 error.

Location:
trunk
Files:
11 added
3 deleted
13 edited

Legend:

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

    r17645 r17719  
    155155;
    156156
     157/* 2018 Rules (2013 was the last change).  They want an editor to be able
     158        to open and complete it at any time (like 2013).  New change for 2018,
     159        is to do away with approved and simply have open and completed.  Only
     160        an admin can publish.  As such the modified/save is always available
     161        and anyone on the page can set to open and completed.  Publish Option
     162        only avail if complete.  As such the publishable status code is now "C".
     163*/     
     164update INDICATOR set STATUS_CODE = 'C' where STATUS_CODE = 'A';
     165
    157166
    158167/* CONCISE_TITLE: set the new v3 ip.CONCISE_TITLE column */
  • trunk/db/src/main/scripts/mysql/data-dataset_record_ancillary_value.sql

    r15449 r17719  
    2727        PERIOD_DIMENSION_NAME,  DIMENSION_1_NAME,  DIMENSION_2_NAME, 
    2828        PERIOD_DIMENSION_VALUE, DIMENSION_1_VALUE, DIMENSION_2_VALUE, 
    29         'LowerLimit', LOWER_CONFIDENCE_VALUE
     29        'LowerConfidenceLimit', LOWER_CONFIDENCE_VALUE
    3030from TMP_DATASET_RECORD
    3131where (LOWER_CONFIDENCE_VALUE is not null)
     
    5151        PERIOD_DIMENSION_NAME,  DIMENSION_1_NAME,  DIMENSION_2_NAME, 
    5252        PERIOD_DIMENSION_VALUE, DIMENSION_1_VALUE, DIMENSION_2_VALUE, 
    53         'UpperLimit', UPPER_CONFIDENCE_VALUE
     53        'UpperConfidenceLimit', UPPER_CONFIDENCE_VALUE
    5454from TMP_DATASET_RECORD
    5555where (UPPER_CONFIDENCE_VALUE is not null)
  • trunk/db/src/main/scripts/mysql/data-value_attribute.sql

    r17685 r17719  
    4444
    4545insert into ANCILLARY_VALUE (NAME, TITLE, DESCRIPTION, VALUE_TYPE_NAME, XML_ELEMENT_NAME, SORT_ORDER, ACTIVE_FLAG, MODIFIED_DATE)
    46 values('LowerLimit',  'Lower Limit', 'Lower 95% Confidence Limit', null, 'LOWER_CONFIDENCE_VALUE', 1, 'x', now() );
     46values('LowerConfidenceLimit',  'Lower Limit', 'Lower 95% Confidence Limit', null, 'LOWER_CONFIDENCE_VALUE', 1, 'x', now() );
    4747
    4848insert into ANCILLARY_VALUE (NAME, TITLE, DESCRIPTION, VALUE_TYPE_NAME, XML_ELEMENT_NAME, SORT_ORDER, ACTIVE_FLAG, MODIFIED_DATE)
    49 values('UpperLimit',  'Upper Limit', 'Upper 95% Confidence Limit', null, 'UPPER_CONFIDENCE_VALUE', 2, 'x', now() );
     49values('UpperConfidenceLimit',  'Upper Limit', 'Upper 95% Confidence Limit', null, 'UPPER_CONFIDENCE_VALUE', 2, 'x', now() );
    5050
    5151insert into ANCILLARY_VALUE (NAME, TITLE, DESCRIPTION, VALUE_TYPE_NAME, XML_ELEMENT_NAME, SORT_ORDER, ACTIVE_FLAG, MODIFIED_DATE)
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/config/spring/publish.xml

    r17716 r17719  
    298298        />
    299299        <bean id="publishIndicatorAllApprovedController"
    300                 class="org.ibisph.indicatorprofile.springmvc.databean.PublishAllApprovedIndicatorsToXMLFileController"
     300                class="org.ibisph.indicatorprofile.springmvc.databean.PublishAllIndicatorsToXMLFileController"
    301301                parent="publishIndicatorToXMLFileProperties"
    302         />
    303 
     302        >
     303                <description>
     304                        2018 Rules (2013 was the last change).  They want an editor to be able
     305                        to open and complete it at any time (like 2013).  New change for 2018,
     306                        is to do away with approved and simply have open and completed.  Only
     307                        an admin can publish.  As such the modified/save is always available
     308                        and anyone on the page can set to open and completed.  Publish Option
     309                        only avail if complete.  As such the publishable status code is now "C".
     310                </description>
     311                <property name="publishableStatusCode" value="C"/>
     312        </bean>
    304313</beans>
    305314
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/detail.jsp

    r17645 r17719  
    6363                        previewRequest="preview/indicator/${indicator.name}.html"
    6464                >
     65                        <%-- Lois/CoP did away with the approved status code so now anything
     66                                that is not open is publishable.
     67                        --%>
    6568                        <jsp:attribute name="publishRequest"><c:if test="${!indicator.statusOpen}">publish/indicator/${indicator.name}</c:if></jsp:attribute>
    6669                </tag:navigationMenuItemButtons>
  • trunk/ibisph-view/src/main/webapp/css/_kendo_overrides.css

    r17024 r17719  
    1 .SupressedCellMessage
    2 {
    3         padding-right:          15px;
    4         padding-bottom:         12px;
    5         font-style:                     italic;
    6         font-size:                      smaller;
    7 }
    8 
    91
    102
     
    2820}
    2921
    30 .k-icon,
    31 .k-tool-icon,
    32 .k-grouping-dropclue,
    33 .k-drop-hint,
    34 .k-column-menu .k-sprite,
    35 .k-grid-mobile .k-resize-handle-inner:before,
    36 .k-grid-mobile .k-resize-handle-inner:after ,
    37 .k-mobile-list .k-check:checked,
    38 .k-mobile-list .k-edit-field [type=checkbox]:checked,
    39 .k-mobile-list .k-edit-field [type=radio]:checked
    40 {
    41         background-image:       url("../image/kendo/sprite.png");
    42 }
     22.k-link:hover .k-icon,
    4323.k-icon.k-filter:hover
    4424{
     
    158138{
    159139        background-image:       none;
    160 /*      background-image:       url("Silver/loading-image.gif") */
    161140}
    162141
     
    165144.km-list
    166145{
    167         margin-left: 0.1em;
     146        margin-left:            0.8em;
    168147}
    169148
     149.km-filter-form
     150{
     151        margin:                         1em 0 1em 1em;
     152        padding:                        1em;
     153        background-color:       #eee;
     154}
    170155.km-filter-form .km-filter-wrap input
    171156{
    172         font-size: 1.3em;
    173     min-width: 350px;
     157        padding:                        0.2em;
     158        font-size:                      1.3em;
     159    min-width:                  350px;
    174160}
    175161
     
    178164        list-style: none;
    179165}
     166li.km-group-container .km-group-title
     167{
     168        margin:                         0;
     169        text-indent:            0;
     170        padding:                        0.5em;
     171        background-color:       #eee;
     172        line-height:            1.5em;
     173}
    180174li.km-group-container .km-group-title a
    181175{
    182176        float: right;
    183177}
     178li.km-group-container .km-group-title h3
     179{
     180    margin-top: 0;
     181}
    184182
    185 
     183@font-face
     184{
     185        font-family:"Kendo UI";
     186        src:url("font/kendoui.woff?v=1.1") format("woff"), url("font/kendoui.ttf?v=1.1") format("truetype"), url("font/kendoui.svg#kendoui") format("svg");
     187}
     188@font-face
     189{
     190        font-family:"WebComponentsIcons";
     191        src:url("font/WebComponentsIcons.eot?gedxeo");
     192        src:url("font/WebComponentsIcons.eot?gedxeo#iefix") format('embedded-opentype'), url("font/WebComponentsIcons.ttf?gedxeo") format('truetype'), url("font/WebComponentsIcons.woff?gedxeo") format('woff'), url("font/WebComponentsIcons.svg?gedxeo#WebComponentsIcons") format('svg');
     193        font-weight:400;
     194        font-style:normal;
     195}
    186196
    187197/*============================ End of Style Sheet ============================*/
  • trunk/ibisph-view/src/main/webapp/css/_layout.css

    r17021 r17719  
    538538        background-repeat:      no-repeat;
    539539        background-position:    bottom right;
     540        background:                     #003366 url("../image/footer_background.png") no-repeat bottom right fixed;
    540541*/
    541         background:                     #003366 url("../image/footer_background.png") no-repeat bottom right fixed;
     542        background-color:       #003366;
    542543
    543544        padding:                        6px 0px 5px 1em;
  • trunk/ibisph-view/src/main/webapp/css/stylesheet.css

    r17710 r17719  
    3232
    3333@import url("kendo.common.min.css");
    34 @import url("kendo.silver.min.css");
    35 @import url("kendo.mobile.all.min.css");
     34@import url("kendo.default.min.css");
    3635@import url("kendo.dataviz.min.css");
    37 @import url("kendo.dataviz.silver.min.css");
     36@import url("kendo.dataviz.default.min.css");
    3837@import url("_kendo_overrides.css");
    3938
  • trunk/ibisph-view/src/main/webapp/xslt/html/indicator/index/alphabetical/Page.xslt

    r17596 r17719  
    5656
    5757                <xsl:copy-of select="$Page.categorizedIndexContent"/>
    58                 <br/><br/>
    5958
    6059                <div class="JumpToLinks">
    61                         Index:
    6260                        <xsl:for-each select="/PUBLISHED_INDICATORS/PUBLISHED_INDICATOR['x' != NOT_SELECTABLE_FLAG]">
    6361                                <xsl:sort select="TITLE"/>
  • trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/Indicator.xslt

    r17716 r17719  
    352352                </h3>
    353353                <xsl:value-of select="$initiative/INITIATIVE_TOPIC/INITIATIVE_TOPIC_OBJECTIVE/NARRATIVE"/><br/>
    354                 <span class="Bold"><xsl:value-of select="$initiative/INITIATIVE_TOPIC/INITIATIVE_TOPIC_OBJECTIVE/TARGET_LABEL"/></span>.
    355 <!-- GARTH TODO: Could implement the worse, same, better logic here... -->
     354                <span class="Bold"><xsl:value-of select="$initiative/INITIATIVE_TOPIC/INITIATIVE_TOPIC_OBJECTIVE/TARGET_LABEL"/></span>:
    356355                <xsl:value-of select="$initiative/INITIATIVE_TOPIC/INITIATIVE_TOPIC_OBJECTIVE/TARGET_GOAL_VALUE"/>,
    357356                <xsl:value-of select="$initiative/INITIATIVE_TOPIC/INITIATIVE_TOPIC_OBJECTIVE/TARGET_NARRATIVE"/>
     357<!-- GARTH TODO: Could implement the worse, same, better logic here... -->
    358358        </xsl:template>
    359359
  • trunk/ibisph/src/main/java/org/ibisph/databean/DimensionsDataBeanToXMLService.java

    r17685 r17719  
    2222
    2323/**
    24  *
    25  * GARTH TODO: Delete if using referenced XML and not embedded.
    26  *
    27  *
    28  *
    2924 * Helper service that creates an INDICATOR DATASET XML document from an
    3025 * indicator dataset data bean (and associated data beans).
Note: See TracChangeset for help on using the changeset viewer.