BZ-993528 - Support integer values in NVD3 charts

kiegroup · Sep 6, 2013 · 3f26d3f · 3f26d3f
1 parent 6399604
commit 3f26d3f
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 19 deletions.
diff --git a/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_ca.properties b/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_ca.properties
@@ -162,6 +162,6 @@ labelDomain.labelIntervalsOrder.ascendant=Asc
 labelDomain.labelIntervalsOrder.descendant=Desc
 abstractChartDisplayer.margin_top=Marge superior
 abstractChartDisplayer.margin_bottom=Marge inferior
-abstractChartDisplayer.showLinesArea=Mostrar u00E1reas
+abstractChartDisplayer.showLinesArea=Pintar \u00E1rea
 abstractChartDisplayer.margin_left=Marge esquerre
 abstractChartDisplayer.margin_right=Marge dret
diff --git a/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_es.properties b/...rd-displayer-core/src/main/resources/org/jboss/dashboard/displayer/messages_es.properties
@@ -48,7 +48,7 @@ abstractChartDisplayer.margin_top=Margen superior
 abstractChartDisplayer.margin_bottom=Margen inferior
 abstractChartDisplayer.margin_left=Margen izquierdo
 abstractChartDisplayer.margin_right=Margen derecho
-abstractChartDisplayer.showLinesArea=Mostrar u00E1reas
+abstractChartDisplayer.showLinesArea=Pintar \u00E1rea
 abstractDomain.description=Descripci\u00F3n
 abstractDomain.finalInterval=Otros
 abstractDomain.maxNumberOfIntervals=N\u00FAmero m\u00E1ximo de intervalos

diff --git a/...board-ui-nvd3/src/main/java/org/jboss/dashboard/displayer/nvd3/NVD3DisplayerRenderer.java b/...board-ui-nvd3/src/main/java/org/jboss/dashboard/displayer/nvd3/NVD3DisplayerRenderer.java
@@ -73,7 +73,7 @@ protected void init() {
         featuresSupported.add(DataDisplayerFeature.ALIGN_CHART);
         featuresSupported.add(DataDisplayerFeature.SHOW_TITLE);
         featuresSupported.add(DataDisplayerFeature.SHOW_HIDE_LABELS);
-        //featuresSupported.add(DataDisplayerFeature.ROUND_TO_INTEGER);
+        featuresSupported.add(DataDisplayerFeature.ROUND_TO_INTEGER);
         //featuresSupported.add(DataDisplayerFeature.SET_CHART_TYPE);
         featuresSupported.add(DataDisplayerFeature.SET_CHART_WIDTH);
         featuresSupported.add(DataDisplayerFeature.SET_CHART_HEIGHT);

diff --git a/...ashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_barchart_script.jspi b/...ashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_barchart_script.jspi
@@ -15,6 +15,10 @@
     limitations under the License.
 
 --%>
+<%
+    int decimalPrecision = 2;
+    if (displayer.isAxisInteger()) decimalPrecision = 0;
+%>
 <script type="text/javascript" defer="defer">
     chartData<%=chartId%> = [
         {
@@ -50,6 +54,7 @@
               });
 
                chart.yAxis
+                    .tickFormat(d3.format(',.<%=decimalPrecision%>f'))
                     .axisLabel("<%= rangeProperty.getName(locale) %>");
 
                chart.xAxis
@@ -77,7 +82,7 @@
        <% } %>
 
           graph.dispatch.on('tooltipShow', function(e, offsetElement) {
-              x = graph.xAxis.tickFormat()(graph.discretebar.x()(e.point, e.pointIndex)),
+              x = e.point.label;
               y = graph.yAxis.tickFormat()(graph.discretebar.y()(e.point, e.pointIndex)),
               content = x + " : " + y;
 

diff --git a/...shboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_linechart_script.jspi b/...shboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_linechart_script.jspi
@@ -15,6 +15,10 @@
     limitations under the License.
 
 --%>
+<%
+    int decimalPrecision = 2;
+    if (displayer.isAxisInteger()) decimalPrecision = 0;
+%>
 <script type="text/javascript" defer="defer">
     chartData<%=chartId%> = [
         {
@@ -56,6 +60,7 @@
                    });
 
             chart.yAxis
+                    .tickFormat(d3.format(',.<%=decimalPrecision%>f'))
                     .axisLabel("<%= rangeProperty.getName(locale) %>");
 
             chart.xAxis
@@ -87,18 +92,18 @@
   <% } %>
 
    graph.dispatch.on('tooltipShow', function(e, offsetElement) {
-              x = graph.xAxis.tickFormat()(graph.lines.x()(e.point, e.pointIndex));
-              y = graph.yAxis.tickFormat()(graph.lines.y()(e.point, e.pointIndex));
-              n = e.pointIndex;
-
-              if( n >= 0 && n < <%=xvalues.size()%> ) {
-                 content = chartLabels<%=chartId%>[n] + " : " + y;
-              } else {
-                 content = "";
-              }
-
-              document.getElementById("tooltip<%=chartId%>").innerHTML=content;
-          });
+       x = e.point.label;
+       y = graph.yAxis.tickFormat()(graph.lines.y()(e.point, e.pointIndex));
+       n = e.pointIndex;
+
+       if( n >= 0 && n < <%=xvalues.size()%> ) {
+           content = chartLabels<%=chartId%>[n] + " : " + y;
+       } else {
+           content = "";
+       }
+
+       document.getElementById("tooltip<%=chartId%>").innerHTML=content;
+     });
   }
   });
 </script>
diff --git a/...ashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_piechart_script.jspi b/...ashboard-ui-nvd3/src/main/webapp/components/bam/displayer/chart/nvd3_piechart_script.jspi
@@ -15,6 +15,10 @@
     limitations under the License.
 
 --%>
+<%
+    int decimalPrecision = 2;
+    if (displayer.isAxisInteger()) decimalPrecision = 0;
+%>
 <script type="text/javascript" defer="defer">
     chartData<%=chartId%> = [
         {
@@ -63,9 +67,13 @@
 
         graph.dispatch.on('tooltipShow', function(e, offsetElement) {
         <% if(enableTooltips) { %>
-              content = e.label + " : " + e.value;
-              document.getElementById("tooltip<%=chartId%>").innerHTML=content;
-        <% } %>
+            x = e.label;
+            y = d3.format(',.<%=decimalPrecision%>f')(e.value);
+
+            content = x + " : " + y;
+            document.getElementById("tooltip<%=chartId%>").innerHTML=content;
+
+            <% } %>
           });
       }
   });