Changeset 24487 in main

Timestamp:

01/14/22 21:56:49 (11 months ago)

Author:

GarthBraithwaite_STG

Message:

java, view - IndicatorDataBeanToXML.java added all VALUE_TYPES (ancil values) to the published IP XML for self contained internal use. Added javascript format pattern notes into Kendo.xslt.

Location:

trunk

Files:

• ibisph-admin/src/main/webapp/WEB-INF/lib/ibisph-3.0.0.jar (modified) (previous)
• ibisph-view/src/main/webapp/WEB-INF/lib/ibisph-3.0.0.jar (modified) (previous)
• ibisph-view/src/main/webapp/xslt/json/IndicatorContentJavaScript.xslt (modified) (3 diffs)
• ibisph-view/src/main/webapp/xslt/json/Kendo.xslt (modified) (1 diff)
• ibisph/src/main/java/org/ibisph/indicatorprofile/service/IndicatorDataBeanToXML.java (modified) (2 diffs)

trunk/ibisph-view/src/main/webapp/xslt/json/IndicatorContentJavaScript.xslt

@@ -166 +166 @@
                 <xsl:param name="dataSources"     select="if($UseExternalXML) then $DataSources/DATA_SOURCES         else $indicator/DATA_SOURCES"/>
                 <xsl:param name="valueTypes"      select="if($UseExternalXML) then $ValueTypes/VALUE_TYPES           else $indicator/VALUE_TYPES"/>
+<!--
+<xsl:param name="valueTypes"      select="document('http://localhost/ibisph-view/value_types.xml')/VALUE_TYPES"/>
+-->
+
                 <xsl:param name="valueAttributes" select="if($UseExternalXML) then $ValueAttributes/VALUE_ATTRIBUTES else $indicator/VALUE_ATTRIBUTES"/>
                 <xsl:param name="dimensions"      select="if($UseExternalXML) then $Dimensions/DIMENSIONS            else $indicator/DIMENSIONS"/>
@@ -231 +235 @@
                         </xsl:message>
                 </xsl:fallback>
+<!--
+<xsl:message select="'VTs: ', $valueTypes"/>
+<xsl:message select="'DOC: ', document('http://localhost/ibisph-view/value_types.xml')"/>
+-->
 
                 var <xsl:sequence select="$javascriptContentName"/> = 
@@ -489 +497 @@
                         ,"init": function() 
                         {
-                                alert("init - before setting fields"); 
+//                              alert("init - before setting fields"); 
                                 for(var i=1; i &lt; this.textField.length; i++) 
                                 {

trunk/ibisph-view/src/main/webapp/xslt/json/Kendo.xslt

@@ -430 +430 @@
                         script generated.  
                 -->
+
                 <xsl:param name="valueAxisTemplate">
                         <xsl:choose>
-                                <xsl:when test="$measureValueType/JAVASCRIPT_FORMAT_PATTERN">#=kendo.toString(value, "<xsl:sequence select="$measureValueType/JAVASCRIPT_FORMAT_PATTERN"/>")#</xsl:when>
+<!--
+        NOTE: no # is acceptable unless escaped because it is part of the template expression.
+        <JAVASCRIPT_FORMAT_PATTERN>,0.0\"%\"</JAVASCRIPT_FORMAT_PATTERN>
+        <JAVASCRIPT_FORMAT_PATTERN>,0.0\\'%\\'</JAVASCRIPT_FORMAT_PATTERN>
+        <JAVASCRIPT_FORMAT_PATTERN>,0.0\\&apos;%\\&apos;</JAVASCRIPT_FORMAT_PATTERN>
+
+        CODE: IF want to use the XSLT format pattern - note removal of #.
+                                                                                                                   #=kendo.toString(value, "<xsl:sequence select="translate(replace($measureValueType/JAVASCRIPT_FORMAT_PATTERN, '#', ''), '''', '\&quot;')")#
+        <xsl:when test="$measureValueType/XSLT_FORMAT_PATTERN">#=kendo.toString(value, '<xsl:sequence select="translate(replace($measureValueType/JAVASCRIPT_FORMAT_PATTERN, '#', ''), '''', '\&quot;\')"/>')#</xsl:when>
+        <xsl:when test="$measureValueType/XSLT_FORMAT_PATTERN">#=kendo.toString(value, '<xsl:sequence select="translate(replace($measureValueType/JAVASCRIPT_FORMAT_PATTERN, '#', ''), '''', '\&quot;\')"/>')#</xsl:when>
+        <xsl:when test="$measureValueType/JAVASCRIPT_FORMAT_PATTERN">#=kendo.toString(value, '<xsl:sequence select="$measureValueType/JAVASCRIPT_FORMAT_PATTERN"/>')#</xsl:when>
+-->
+                                <xsl:when test="$measureValueType/JAVASCRIPT_FORMAT_PATTERN">#=kendo.toString(value, '<xsl:sequence select="$measureValueType/JAVASCRIPT_FORMAT_PATTERN"/>')#</xsl:when>
                                 <xsl:when test="contains($valueTitle, 'Percent')">#=kendo.toString(value, '0.0')#%</xsl:when>
-                                <xsl:when test="contains($valueTitle, 'Number') or contains($valueTitle, 'Count')"  >#=kendo.toString(value, ',0')#</xsl:when>
+                                <xsl:when test="contains($valueTitle, 'Number') or contains($valueTitle, 'Count')">#=kendo.toString(value, ',0')#</xsl:when>
                                 <xsl:otherwise>#=kendo.toString(value, ',0.0')#</xsl:otherwise>
                         </xsl:choose>
                 </xsl:param>
+<!--
+<xsl:message select="'VAT: ', $valueAxisTemplate"/>
+<xsl:message select="'MVT: ', $measureValueType"/>
+<xsl:message select="'VT: ', $ValueTypes"/>
+-->
 
 <xsl:text>{</xsl:text>

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

@@ -102 +102 @@
     if(this.includeDependentXML) {
       XMLLib.addNode(document, getMeasuresNode(document));
+      XMLLib.addNode(document, getAncillaryValuesNode(document));
       XMLLib.addNode(document, getValueTypesNode(document));
       XMLLib.addNode(document, getValueAttributesNode(document));
@@ -284 +285 @@
 
 
+  public Node getAncillaryValuesNode(Node containerNode) throws Exception {
+    List<Node> ancillaryValueNamesNode = XMLLib.getNodes(containerNode, "//ANCILLARY_VALUE_NAME", "text()", true);
+
+    Node ancillaryValuesNode = XMLLib.newNode("ANCILLARY_VALUES");
+    for(Node ancillaryValueNameNode : ancillaryValueNamesNode) {
+      AncillaryValue ancillaryValue = new AncillaryValue();
+      this.dataBeanDAOService.load(ancillaryValue, "NAME", XMLLib.getText(ancillaryValueNameNode));
+      XMLLib.addNode(ancillaryValuesNode, this.newNode("ANCILLARY_VALUE", ancillaryValue));
+    }
+    return(ancillaryValuesNode);
+  } //-------------------------- End of Method ------------------------------
+
+
   public Node getValueTypesNode(Node containerNode) throws Exception {
     List<Node> valueTypeNamesNode = XMLLib.getNodes(containerNode, "//VALUE_TYPE_NAME", "text()", true);