Changeset 12435 for trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js
- Timestamp:
- 06/12/15 14:59:54 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js
r12428 r12435 53 53 mode: "time", 54 54 twelveHourClock: false 55 }, 56 yaxis: { 57 min: 0 55 58 } 56 59 }; … … 82 85 }; 83 86 87 $scope.activeIdleSlaveFilter = function (slave) { 88 return (slave.IsAllowedToCalculate == true) && (slave.State == 'Idle'); 89 }; 90 91 $scope.activeCalculatingSlavesReverseSort = false; 92 $scope.activeCalculatingSlavesOrderColumn = 'slave.Slave.Name'; 93 94 $scope.activeIdleSlavesReverseSort = false; 95 $scope.activeIdleSlavesOrderColumn = 'slave.Slave.Name'; 96 97 $scope.inactiveSlavesReverseSort = false; 98 $scope.inactiveSlavesOrderColumn = 'slave.Slave.Name'; 99 100 84 101 var updateStatus = function () { 85 102 // update status data 86 103 dataService.getStatus({}, function (status) { 104 var oneDayInMs = 24 * 60 * 60 * 1000; 105 var today = new Date().getTime() - oneDayInMs; 87 106 // raw status data 88 107 $scope.status = status; … … 96 115 } 97 116 // knobs 98 $scope.cpu.knobData = Math.round(status.CpuUtilizationStatus.UsedCpuUtilization); 99 var usedCores = status.CoreStatus.TotalCores - status.CoreStatus.FreeCores; 100 $scope.core.knobData = Math.round(usedCores / status.CoreStatus.TotalCores * 100); 101 var usedMemory = status.MemoryStatus.TotalMemory - status.MemoryStatus.FreeMemory; 102 $scope.memory.knobData = Math.round(usedMemory / status.MemoryStatus.TotalMemory * 100); 117 $scope.cpu.knobData = Math.round(status.CpuUtilizationStatus.ActiveCpuUtilization); 118 $scope.core.knobData = Math.round(status.CoreStatus.CalculatingCores / status.CoreStatus.ActiveCores * 100); 119 $scope.memory.knobData = Math.round(status.MemoryStatus.UsedMemory / status.MemoryStatus.ActiveMemory * 100); 103 120 // chart series 104 121 var cpuSeries = $scope.cpu.series[0].data.splice(0); 105 if (cpuSeries.length > 2) {106 cpuSeries.splice(0, 1);107 }108 122 var coreSeries = [$scope.core.series[0].data, $scope.core.series[1].data]; 109 if (coreSeries[0].length > 2) {110 coreSeries[0].splice(0, 1);111 }112 if (coreSeries[1].length > 2) {113 coreSeries[1].splice(0, 1);114 }115 123 var memorySeries = [$scope.memory.series[0].data, $scope.memory.series[1].data]; 116 if (memorySeries[0].length > 2) { 117 memorySeries[0].splice(0, 1); 118 } 119 if (memorySeries[1].length > 2) { 120 memorySeries[1].splice(0, 1); 124 if ($scope.status.Timestamp < today) { 125 if (cpuSeries.length > 2) { 126 cpuSeries.splice(0, 1); 127 } 128 if (coreSeries[0].length > 2) { 129 coreSeries[0].splice(0, 1); 130 } 131 if (coreSeries[1].length > 2) { 132 coreSeries[1].splice(0, 1); 133 } 134 if (memorySeries[0].length > 2) { 135 memorySeries[0].splice(0, 1); 136 } 137 if (memorySeries[1].length > 2) { 138 memorySeries[1].splice(0, 1); 139 } 121 140 } 122 141 cpuSeries.push([$scope.status.Timestamp, $scope.cpu.knobData]); 142 143 // charts are currently filled with old total/used data 144 // start temporary 145 var usedCores = status.CoreStatus.TotalCores - status.getCoreStatus.FreeCores; 146 var usedMemory = status.MemoryStatus.TotalMemory - status.MemoryStatus.FreeMemory; 147 // end temporary 123 148 coreSeries[0].push([$scope.status.Timestamp, status.CoreStatus.TotalCores]); 124 149 coreSeries[1].push([$scope.status.Timestamp, usedCores]); … … 149 174 for (var i = 0; i < noOfStatus; ++i) { 150 175 var curStatus = status[i]; 151 var cpuData = Math.round(curStatus.CpuUtilizationStatus.UsedCpuUtilization); 152 var usedCores = curStatus.CoreStatus.TotalCores - curStatus.CoreStatus.FreeCores; 153 var usedMemory = curStatus.MemoryStatus.TotalMemory - curStatus.MemoryStatus.FreeMemory; 176 var cpuData = Math.round(curStatus.CpuUtilizationStatus.ActiveCpuUtilization); 154 177 cpuSeries.push([curStatus.Timestamp, cpuData]); 155 coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus. TotalCores]);156 coreSeries[1].push([curStatus.Timestamp, usedCores]);157 memorySeries[0].push([curStatus.Timestamp, curStatus.MemoryStatus. TotalMemory]);158 memorySeries[1].push([curStatus.Timestamp, usedMemory]);178 coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus.ActiveCores]); 179 coreSeries[1].push([curStatus.Timestamp, curStatus.CoreStatus.CalculatingCores]); 180 memorySeries[0].push([curStatus.Timestamp, curStatus.MemoryStatus.ActiveMemory]); 181 memorySeries[1].push([curStatus.Timestamp, curStatus.MemoryStatus.UsedMemory]); 159 182 } 160 183 $scope.cpu.series = [{ data: cpuSeries, label: " CPU Utilization", color: "#f7921d" }];
Note: See TracChangeset
for help on using the changeset viewer.