Changeset 21379 in main


Ignore:
Timestamp:
08/26/20 14:47:44 (4 weeks ago)
Author:
GarthBraithwaite_STG
Message:

admin, view, java, db - changed ipv records.jsp and controller to use the constant dimension not the const dim values. Removed related ips jsp comment block but left comment placeholders for future. Added basereqpath to HTMLContentPage.xslt. Added IP relation update to update_cleanup.sql.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/db/src/main/scripts/mysql/update_cleanup.sql

    r20669 r21379  
    2222*/
    2323
     24
     25/* For adopters that do not want to use the IP relation grouping run this to
     26        set all valules to the first relation popchar.  If the admin app is left
     27        as is with relation grouping then this should not be used.  The view app
     28        for NM doesn't do relation grouping in v3.0 but could in future versions
     29        so the recommendation is to leave the admin with grouping and NOT run this
     30        update.
     31update INDICATOR_TO_INDICATOR set RELATION_NAME='PopChar';
     32*/
    2433
    2534
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/related_indicators.jsp

    r21373 r21379  
    123123        <jsp:body>
    124124
    125 <%-- Commented out for NM and possibly UT.  Note for this to work all existing
     125<%-- START OF Commented out for NM and possibly UT.  Note for this to work all existing
    126126        relateds MUST be set to PopChar otherwise they are NOT editable.
    127127
    128128        update indicator_to_indicator set relation_name='PopChar';
     129--%>
    129130
    130131                <div style="border:1px solid #cccccc; background-color:#eeeeee; padding:8px 10px 8px 10px; margin:2px 10px 0 0;">
     
    155156                        <div id="relationTextCounter" class="TextAreaCounter"></div>
    156157                        <br/>
    157 --%>
     158
     159<%-- END OF Commented out for NM and possibly UT.  --%>
     160
     161
     162
    158163                        <span class="Bold">Related Indicators:</span><a id="alphaIndex" style="height: 1px"></a>
    159164                        <div class="JumpTo">
  • trunk/ibisph-admin/src/main/webapp/WEB-INF/jsp/indicator/view/records.jsp

    r21373 r21379  
    171171        <jsp:body>
    172172<%--
     173GARTH TODO: REMOVE
    173174Series Dimension Value: ${seriesDimensionValue}
    174175<br/>
     
    203204                        <div>
    204205                                <label for="constantDimension">Constant Dimension <tag:help content="${constantDimensionHelp}"/>:</label>
    205                                 <span id="constantDimension">${constantDimensionValues[0].dimensionTitle}<span>
     206                                <span id="constantDimension">${constantDimension.title}<span>
    206207                        </div>
    207208                        <div>
    208209                                <label for="constantDimensionValue">Constant Dimension Value:</label>
    209                                 <span id="constantDimensionValue" <c:if test="${fn:containsIgnoreCase({constantDimensionValues[0].dimensionTitle}, 'year')}">class="Red"</c:if>
     210                                <span id="constantDimensionValue" <c:if test="${constantDimension.period}">class="Red"</c:if>
    210211                                >${constantDimensionValues[0].title}</span>
    211212                        </div>
  • trunk/ibisph-view/src/main/webapp/xslt/html/HTMLContentPage.xslt

    r19781 r21379  
    228228        </xsl:template>
    229229
     230        <xsl:template match="ibis:baseRequestPath" mode="ibis.copy"
     231                ibis:doc="Provides access to the base req path for things like js ajax reqs."
     232        ><xsl:value-of select="$ibis.baseRequestPath"/></xsl:template>
     233
    230234</xsl:stylesheet>
    231235<!-- ============================= End of File ============================= -->
  • trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/springmvc/databean/EditIndicatorViewRecordsController.java

    r19691 r21379  
    7575  protected String constantDimensionTitleModelName = "constantDimensionTitle";
    7676
     77  protected String constantDimensionModelName = "constantDimension";
     78
    7779  protected int maxDimensionValuesCombiniations = 100;
    7880
     
    319321      getCSVDimensionTitles(dimensionName_DimensionToIndicatorViewMap, DimensionToIndicatorView.CONSTANT_USAGE, dimensionCollection)
    320322    );
     323
     324    // get the constant dimension for the model map
     325    for(Dimension dimension : dimensionCollection) {
     326      DimensionToIndicatorView dimensionToIndicatorView = dimensionName_DimensionToIndicatorViewMap.get(dimension.getName());
     327      if(null != dimensionToIndicatorView) {
     328        String dimensionUsage = dimensionToIndicatorView.getDimensionUsage();
     329        if(DimensionToIndicatorView.CONSTANT_USAGE.equals(dimensionUsage)) {
     330          modelMap.put(this.constantDimensionModelName, dimension);
     331          break;
     332        }
     333      }
     334    }
    321335
    322336    // IV measure - UI uses the measure header.
     
    693707   */
    694708  protected String getCSVDimensionTitles(
    695       Map<String, DimensionToIndicatorView> dimensionName_DimensionToIndicatorViewMap, String usage,
    696       Collection<Dimension> dimensionCollection) throws Exception {
     709      Map<String, DimensionToIndicatorView> dimensionName_DimensionToIndicatorViewMap,
     710      String usage,
     711      Collection<Dimension> dimensionCollection
     712  ) throws Exception {
    697713    StringBuffer sb = new StringBuffer();
    698714    for(Dimension dimension : dimensionCollection) {
  • trunk/ibisph/src/main/java/org/ibisph/querymodule/service/QueryModuleXML.java

    r21272 r21379  
    180180    }
    181181    XMLLib.addNode(selectedGroupBy, XMLLib.newNode("CATEGORY_DIMENSION_NAME", defaultDimensionName));
     182
    182183    defaultDimensionName = XMLLib.getText(configuration, "DEFAULT_SERIES_DIMENSION_NAME");
    183184    if(StrLib.isSomething(defaultDimensionName )) {
    184185      XMLLib.addNode(selectedGroupBy, XMLLib.newNode("SERIES_DIMENSION_NAME", defaultDimensionName));
    185186    }
     187
    186188    defaultDimensionName = XMLLib.getText(configuration, "DEFAULT_OTHER_DIMENSION_NAME");
    187189    if(StrLib.isSomething(defaultDimensionName )) {
Note: See TracChangeset for help on using the changeset viewer.