From 47b957b2f1d8da8ecdd7de680705d1c3ecf03479 Mon Sep 17 00:00:00 2001
From: Radek Doulik <rodo@xamarin.com>
Date: Tue, 7 Nov 2017 14:27:57 -0500
Subject: [PATCH] Update values table CSS style and number formatting

Added `<style>` section to the *jelly* file with CSS style for data
values table, nice borders and light gray header background.

Added `formatNumber` method to format the numbers in the table for
improved readability and used it in the *jelly* file.
---
 .../java/hudson/plugins/plot/PlotReport.java  | 18 ++++++++++++++++
 .../plugins/plot/PlotReport/index.jelly       | 21 +++++++++++++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/main/java/hudson/plugins/plot/PlotReport.java b/src/main/java/hudson/plugins/plot/PlotReport.java
index 32bf84af..3c499ebd 100644
--- a/src/main/java/hudson/plugins/plot/PlotReport.java
+++ b/src/main/java/hudson/plugins/plot/PlotReport.java
@@ -11,6 +11,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.text.NumberFormat;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -74,6 +75,23 @@ public List<Plot> getPlots() {
         return plots;
     }
 
+    // called from PlotReport/index.jelly
+    public String formatNumber(String number) {
+        String formatted;
+
+        try {
+            formatted = NumberFormat.getIntegerInstance().format(Integer.parseInt(number));
+        } catch (NumberFormatException e) {
+            try {
+                formatted = NumberFormat.getNumberInstance().format(Double.parseDouble(number));
+            } catch (NumberFormatException e2) {
+                return number;
+            }
+        }
+
+        return formatted;
+    }
+
     // called from PlotReport/index.jelly
     public void doGetPlot(StaplerRequest req, StaplerResponse rsp) {
         String i = req.getParameter("index");
diff --git a/src/main/resources/hudson/plugins/plot/PlotReport/index.jelly b/src/main/resources/hudson/plugins/plot/PlotReport/index.jelly
index cc1068de..45fc529a 100644
--- a/src/main/resources/hudson/plugins/plot/PlotReport/index.jelly
+++ b/src/main/resources/hudson/plugins/plot/PlotReport/index.jelly
@@ -9,6 +9,23 @@
   
   <d:taglib uri="chart">
     <d:tag name="chart">
+      <style>
+      table.valuesTable {
+        text-align: right; border: 2px solid gray; border-collapse: collapse;
+      }
+      table.valuesTable tr {
+        border: 1px solid lightgray;
+      }
+      table.valuesTable th {
+        border: 1px solid gray;
+        background-color: #eee;
+        padding:.2em;
+      }
+      table.valuesTable td {
+        border: 1px solid lightgray;
+        padding:.2em;
+      }
+      </style>
       <div id="${id}" style="margin-top: 2em">
         <div align="right" style="width:750px">
           <a href="#top"><img src="${rootURL}/images/24x24/up.gif"/>${%top}</a>
@@ -16,7 +33,7 @@
         <j:if test="${it.getDisplayTableFlag(index)}">
           <div>
           <p>
-          <table border="1">
+          <table class="valuesTable">
           <j:forEach var="tuple" items="${it.getTable(index)}" varStatus="loopStat3">
             <tr>
             <j:forEach var="col" items="${tuple}">
@@ -24,7 +41,7 @@
                 <th> ${col} </th>
               </j:if>
               <j:if test="${loopStat3.index>0}">
-                <td> ${col} </td>
+                <td> ${it.formatNumber(col)} </td>
               </j:if>
             </j:forEach>
             </tr>