Changeset 24487 in main
- Timestamp:
- 01/14/22 21:56:49 (4 months ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ibisph-view/src/main/webapp/xslt/json/IndicatorContentJavaScript.xslt
r24448 r24487 166 166 <xsl:param name="dataSources" select="if($UseExternalXML) then $DataSources/DATA_SOURCES else $indicator/DATA_SOURCES"/> 167 167 <xsl:param name="valueTypes" select="if($UseExternalXML) then $ValueTypes/VALUE_TYPES else $indicator/VALUE_TYPES"/> 168 <!-- 169 <xsl:param name="valueTypes" select="document('http://localhost/ibisph-view/value_types.xml')/VALUE_TYPES"/> 170 --> 171 168 172 <xsl:param name="valueAttributes" select="if($UseExternalXML) then $ValueAttributes/VALUE_ATTRIBUTES else $indicator/VALUE_ATTRIBUTES"/> 169 173 <xsl:param name="dimensions" select="if($UseExternalXML) then $Dimensions/DIMENSIONS else $indicator/DIMENSIONS"/> … … 231 235 </xsl:message> 232 236 </xsl:fallback> 237 <!-- 238 <xsl:message select="'VTs: ', $valueTypes"/> 239 <xsl:message select="'DOC: ', document('http://localhost/ibisph-view/value_types.xml')"/> 240 --> 233 241 234 242 var <xsl:sequence select="$javascriptContentName"/> = … … 489 497 ,"init": function() 490 498 { 491 alert("init - before setting fields");499 // alert("init - before setting fields"); 492 500 for(var i=1; i < this.textField.length; i++) 493 501 { -
trunk/ibisph-view/src/main/webapp/xslt/json/Kendo.xslt
r24448 r24487 430 430 script generated. 431 431 --> 432 432 433 <xsl:param name="valueAxisTemplate"> 433 434 <xsl:choose> 434 <xsl:when test="$measureValueType/JAVASCRIPT_FORMAT_PATTERN">#=kendo.toString(value, "<xsl:sequence select="$measureValueType/JAVASCRIPT_FORMAT_PATTERN"/>")#</xsl:when> 435 <!-- 436 NOTE: no # is acceptable unless escaped because it is part of the template expression. 437 <JAVASCRIPT_FORMAT_PATTERN>,0.0\"%\"</JAVASCRIPT_FORMAT_PATTERN> 438 <JAVASCRIPT_FORMAT_PATTERN>,0.0\\'%\\'</JAVASCRIPT_FORMAT_PATTERN> 439 <JAVASCRIPT_FORMAT_PATTERN>,0.0\\'%\\'</JAVASCRIPT_FORMAT_PATTERN> 440 441 CODE: IF want to use the XSLT format pattern - note removal of #. 442 #=kendo.toString(value, "<xsl:sequence select="translate(replace($measureValueType/JAVASCRIPT_FORMAT_PATTERN, '#', ''), '''', '\"')")# 443 <xsl:when test="$measureValueType/XSLT_FORMAT_PATTERN">#=kendo.toString(value, '<xsl:sequence select="translate(replace($measureValueType/JAVASCRIPT_FORMAT_PATTERN, '#', ''), '''', '\"\')"/>')#</xsl:when> 444 <xsl:when test="$measureValueType/XSLT_FORMAT_PATTERN">#=kendo.toString(value, '<xsl:sequence select="translate(replace($measureValueType/JAVASCRIPT_FORMAT_PATTERN, '#', ''), '''', '\"\')"/>')#</xsl:when> 445 <xsl:when test="$measureValueType/JAVASCRIPT_FORMAT_PATTERN">#=kendo.toString(value, '<xsl:sequence select="$measureValueType/JAVASCRIPT_FORMAT_PATTERN"/>')#</xsl:when> 446 --> 447 <xsl:when test="$measureValueType/JAVASCRIPT_FORMAT_PATTERN">#=kendo.toString(value, '<xsl:sequence select="$measureValueType/JAVASCRIPT_FORMAT_PATTERN"/>')#</xsl:when> 435 448 <xsl:when test="contains($valueTitle, 'Percent')">#=kendo.toString(value, '0.0')#%</xsl:when> 436 <xsl:when test="contains($valueTitle, 'Number') or contains($valueTitle, 'Count')" 449 <xsl:when test="contains($valueTitle, 'Number') or contains($valueTitle, 'Count')">#=kendo.toString(value, ',0')#</xsl:when> 437 450 <xsl:otherwise>#=kendo.toString(value, ',0.0')#</xsl:otherwise> 438 451 </xsl:choose> 439 452 </xsl:param> 453 <!-- 454 <xsl:message select="'VAT: ', $valueAxisTemplate"/> 455 <xsl:message select="'MVT: ', $measureValueType"/> 456 <xsl:message select="'VT: ', $ValueTypes"/> 457 --> 440 458 441 459 <xsl:text>{</xsl:text> -
trunk/ibisph/src/main/java/org/ibisph/indicatorprofile/service/IndicatorDataBeanToXML.java
r23428 r24487 102 102 if(this.includeDependentXML) { 103 103 XMLLib.addNode(document, getMeasuresNode(document)); 104 XMLLib.addNode(document, getAncillaryValuesNode(document)); 104 105 XMLLib.addNode(document, getValueTypesNode(document)); 105 106 XMLLib.addNode(document, getValueAttributesNode(document)); … … 284 285 285 286 287 public Node getAncillaryValuesNode(Node containerNode) throws Exception { 288 List<Node> ancillaryValueNamesNode = XMLLib.getNodes(containerNode, "//ANCILLARY_VALUE_NAME", "text()", true); 289 290 Node ancillaryValuesNode = XMLLib.newNode("ANCILLARY_VALUES"); 291 for(Node ancillaryValueNameNode : ancillaryValueNamesNode) { 292 AncillaryValue ancillaryValue = new AncillaryValue(); 293 this.dataBeanDAOService.load(ancillaryValue, "NAME", XMLLib.getText(ancillaryValueNameNode)); 294 XMLLib.addNode(ancillaryValuesNode, this.newNode("ANCILLARY_VALUE", ancillaryValue)); 295 } 296 return(ancillaryValuesNode); 297 } //-------------------------- End of Method ------------------------------ 298 299 286 300 public Node getValueTypesNode(Node containerNode) throws Exception { 287 301 List<Node> valueTypeNamesNode = XMLLib.getNodes(containerNode, "//VALUE_TYPE_NAME", "text()", true);
Note: See TracChangeset
for help on using the changeset viewer.