Changeset 12563 for stable/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history

Timestamp:

07/01/15 14:59:47 (9 years ago)

Author:

ascheibe

Message:

#2394 merged r12428, r12429, r12430, r12435, r12442, r12443, r12445, r12514, r12517, r12519, r12520, r12521, r12523, r12532, r12542, r12546, r12552, r12553, r12556, r12557, r12559, r12561, r12146, r12457 into stable

Location:

stable

Files:

• . (modified) (2 props)
• HeuristicLab.Services.WebApp.Status (copied) (copied from trunk/sources/HeuristicLab.Services.WebApp.Status)
• HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/history.cshtml (modified) (3 diffs)
• HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/historyCtrl.js (modified) (6 diffs)

stable/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/history.cshtml

@@ -12 +12 @@
 <div id="history-header">
     <form class="form-inline">
-        <div class="form-group">
+        <div class="form-group" style="margin-left: 5px; margin-right: 5px;">
             <label for="fromDate">From:&nbsp;</label>
             <div class="input-group">
@@ -21 +21 @@
             </div>
         </div>
-        <div class="form-group">
-            <label for="fromDate">&nbsp;&nbsp;To:&nbsp;</label>
+        <div class="form-group" style="margin-left: 5px; margin-right: 5px;">
+            <label for="fromDate">To:&nbsp;</label>
             <div class="input-group">
                 <input id="fromDate" type="text" class="form-control" datepicker-popup="dd.MM.yyyy" ng-model="toDate" is-open="toIsOpen" datepicker-options="dateOptions" ng-required="true" close-text="Close" />
@@ -29 +29 @@
                 </span>
             </div>
+        </div>
+        <div class="form-group" style="margin-left: 5px; margin-right: 5px;">
+            <button type="button" class="btn btn-default" ng-click="updateCharts()">
+                Apply
+            </button>
         </div>
     </form>

stable/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/historyCtrl.js

@@ -4 +4 @@
         ['$scope', '$interval', 'app.status.data.service',
         function ($scope, $interval, dataService) {
-
             $scope.chartOptions = {
                 grid: {
@@ -15 +14 @@
                 yaxis: {
                     min: 0,
-                    max: 100,
-                    zoomRange: false,
-                    panRange: false
+                    max: 100
                 },
                 xaxis: {
                     mode: "time",
                     twelveHourClock: false
-                },
-                zoom: {
-                    interactive: true
-                },
-                pan: {
-                    interactive: true
                 }
             };
@@ -43 +34 @@
                     }
                 },
-                yaxis: {
-                    zoomRange: false,
-                    panRange: false
-                },
                 xaxis: {
                     mode: "time",
                     twelveHourClock: false
-                },
-                zoom: {
-                    interactive: true
-                },
-                pan: {
-                    interactive: true
                 }
             };
+
 
             $scope.fromDate = new Date();
@@ -88 +70 @@
             $scope.memorySeries = [[]];
 
-            var updateCharts = function () {
-                dataService.getStatusHistory({start: ConvertFromDate($scope.fromDate), end: ConvertToDate($scope.toDate)}, function (status) {
+            $scope.updateCharts = function () {
+                dataService.getStatusHistory({ start: ConvertFromDate($scope.fromDate), end: ConvertToDate($scope.toDate) }, function (status) {
                     var noOfStatus = status.length;
                     var cpuSeries = [];
@@ -96 +78 @@
                     for (var i = 0; i < noOfStatus; ++i) {
                         var curStatus = status[i];
-                        var cpuData = Math.round(curStatus.CpuUtilizationStatus.UsedCpuUtilization);
-                        var usedCores = curStatus.CoreStatus.TotalCores - curStatus.CoreStatus.FreeCores;
-                        var usedMemory = curStatus.MemoryStatus.TotalMemory - curStatus.MemoryStatus.FreeMemory;
+                        var cpuData = Math.round(curStatus.CpuUtilizationStatus.ActiveCpuUtilization);
                         cpuSeries.push([curStatus.Timestamp, cpuData]);
-                        coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus.TotalCores]);
-                        coreSeries[1].push([curStatus.Timestamp, usedCores]);
-                        memorySeries[0].push([curStatus.Timestamp, curStatus.MemoryStatus.TotalMemory]);
-                        memorySeries[1].push([curStatus.Timestamp, usedMemory]);
+                        coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus.ActiveCores]);
+                        coreSeries[1].push([curStatus.Timestamp, curStatus.CoreStatus.CalculatingCores]);
+                        memorySeries[0].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus.ActiveMemory / 1024)]);
+                        memorySeries[1].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus.UsedMemory / 1024)]);
                     }
                     $scope.cpuSeries = [{ data: cpuSeries, label: "&nbsp;CPU Utilization", color: "#f7921d" }];
@@ -117 +97 @@
                 });
             };
-
-            $scope.$watch('fromDate', function (newValue, oldValue) {
-                updateCharts();
-            });
-            $scope.$watch('toDate', function (newValue, oldValue) {
-                updateCharts();
-            });
+            $scope.updateCharts();
         }]
     );