Changeset 18000 in main


Ignore:
Timestamp:
02/08/19 20:08:22 (4 years ago)
Author:
GarthBraithwaite_STG
Message:

view, admin, java - fixed IP detail.jsp comment. Reimplemented complete profile report. Published indicators updated to include IP views and basic initiative defs.

Location:
trunk
Files:
4 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/detail.jsp

    r17719 r18000  
    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                         --%>
    68                         <jsp:attribute name="publishRequest"><c:if test="${!indicator.statusOpen}">publish/indicator/${indicator.name}</c:if></jsp:attribute>
     65                        <jsp:attribute name="publishRequest">
     66                                <%-- Lois/CoP did away with the approved status code so now anything
     67                                        that is not open is publishable.
     68                                --%>
     69                                <c:if test="${!indicator.statusOpen}">publish/indicator/${indicator.name}</c:if>
     70                        </jsp:attribute>
    6971                </tag:navigationMenuItemButtons>
    7072        </jsp:attribute>

  • trunk/ibisph-view/src/content/xml/html_content/about/Welcome.xml

    r17961 r18000  
    190190//console.log( 'dataSources: ' + $(data).filter("#dataSources").html() );
    191191//console.log( 'HOW DOING: ' + data );
    192                                         $("#ds").html ( $(data).filter("#dataSources").html() );
     192                                        $("#ds").html( $(data).filter("#dataSources").html() );
    193193                                        $("#wi").html( $(data).find("WHY_IMPORTANT").html() );
    194194                                        $("#script1").html( $(data).filter("#klScript").html()  );
    195195                                }
    196196                        });
    197 
    198197
    199198                        $.get("/ibisph-view/indicator/contentblocks/AlcoholRelatedDthInjury.Cnty.html?MapContainerID=map2&amp;ChartContainerID=chart2&amp;ChartName=Pie&amp;ShowGridFlag=x&amp;RecordsJavascriptVarName=jsv&amp;DataSourceJavascriptVarName=dsv&amp;MapJavascriptVarName=msv&amp;ChartJavascriptVarName=csv&amp;GridJavascriptVarName=gsv",

  • trunk/ibisph-view/src/main/webapp/WEB-INF/config/spring/SiteSpecific.xml

    r17771 r18000  
    129129                                <entry key="/indicator/related/*/*.html"     value-ref="indicatorRelatedIndicatorsController"/>
    130130                                <entry key="/indicator/resources/*.html"     value-ref="indicatorResourcesController"/>
     131                                <entry key="/indicator/complete_profile/*.html" value-ref="indicatorCompleteProfileController"/>
     132
    131133                                <entry key="/indicator/contentblocks/*.html" value-ref="indicatorContentBlocksController"/>
    132134

  • trunk/ibisph-view/src/main/webapp/WEB-INF/config/spring/indicator.xml

    r17771 r18000  
    144144        <bean id="indicatorResourcesController" parent="indicatorProfileControllerProperties">
    145145                <property name="view" ref="indicatorResourcesView"/>
     146        </bean>
     147
     148        <bean id="indicatorCompleteProfileController" parent="indicatorProfileControllerProperties">
     149                <property name="view" ref="indicatorCompleteProfileView"/>
    146150        </bean>
    147151
    … …  
    214218                <property name="XSLTPathAndFilename" value="html/indicator/profile/related_indicators/RelatedIndicatorsPage.xslt"/>
    215219        </bean>
     220        <bean id="indicatorCompleteProfileView" parent="commonXSLTTransformationView">
     221                <property name="XSLTPathAndFilename" value="html/indicator/profile/complete_profile/CompleteProfilePage.xslt"/>
     222        </bean>
    216223
    217224        <bean id="indicatorContentBlocksView" parent="commonXSLTTransformationView">

  • trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/Indicator.xslt

    r17719 r18000  
    708708        >
    709709                <xsl:param name="indicator" select="$indicator"/>
    710                 <xsl:param name="relations" ibis:doc="User selected/specified RELATION
    711                         which is based on the RelationName parameter that is passed as a
    712                         parameter to the XSLT via the Java servlet controller."
    713                 />
     710                <xsl:param name="relations" select="$indicator/RELATIONS/RELATION"/>
    714711                <xsl:param name="previewFlag"   select="string-length($xmlURL) != 0"/>
    715712                <xsl:param name="viewURLPrefix" select="$Indicator.viewURLPrefix"/>

  • trunk/ibisph-view/src/main/webapp/xslt/xml/ComparisonValues.xslt

    r17996 r18000  
    109109                        assoc measures/AV values.  These values are then put inside an XML
    110110                        struct and returned for consumption.
     111
     112                        PERIOD_DIMENSION
     113                                NAME   (dimension)
     114                                TITLE  (dimension)
     115                                VALUE  (dimension value)
     116                        COMMUNITY
     117                                TITLE (dimension)
     118                                VALUE (measure)
     119                                        text value
     120                                        TITLE
     121                                LOWER_LIMIT
     122                                        text value
     123                                        TITLE
     124                                UPPER_LIMIT
     125                                        text value
     126                                        TITLE
     127                                DESIRABLE_VALUE (measure)
     128                                RELIABILITY  Compare.statisticalReliability(communityRecord/MEASURE/VALUE, lowerLimit, upperLimit)
     129                        STATE
     130                                TITLE (dimension)
     131                                VALUE
     132                                        text value
     133                                        TITLE
     134                                        COMPARISON
     135                                                CLASS Compare.comparisonClass(communityMeasureValue, communityLL, communityUL, stateMeasureValue, measureDesirableValue)
     136                                                GAUGE_NAME Compare.gaugeName(stateComparisonClass, measureDesirableValue)
     137                        US - same as STATE
    111138                "
    112139        >

  • trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/service/IndicatorDataBeanToXML.java

    r17716 r18000  
    226226      XMLLib.addNode(indicatorViewNode, XMLLib.newNode("NAME",         indicatorView.getName()) );
    227227      XMLLib.addNode(indicatorViewNode, XMLLib.newNode("TITLE",        indicatorView.getTitle()) );
     228      XMLLib.addNode(indicatorViewNode, XMLLib.newNode("MEASURE_NAME", indicatorView.getMeasureName()) );
    228229      XMLLib.addNode(indicatorViewsNode, indicatorViewNode);
    229230    }

  • trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/service/PublishedIndicatorsXML.java

    r17155 r18000  
    158158        XMLLib.addNode(publishedIndicator, XMLLib.getNode(sourceNode, "NOT_SELECTABLE_FLAG"));
    159159        XMLLib.addNode(publishedIndicator, XMLLib.getNode(sourceNode, "PUBLISHED_DATE"));
     160        XMLLib.addNode(publishedIndicator, XMLLib.getNode(sourceNode, "INDICATOR_VIEWS"));
    160161        XMLLib.addNode(publishedIndicator, XMLLib.newNode("DEFAULT_INDICATOR_VIEW_NAME", defaultIndicatorViewName) );
    161162        XMLLib.addNode(publishedIndicator, getSimplifiedDatasetsNode(indicator));
     163        XMLLib.addNode(publishedIndicator, getSimplifiedInitiativesNode(indicator));
    162164        XMLLib.addNode(publishedIndicators, publishedIndicator);
    163165      }
    … …  
    211213   
    212214    return(datasetsNode);
     215  } //-------------------------- End of Method ------------------------------
     216
     217
     218  /**
     219   * Helper method that gets the basic INITIATIVES//* elements.
     220   *
     221   * Structure Returned:
     222   * INITIATIVES/INITIATIVE/
     223   *   NAME, TITLE
     224   *   INITIATIVE_TOPIC/
     225   *     NAME, TITLE
     226   *     INITIATIVE_TOPIC_OBJECTIVE/
     227   *        NAME, TITLE
     228   *        INITIATIVES/INITIATIVE/
     229   *           NAME, TITLE, MEASURE_NAME
     230   *
     231   * @param indicator Indicator XML document to get DATASETS elements.
     232   * @return cleaned/simplified DATASETS element.
     233   * @throws Exception
     234   */
     235  protected Node getSimplifiedInitiativesNode(Node indicator) throws Exception {
     236    Node initiativesNode = (Node)XMLLib.getNode(indicator, "INITIATIVES");
     237    if(null == initiativesNode) return(null);
     238
     239    initiativesNode = (Node)initiativesNode.clone();
     240    XMLLib.deleteNodes(initiativesNode, ".//INITIATIVE_NAME");
     241    XMLLib.deleteNodes(initiativesNode, ".//INITIATIVE_TOPIC_NAME");      // dimension combination VALUES
     242    XMLLib.deleteNodes(initiativesNode, ".//NARRATIVE");
     243    XMLLib.deleteNodes(initiativesNode, ".//TARGET_LABEL");
     244    XMLLib.deleteNodes(initiativesNode, ".//TARGET_NARRATIVE");
     245    XMLLib.deleteNodes(initiativesNode, ".//TARGET_BASELINE_VALUE");
     246    XMLLib.deleteNodes(initiativesNode, ".//TARGET_GOAL_VALUE");
     247
     248    XMLLib.deleteNodes(initiativesNode, ".//URL");
     249    XMLLib.deleteNodes(initiativesNode, ".//DESCRIPTION");
     250    XMLLib.deleteNodes(initiativesNode, ".//SORT_ORDER");
     251    XMLLib.deleteNodes(initiativesNode, ".//ACTIVE_FLAG");
     252    XMLLib.deleteNodes(initiativesNode, ".//MODIFIED_DATE");
     253
     254    return(initiativesNode);
    213255  } //-------------------------- End of Method ------------------------------
    214256
Note: See TracChangeset for help on using the changeset viewer.