projects / arvados.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
19744: Better incorporation of the text report data into HTML
[arvados.git] / tools / crunchstat-summary / crunchstat_summary / webchart.py
diff --git a/tools/crunchstat-summary/crunchstat_summary/webchart.py b/tools/crunchstat-summary/crunchstat_summary/webchart.py
index 8adf0fee7eda9c157bd32562cf88e573afea7bf3..4c596902ba22da4faf13317c46e591cb5f1acdd6 100644 (file)
--- a/tools/crunchstat-summary/crunchstat_summary/webchart.py
+++ b/tools/crunchstat-summary/crunchstat_summary/webchart.py
@@ -24,24 +24,45 @@ class WebChart(object):
         self.label = label
         self.summarizers = summarizers
 
-    def html(self, bodytext=''):
+    def html(self, beforechart='', afterchart=''):
         return '''<!doctype html><html><head>
         <title>{} stats</title>
         <script type="text/javascript" src="{}"></script>
         <script type="text/javascript">{}</script>
         <style>
         table {{
-          width: 80%
+          width: 90%
         }}
         td {{
-          width: 20%;
+          width: 20%
+        }}
+        #chart {{
+          margin-top: 2em;
+        }}
+        #bottomhtml {{
+          margin-top: 4em;
         }}
         </style>
         {}
-        </head><body>{}</body></html>
+        </head>
+        <body>
+        <h1>{}</h1>
+        <div id="tophtml">
+        {}
+        </div>
+        <div id="chart"></div>
+        <div id="bottomhtml">
+        {}
+        </div>
+        </body>
+        </html>
         '''.format(escape(self.label),
-                   self.JSLIB, self.js(), self.headHTML(),
-                   bodytext)
+                   self.JSLIB,
+                   self.js(),
+                   self.headHTML(),
+                   escape(self.label),
+                   beforechart,
+                   afterchart)
 
     def js(self):
         return 'var chartdata = {};\n{}'.format(