Move getLoad to Host factory, and display via chartjs
This commit is contained in:
parent
284b51b73d
commit
f32cb32da9
|
@ -18,11 +18,16 @@ ZoneMinder.factory('Header', function($http) {
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
ZoneMinder.factory('Footer', function($http) {
|
ZoneMinder.factory('Host', function($http) {
|
||||||
return {
|
return {
|
||||||
getLoad: function(callback) {
|
getLoad: function(callback) {
|
||||||
$http.get('/api/host/getLoad.json').success(callback);
|
$http.get('/api/host/getLoad.json').success(callback);
|
||||||
},
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
ZoneMinder.factory('Footer', function($http) {
|
||||||
|
return {
|
||||||
getDiskPercent: function(callback) {
|
getDiskPercent: function(callback) {
|
||||||
$http.get('/api/host/getDiskPercent.json').success(callback);
|
$http.get('/api/host/getDiskPercent.json').success(callback);
|
||||||
},
|
},
|
||||||
|
|
|
@ -12,10 +12,6 @@ ZoneMinder.controller('HeaderController', function($scope, Header) {
|
||||||
});
|
});
|
||||||
|
|
||||||
ZoneMinder.controller('FooterController', function($scope, Footer) {
|
ZoneMinder.controller('FooterController', function($scope, Footer) {
|
||||||
Footer.getLoad(function(load) {
|
|
||||||
$scope.load = load.load;
|
|
||||||
});
|
|
||||||
|
|
||||||
Footer.getDiskPercent(function(diskPercent) {
|
Footer.getDiskPercent(function(diskPercent) {
|
||||||
$scope.diskPercent = diskPercent.space;
|
$scope.diskPercent = diskPercent.space;
|
||||||
});
|
});
|
||||||
|
@ -104,6 +100,34 @@ ZoneMinder.controller('ConfigController', function($scope, $http, Config) {
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
ZoneMinder.controller('HostController', function($scope, Footer) {
|
ZoneMinder.controller('HostController', function($scope, Host, Footer) {
|
||||||
|
|
||||||
|
Host.getLoad(function(load) {
|
||||||
|
$scope.loadData = {
|
||||||
|
labels: ['1 min', '5 min', '15 min'],
|
||||||
|
datasets: [{
|
||||||
|
label: 'CPU Load',
|
||||||
|
fillColor: 'rgba(220,220,220,0.2)',
|
||||||
|
strokeColor: 'rgba(220,220,220,1)',
|
||||||
|
pointColor: 'rgba(220,220,220,1)',
|
||||||
|
pointStrokeColor: '#fff',
|
||||||
|
pointHighlightFill: '#fff',
|
||||||
|
pointHighlightStroke: 'rgba(220,220,220,1)',
|
||||||
|
data: [ load.load[0], load.load[1], load.load[2] ]
|
||||||
|
}]
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
$scope.doptions = {
|
||||||
|
responsive: false,
|
||||||
|
segmentShowStroke : true,
|
||||||
|
segmentStrokeColor : '#fff',
|
||||||
|
segmentStrokeWidth : 2,
|
||||||
|
percentageInnerCutout : 50, // This is 0 for Pie charts
|
||||||
|
animationSteps : 1,
|
||||||
|
animationEasing : 'easeOutBounce',
|
||||||
|
animateRotate : false,
|
||||||
|
animateScale : false,
|
||||||
|
legendTemplate : '<ul class="tc-chart-js-legend"><% for (var i=0; i<segments.length; i++){%><li><span style="background-color:<%=segments[i].fillColor%>"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>'
|
||||||
|
};
|
||||||
});
|
});
|
||||||
|
|
|
@ -8,6 +8,14 @@ xhtmlHeaders( __FILE__, 'Host' );
|
||||||
|
|
||||||
<div class="container-fluid" ng-controller="HostController">
|
<div class="container-fluid" ng-controller="HostController">
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-4">
|
||||||
|
<h3>CPU Load</h3>
|
||||||
|
|
||||||
|
<canvas tc-chartjs-line chart-data="loadData" chart-options="doptions" width="250px" height="250px"></canvas>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<?php include("footer.php"); ?>
|
<?php include("footer.php"); ?>
|
||||||
|
|
Loading…
Reference in New Issue