Format large numbers in graph popup info.

Author: kloostert

flask-dashboard/dashboard/routings/result.py

@@ -1,4 +1,5 @@
 import pygal
+import math
 from flask import session, url_for, render_template
 from werkzeug.routing import BuildError
 
@@ -36,9 +37,12 @@ def show_graph(end):
         list_avg.append(d.avg)
         list_max.append(d.max)
         list_count.append(d.count)
-    times_chart.add('Minimum', list_min, formatter=lambda x: '%.2f ms' % x)
-    times_chart.add('Average', list_avg, formatter=lambda x: '%.2f ms' % x)
-    times_chart.add('Maximum', list_max, formatter=lambda x: '%.2f ms' % x)
+    times_chart.add('Minimum', list_min, formatter=lambda x: '{0}s and {1}ms'.format(math.floor(x/1000),
+                                                                                     round(x % 1000, 2)))
+    times_chart.add('Average', list_avg, formatter=lambda x: '{0}s and {1}ms'.format(math.floor(x/1000),
+                                                                                     round(x % 1000, 2)))
+    times_chart.add('Maximum', list_max, formatter=lambda x: '{0}s and {1}ms'.format(math.floor(x/1000),
+                                                                                     round(x % 1000, 2)))
     times_data = times_chart.render_data_uri()
 
     hits_chart = pygal.HorizontalBar(height=100+len(data)*30, show_legend=False)
@@ -90,12 +94,14 @@ def show_graph(end):
         data = []
         for v in versions:
             data.append(user_data[d][v])
-        dot_chart_user.add(d, data, formatter=lambda x: '%.2f ms' % x)
+        dot_chart_user.add(d, data, formatter=lambda x: '{0}s and {1}ms'.format(math.floor(x/1000),
+                                                                                round(x % 1000, 2)))
     for d in [str(c.ip) for c in get_endpoint_column(end, FunctionCall.ip)]:
         data = []
         for v in versions:
             data.append(ip_data[d][v])
-        dot_chart_ip.add(d, data, formatter=lambda x: '%.2f ms' % x)
+        dot_chart_ip.add(d, data, formatter=lambda x: '{0}s and {1}ms'.format(math.floor(x/1000),
+                                                                              round(x % 1000, 2)))
 
     return render_template('show-graph.html', link=config.link, session=session, rule=rule, url=url,
                            times_data=times_data, hits_data=hits_data, dot_chart_user=dot_chart_user.render_data_uri(),

flask-dashboard/dashboard/routings/setup.py

@@ -14,6 +14,7 @@
 import datetime
 import time
 import pygal
+import math
 
 
 @blueprint.route('/settings', methods=['GET', 'POST'])
@@ -117,9 +118,12 @@ def testmonitor():
             list_avg.append(d.avg)
             list_max.append(d.max)
             list_count.append(d.count)
-        times_chart.add('Minimum', list_min, formatter=lambda x: '%.2f ms' % x)
-        times_chart.add('Average', list_avg, formatter=lambda x: '%.2f ms' % x)
-        times_chart.add('Maximum', list_max, formatter=lambda x: '%.2f ms' % x)
+        times_chart.add('Minimum', list_min, formatter=lambda x: '{0}s and {1}ms'.format(math.floor(x/1000),
+                                                                                         round(x % 1000, 2)))
+        times_chart.add('Average', list_avg, formatter=lambda x: '{0}s and {1}ms'.format(math.floor(x/1000),
+                                                                                         round(x % 1000, 2)))
+        times_chart.add('Maximum', list_max, formatter=lambda x: '{0}s and {1}ms'.format(math.floor(x/1000),
+                                                                                         round(x % 1000, 2)))
         times_data = times_chart.render_data_uri()
 
     return render_template('testmonitor.html', link=config.link, session=session, curr=3, form=form, tests=get_tests(),