grunt build

js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.js

@@ -2025,8 +2025,15 @@ window.StatisticsCollection = Backbone.Collection.extend({
           tempColor = "#7da817";
           p = "+";
         }
-        $("#" + a).html(self.history[self.server][a][0] + '<br/><span class="dashboard-figurePer" style="color: '
-          + tempColor +';">' + p + v + '%</span>');
+        if (self.history.hasOwnProperty(self.server) &&
+            self.history[self.server].hasOwnProperty(a)) {
+          $("#" + a).html(self.history[self.server][a][0] + '<br/><span class="dashboard-figurePer" style="color: '
+            + tempColor +';">' + p + v + '%</span>');
+        }
+        else {
+          $("#" + a).html('<br/><span class="dashboard-figurePer" style="color: '
+            + "#000" +';">' + "data not ready yet" + '</span>');
+        }
       });
     },
 
@@ -2046,11 +2053,71 @@ window.StatisticsCollection = Backbone.Collection.extend({
     },
 
     updateLineChart: function (figure, isDetailChart) {
+
       var g = isDetailChart ? this.detailGraph : this.graphs[figure],
       opts = {
         file: this.history[this.server][figure],
         dateWindow: this.updateDateWindow(g, isDetailChart)
       };
+
+      //round line chart values to 10th decimals
+      var pointer = 0, dates = [];
+      _.each(opts.file, function(value) {
+
+        var rounded = value[0].getSeconds() - (value[0].getSeconds() % 10); 
+        opts.file[pointer][0].setSeconds(rounded);
+        dates.push(opts.file[pointer][0]);
+
+        pointer++;
+      });
+      //get min/max dates of array
+      var maxDate = new Date(Math.max.apply(null, dates));
+      var minDate = new Date(Math.min.apply(null, dates));
+      var tmpDate = new Date(minDate.getTime()), missingDates = [];
+      var tmpDatesComplete = [];
+
+      while (tmpDate < maxDate) {
+        tmpDate = new Date(tmpDate.setSeconds(tmpDate.getSeconds() + 10));
+        tmpDatesComplete.push(tmpDate);
+      }
+
+      //iterate through all date ranges
+      _.each(tmpDatesComplete, function(date) {
+        var tmp = false;
+
+        //iterate through all available real date values
+        _.each(opts.file, function(availableDates) {
+          //if real date is inside date range
+          if (Math.floor(date.getTime()/1000) === Math.floor(availableDates[0].getTime()/1000)) {
+            tmp = true;
+          }
+        });
+
+        if (tmp === false) {
+          //a value is missing
+          if (date < new Date()) {
+            missingDates.push(date);
+          }
+        }
+      });
+
+      _.each(missingDates, function(date) {
+        if (figure === 'systemUserTime' ||
+            figure === 'requests' ||
+            figure === 'pageFaults' ||
+            figure === 'dataTransfer') {
+          opts.file.push([date, 0, 0]);
+        }
+        if (figure === 'totalTime') {
+          opts.file.push([date, 0, 0, 0]);
+        }
+      });
+
+      //sort for library
+      opts.file.sort(function(a,b){
+        return new Date(b[0]) - new Date(a[0]);
+      });
+
       g.updateOptions(opts);
     },
 
@@ -2358,12 +2425,26 @@ window.StatisticsCollection = Backbone.Collection.extend({
       );
     },
 
+    addEmptyDataLabels: function () {
+      if ($('.dataNotReadyYet').length === 0) {
+        $('#dataTransferDistribution').prepend('<p class="dataNotReadyYet"> data not ready yet </p>');
+        $('#totalTimeDistribution').prepend('<p class="dataNotReadyYet"> data not ready yet </p>');
+        $('.dashboard-bar-chart-title').prepend('<p class="dataNotReadyYet"> data not ready yet </p>');
+      }
+    },
+
+    removeEmptyDataLabels: function () {
+      $('.dataNotReadyYet').remove();
+    },
+
     prepareResidentSize: function (update) {
+
       var self = this;
 
       var dimensions = this.getCurrentSize('#residentSizeChartContainer');
 
       var current = self.history[self.server].residentSizeCurrent / 1024 / 1024;
+      
       var currentA = "";
 
       if (current < 1025) {
@@ -2376,6 +2457,15 @@ window.StatisticsCollection = Backbone.Collection.extend({
       var currentP = fmtNumber(self.history[self.server].residentSizePercent * 100, 2);
       var data = [fmtNumber(self.history[self.server].physicalMemory / 1024 / 1024 / 1024, 0) + " GB"];
 
+
+      if (self.history[self.server].residentSizeChart === undefined) {
+        this.addEmptyDataLabels();
+        return;
+      }
+      else {
+        this.removeEmptyDataLabels();
+      }
+
       nv.addGraph(function () {
         var chart = nv.models.multiBarHorizontalChart()
           .x(function (d) {
@@ -2437,7 +2527,6 @@ window.StatisticsCollection = Backbone.Collection.extend({
 
     prepareD3Charts: function (update) {
       var self = this;
-
       var barCharts = {
         totalTimeDistribution: [
           "queueTimeDistributionPercent", "requestTimeDistributionPercent"],
@@ -2451,11 +2540,20 @@ window.StatisticsCollection = Backbone.Collection.extend({
       }
 
       _.each(Object.keys(barCharts), function (k) {
+
         var dimensions = self.getCurrentSize('#' + k
           + 'Container .dashboard-interior-chart');
 
         var selector = "#" + k + "Container svg";
 
+        if (self.history[self.server].residentSizeChart === undefined) {
+          self.addEmptyDataLabels();
+          return;
+        }
+        else {
+          self.removeEmptyDataLabels();
+        }
+
         nv.addGraph(function () {
           var tickMarks = [0, 0.25, 0.5, 0.75, 1];
           var marginLeft = 75;
@@ -2930,7 +3028,7 @@ window.StatisticsCollection = Backbone.Collection.extend({
       }
 
       if ($('#accordion2')) {
-        $('#accordion2').bind("click", function() {
+        $('#accordion2 .accordion-toggle').bind("click", function() {
           if ($('#collapseOne').is(":visible")) {
             $('#collapseOne').hide();
             setTimeout(function() {

js/apps/system/_admin/aardvark/APP/clusterFrontend/build/style.css

@@ -2905,7 +2905,8 @@ div .tile, div .bigtile {
   margin-left: 6px;
   margin-right: 6px;
   position: relative;
-  text-align: center; }
+  text-align: center;
+  z-index: 1; }
   div .tile:hover, div .bigtile:hover {
     cursor: pointer; }
   div .tile .warning-icons, div .bigtile .warning-icons {
@@ -3012,7 +3013,8 @@ div .tile, div .bigtile {
       padding-bottom: 2px;
       padding-left: 3px;
       padding-right: 3px;
-      padding-top: 2px; }
+      padding-top: 2px;
+      z-index: 2; }
       div .tile .iconSet span:hover, div .bigtile .iconSet span:hover {
         background-color: #8aa051;
         color: #fff; }
@@ -5913,7 +5915,8 @@ div .tile, div .bigtile {
   margin-left: 6px;
   margin-right: 6px;
   position: relative;
-  text-align: center; }
+  text-align: center;
+  z-index: 1; }
   div .tile:hover, div .bigtile:hover {
     cursor: pointer; }
   div .tile .warning-icons, div .bigtile .warning-icons {
@@ -6020,7 +6023,8 @@ div .tile, div .bigtile {
       padding-bottom: 2px;
       padding-left: 3px;
       padding-right: 3px;
-      padding-top: 2px; }
+      padding-top: 2px;
+      z-index: 2; }
       div .tile .iconSet span:hover, div .bigtile .iconSet span:hover {
         background-color: #8aa051;
         color: #fff; }
@@ -6112,6 +6116,12 @@ div .bigtile {
   right: 9px;
   top: 6px; }
 
+.dataNotReadyYet {
+  font-family: 'Open Sans', sans-serif;
+  font-size: 20px;
+  font-weight: 100;
+  text-align: center; }
+
 .dashboard-sub-bar {
   background-color: #686766;
   border-bottom-left-radius: 3px;

js/apps/system/_admin/aardvark/APP/frontend/build/scripts.html.part

@@ -1,3 +1,3 @@
-<script src="sharedLibs.js?version=1450717209249"></script>
-<script src="libs.js?version=1450717209249"></script>
-<script src="app.js?version=1450717209249"></script>
+<script src="sharedLibs.js?version=1452528228639"></script>
+<script src="libs.js?version=1452528228639"></script>
+<script src="app.js?version=1452528228639"></script>

js/apps/system/_admin/aardvark/APP/frontend/build/standalone-min.html

@@ -2755,4 +2755,4 @@ var cutByResolution = function (str) {
         <% }); %>
       </ul>
     </div>
-  <% } %></script></head><body><nav class="navbar"><div class="resizecontainer"><div class="navlogo"><a class="logo" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></a></div><div id="progressPlaceholderIcon"></div><div class="statmenu" id="statisticBar"></div><div class="usermenu" id="userBar" style="float:right"></div><div class="notificationmenu" id="notificationBar" style="float:right"></div><div class="navmenu" id="navigationBar"></div></div></nav><div class="centralRow resizecontainer"><div id="content" class="centralContent"></div></div><div id="modalPlaceholder"></div><div id="progressPlaceholder" style="display:none"></div><footer class="footer"><div class="resizecontainer" id="footerBar"></div></footer><div class="arangoFrame" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="sharedLibs.js?version=1450717209249"></script><script src="libs.js?version=1450717209249"></script><script src="app.js?version=1450717209249"></script></body></html>
+  <% } %></script></head><body><nav class="navbar"><div class="resizecontainer"><div class="navlogo"><a class="logo" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"></a></div><div id="progressPlaceholderIcon"></div><div class="statmenu" id="statisticBar"></div><div class="usermenu" id="userBar" style="float:right"></div><div class="notificationmenu" id="notificationBar" style="float:right"></div><div class="navmenu" id="navigationBar"></div></div></nav><div class="centralRow resizecontainer"><div id="content" class="centralContent"></div></div><div id="modalPlaceholder"></div><div id="progressPlaceholder" style="display:none"></div><footer class="footer"><div class="resizecontainer" id="footerBar"></div></footer><div class="arangoFrame" style=""><div class="outerDiv"><div class="innerDiv"></div></div></div><script src="sharedLibs.js?version=1452528228639"></script><script src="libs.js?version=1452528228639"></script><script src="app.js?version=1452528228639"></script></body></html>

js/apps/system/_admin/aardvark/APP/frontend/build/standalone.html

@@ -3011,9 +3011,9 @@ var cutByResolution = function (str) {
     </div>
   </div>
 
-<script src="sharedLibs.js?version=1450717209249"></script>
-<script src="libs.js?version=1450717209249"></script>
-<script src="app.js?version=1450717209249"></script>
+<script src="sharedLibs.js?version=1452528228639"></script>
+<script src="libs.js?version=1452528228639"></script>
+<script src="app.js?version=1452528228639"></script>
 
   </body>
 </html>

js/apps/system/_admin/aardvark/APP/frontend/build/style.css

@@ -2895,7 +2895,8 @@ div .tile, div .bigtile {
   margin-left: 6px;
   margin-right: 6px;
   position: relative;
-  text-align: center; }
+  text-align: center;
+  z-index: 1; }
   div .tile:hover, div .bigtile:hover {
     cursor: pointer; }
   div .tile .warning-icons, div .bigtile .warning-icons {
@@ -3002,7 +3003,8 @@ div .tile, div .bigtile {
       padding-bottom: 2px;
       padding-left: 3px;
       padding-right: 3px;
-      padding-top: 2px; }
+      padding-top: 2px;
+      z-index: 2; }
       div .tile .iconSet span:hover, div .bigtile .iconSet span:hover {
         background-color: #8aa051;
         color: #fff; }
@@ -5974,6 +5976,12 @@ div.headerBar {
   right: 9px;
   top: 6px; }
 
+.dataNotReadyYet {
+  font-family: 'Open Sans', sans-serif;
+  font-size: 20px;
+  font-weight: 100;
+  text-align: center; }
+
 .dashboard-sub-bar {
   background-color: #686766;
   border-bottom-left-radius: 3px;