Changeset 12962 for stable/HeuristicLab.Services.WebApp.Status/3.3/WebApp
- Timestamp:
- 09/21/15 16:28:38 (9 years ago)
- Location:
- stable
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/history.cshtml
r12685 r12962 15 15 <label for="fromDate">From: </label> 16 16 <div class="input-group"> 17 <input id="fromDate" type="text" class="form-control" datepicker-popup="dd.MM.yyyy" ng-model="fromDate" is-open="fromIsOpen" datepicker-options="dateOptions" ng-required="true" close-text="Close" 17 <input id="fromDate" type="text" class="form-control" datepicker-popup="dd.MM.yyyy" ng-model="fromDate" is-open="fromIsOpen" datepicker-options="dateOptions" ng-required="true" close-text="Close"/> 18 18 <span class="input-group-btn"> 19 19 <button type="button" class="btn btn-default" ng-click="openFromDateSelection($event)"><i class="glyphicon glyphicon-calendar"></i></button> … … 32 32 <div class="form-group" style="margin-left: 5px; margin-right: 5px;"> 33 33 <div class="btn-group" dropdown dropdown-append-to-body> 34 <button type="button" class="btn btn-default dropdown-toggle" dropdown-toggle style="width: 1 30px; text-align: left;">35 <span class="text-left" style="display: inline-block; width: 85px;">{{curQuickSelection.name}}</span>34 <button type="button" class="btn btn-default dropdown-toggle" dropdown-toggle style="width: 145px; text-align: left;"> 35 <span class="text-left" style="display: inline-block; width: 100px;">{{curQuickSelection.name}}</span> 36 36 <span class="glyphicon glyphicon-chevron-down" style="margin-top: 3px;"></span> 37 37 </button> 38 38 <ul class="dropdown-menu" role="menu"> 39 39 <li ng-repeat="quickSelection in quickSelectionList"> 40 <a ng-click="changeQuickSelection(quickSelection)">{{quickSelection.name}}</a>40 <a class="cursor-pointer" ng-click="changeQuickSelection(quickSelection)">{{quickSelection.name}}</a> 41 41 </li> 42 42 </ul> … … 50 50 </form> 51 51 </div> 52 53 52 54 53 <div class="default-view-container"> -
stable/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/historyCtrl.js
r12685 r12962 2 2 var module = appStatusPlugin.getAngularModule(); 3 3 module.controller('app.status.historyCtrl', 4 ['$scope', '$interval', 'app.status.data.service', 5 function ($scope, $interval, dataService ) {4 ['$scope', '$interval', 'app.status.data.service', '$log', 5 function ($scope, $interval, dataService, $log) { 6 6 $scope.chartOptions = { 7 7 grid: { … … 40 40 }; 41 41 42 43 42 $scope.fromDate = new Date(); 44 43 $scope.toDate = new Date(); … … 52 51 { id: 2, name: 'Yesterday' }, 53 52 { id: 3, name: 'Last 7 Days' }, 54 { id: 4, name: 'Last 30 Days' } 53 { id: 4, name: 'Last 30 Days' }, 54 { id: 5, name: 'Last 6 Months' }, 55 { id: 6, name: 'Last Year' } 55 56 ]; 56 57 $scope.changeQuickSelection = function (quickSelection) { … … 72 73 case 4: 73 74 $scope.fromDate = new Date(today.valueOf() - (30 * oneDayInMs)); 75 $scope.toDate = new Date(today.valueOf()); 76 break; 77 case 5: 78 var month = today.getMonth() - 6; 79 if (month < 0) { 80 month += 12; 81 } 82 $scope.fromDate = new Date(today.valueOf()); 83 $scope.fromDate.setMonth(month); 84 $scope.toDate = new Date(today.valueOf()); 85 break; 86 case 6: 87 $scope.fromDate = new Date(today.valueOf()); 88 $scope.fromDate.setFullYear(today.getFullYear()-1); 74 89 $scope.toDate = new Date(today.valueOf()); 75 90 break; … … 113 128 for (var i = 0; i < noOfStatus; ++i) { 114 129 var curStatus = status[i]; 115 var cpuData = Math.round(curStatus.CpuUtilizationStatus. ActiveCpuUtilization);130 var cpuData = Math.round(curStatus.CpuUtilizationStatus.TotalCpuUtilization); 116 131 cpuSeries.push([curStatus.Timestamp, cpuData]); 117 coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus. ActiveCores]);118 coreSeries[1].push([curStatus.Timestamp, curStatus.CoreStatus. CalculatingCores]);119 memorySeries[0].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus. ActiveMemory / 1024)]);132 coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus.TotalCores]); 133 coreSeries[1].push([curStatus.Timestamp, curStatus.CoreStatus.UsedCores]); 134 memorySeries[0].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus.TotalMemory / 1024)]); 120 135 memorySeries[1].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus.UsedMemory / 1024)]); 121 136 } … … 129 144 { data: memorySeries[1], label: " Used Memory", color: "LightPink" } 130 145 ]; 131 132 146 }); 133 147 }; -
stable/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/status.cshtml
r12563 r12962 88 88 <tr data-toggle="tooltip" data-placement="bottom" title="All calculating slaves that are allowed to calculate"> 89 89 <td class="text-left">Calculating:</td> 90 <td class="text-right">{{status.MemoryStatus. UsedMemory | kbToGB}} GB</td>90 <td class="text-right">{{status.MemoryStatus.CalculatingMemory | kbToGB}} GB</td> 91 91 </tr> 92 92 </table> … … 115 115 </tr> 116 116 </table> 117 </div> 118 </div> 119 </div> 120 </div> 121 122 <div class="row"> 123 <div class="col-lg-12"> 124 <div class="panel panel-default"> 125 <div class="panel-heading"> 126 <h3 class="panel-title">Status Overview</h3> 127 </div> 128 <div class="panel-body"> 129 <div class="row"> 130 <div class="col-md-6"> 131 <table class="table table-no-border table-condensed table-auto-width table-content"> 132 <tr> 133 <td class="text-left">Current Average Waiting Time:</td> 134 <td class="text-right">{{status.TimeStatus.AvgWaitingTime | toTimespan}}</td> 135 </tr> 136 <tr> 137 <td class="text-left">Total CPU Time:</td> 138 <td class="text-right">{{status.TimeStatus.TotalCpuTime | toTimespan}}</td> 139 </tr> 140 <tr> 141 <td class="text-left">Since:</td> 142 <td class="text-right">{{status.TimeStatus.BeginDate | toDate}}</td> 143 </tr> 144 </table> 145 </div> 146 <div class="col-md-6"> 147 <table class="table table-no-border table-condensed table-auto-width table-content"> 148 <tr> 149 <td class="text-left">Minimum Calculating Time:</td> 150 <td class="text-right">{{status.TimeStatus.MinCalculatingTime | toTimespan}}</td> 151 </tr> 152 <tr> 153 <td class="text-left">Maximum Calculating Time:</td> 154 <td class="text-right">{{status.TimeStatus.MaxCalculatingTime | toTimespan}}</td> 155 </tr> 156 <tr> 157 <td class="text-left">Average Calculating Time:</td> 158 <td class="text-right">{{status.TimeStatus.AvgCalculatingTime | toTimespan}}</td> 159 </tr> 160 <tr> 161 <td class="text-left">Standard Deviation Calculating Time:</td> 162 <td class="text-right">{{status.TimeStatus.StandardDeviationCalculatingTime | toTimespan}}</td> 163 </tr> 164 </table> 165 </div> 166 </div> 117 167 </div> 118 168 </div> -
stable/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js
r12563 r12962 4 4 ['$scope', '$interval', 'app.status.data.service', 5 5 function ($scope, $interval, dataService) { 6 $scope.interval = 10000; // update interval in ms6 $scope.interval = defaultPageUpdateInterval; 7 7 $scope.knobOptions = { 8 8 'fgColor': "#f7921d", … … 103 103 $scope.cpu.knobData = Math.round(status.CpuUtilizationStatus.ActiveCpuUtilization); 104 104 $scope.core.knobData = Math.round(status.CoreStatus.CalculatingCores / status.CoreStatus.ActiveCores * 100); 105 $scope.memory.knobData = Math.round(status.MemoryStatus. UsedMemory / status.MemoryStatus.ActiveMemory * 100);105 $scope.memory.knobData = Math.round(status.MemoryStatus.CalculatingMemory / status.MemoryStatus.ActiveMemory * 100); 106 106 // chart series 107 107 var cpuSeries = $scope.cpu.series[0].data.splice(0); … … 127 127 128 128 cpuSeries.push([$scope.status.Timestamp, Math.round(status.CpuUtilizationStatus.TotalCpuUtilization)]); 129 // charts are currently filled with old total/used data130 // start temporary131 var usedCores = status.CoreStatus.TotalCores - status.CoreStatus.FreeCores;132 var usedMemory = status.MemoryStatus.TotalMemory - status.MemoryStatus.FreeMemory;133 // end temporary134 129 coreSeries[0].push([$scope.status.Timestamp, status.CoreStatus.TotalCores]); 135 coreSeries[1].push([$scope.status.Timestamp, usedCores]);130 coreSeries[1].push([$scope.status.Timestamp, status.CoreStatus.UsedCores]); 136 131 memorySeries[0].push([$scope.status.Timestamp, Math.round(status.MemoryStatus.TotalMemory / 1024)]); 137 memorySeries[1].push([$scope.status.Timestamp, Math.round( usedMemory / 1024)]);132 memorySeries[1].push([$scope.status.Timestamp, Math.round(status.MemoryStatus.UsedMemory / 1024)]); 138 133 $scope.cpu.series = [{ data: cpuSeries, label: " CPU Utilization", color: "#f7921d" }]; 139 134 $scope.core.series = [ … … 160 155 for (var i = 0; i < noOfStatus; ++i) { 161 156 var curStatus = status[i]; 162 var cpuData = Math.round(curStatus.CpuUtilizationStatus. ActiveCpuUtilization);157 var cpuData = Math.round(curStatus.CpuUtilizationStatus.TotalCpuUtilization); 163 158 cpuSeries.push([curStatus.Timestamp, cpuData]); 164 coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus. ActiveCores]);165 coreSeries[1].push([curStatus.Timestamp, curStatus.CoreStatus. CalculatingCores]);166 memorySeries[0].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus. ActiveMemory / 1024)]);159 coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus.TotalCores]); 160 coreSeries[1].push([curStatus.Timestamp, curStatus.CoreStatus.UsedCores]); 161 memorySeries[0].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus.TotalMemory / 1024)]); 167 162 memorySeries[1].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus.UsedMemory / 1024)]); 168 163 }
Note: See TracChangeset
for help on using the changeset viewer.