X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_CPTA.py;h=9cce8ed8b2570b849fb293caff5e1d764f5f5d18;hp=3b8c9fd3abeeb546fe07068b4dbc9f9c423f59f4;hb=061ea1864e550ea7f9fbc6bc2a096b2cedd94b96;hpb=fe3b245f128cb3204cbf57e2e474f006f7ceacd5

diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index 3b8c9fd3ab..9cce8ed8b2 100644
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -365,6 +365,7 @@ def _generate_all_charts(spec, input_data):
     csv_table = list()
     # Create the header:
     builds = spec.cpta["data"].values()[0]
+    job_name = spec.cpta["data"].keys()[0]
     builds_lst = [str(build) for build in range(builds[0], builds[-1] + 1)]
     header = "Build Number:," + ",".join(builds_lst) + '\n'
     csv_table.append(header)
@@ -424,9 +425,8 @@ def _generate_all_charts(spec, input_data):
                 idx += 1
 
             # Generate the chart:
-            period_name = "Daily" if period == 1 else \
-                "Weekly" if period < 20 else "Monthly"
-            chart["layout"]["title"] = chart["title"].format(period=period_name)
+            chart["layout"]["xaxis"]["title"] = \
+                chart["layout"]["xaxis"]["title"].format(job=job_name)
             _generate_chart(traces,
                             chart["layout"],
                             file_name="{0}-{1}-{2}{3}".format(
@@ -445,10 +445,18 @@ def _generate_all_charts(spec, input_data):
     txt_table = None
     with open("{0}.csv".format(file_name), 'rb') as csv_file:
         csv_content = csv.reader(csv_file, delimiter=',', quotechar='"')
+        header = True
         for row in csv_content:
             if txt_table is None:
                 txt_table = prettytable.PrettyTable(row)
+                header = False
             else:
+                if not header:
+                    for idx, item in enumerate(row):
+                        try:
+                            row[idx] = str(round(float(item) / 1000000, 2))
+                        except ValueError:
+                            pass
                 txt_table.add_row(row)
         txt_table.align["Build Number:"] = "l"
     with open("{0}.txt".format(file_name), "w") as txt_file: