Merge pull request #211 from anmekin/feature/upd_stats

Hide incomlete hourly statistics

1 files changed, 16 insertions, 4 deletions

diff --git a/omaha_server/omaha/static/statistics/js/live_charts.js b/omaha_server/omaha/static/statistics/js/live_charts.js
index 31263b4..18f6da5 100644
--- a/omaha_server/omaha/static/statistics/js/live_charts.js
+++ b/omaha_server/omaha/static/statistics/js/live_charts.js
@@ -28,20 +28,29 @@ function getVersions(data){
 
 
 function getData(data){
-    return getVersions(data).map(function(d){
+    var result = getVersions(data).map(function(d){
         return {
             key: d,
             values: data[d]
         }
     });
+
+    if (result.length) {
+        result.map(function(x){
+            x.values.pop();
+        });
+    }
+    return result;
 }
 
 
 function getHours(data){
     if (Object.keys(data).length) {
-        return data[Object.keys(data)[0]].map(function (d) {
-            return new Date(d[0])
+        var res = data[Object.keys(data)[0]].map(function (d) {
+            return new Date(d[0]);
         });
+        res.pop();
+        return res;
     }
     else return [];
 }
@@ -70,7 +79,10 @@ function makePlatformGraph(chartName, chartDataName, data, platform){
                 .y(function(d) { return d[1] })
                 .useInteractiveGuideline(true)
                 .showControls(false);
-
+        chart.interactiveLayer.tooltip.headerFormatter(function(d) {
+            var top_limit = moment(d, 'MMMM DD hh:mm a').add(1, 'h');
+            return d + ' - ' + top_limit.format('hh:mm A');
+        });
         chart.xAxis.showMaxMin(false)
             .tickValues(hours.filter(function(d, i){
                 return !(i % tickSize);