implemented getLast24HourAnalysis, to show the Tx/Hour of the last 24 hours

This commit is contained in:
arnaucode
2017-08-19 18:31:16 +02:00
parent f88b6021e2
commit 3e83a6bf74
15 changed files with 160 additions and 105 deletions

View File

@@ -1,10 +1,19 @@
<div class="row">
<div class="col-md-12">
<div class="col-md-6">
<div class="panel-heading c_blueGrey300">
<h3 class="panel-title">Tx for each Hour</h3>
<h3 class="panel-title">All time Tx/Hour</h3>
</div>
<div class="panel-body">
<canvas id="bar" class="chart chart-bar" chart-data="data" chart-labels="labels">
<canvas id="line" class="chart chart-line" chart-data="totalhour.data" chart-labels="totalhour.labels">
</canvas>
</div>
</div>
<div class="col-md-6">
<div class="panel-heading c_blueGrey300">
<h3 class="panel-title">Last 24 hours Tx/Hour</h3>
</div>
<div class="panel-body">
<canvas id="line" class="chart chart-line" chart-data="last24hour.data" chart-labels="last24hour.labels">
</canvas>
</div>
</div>

View File

@@ -10,18 +10,35 @@ angular.module('app.dateAnalysis', ['ngRoute', 'chart.js'])
}])
.controller('DateAnalysisCtrl', function($scope, $http, $routeParams) {
$scope.data=[];
$scope.labels=[];
$scope.totalhour={
data: [],
labels: []
};
$http.get(urlapi + 'houranalysis')
$http.get(urlapi + 'totalhouranalysis')
.then(function(data, status, headers, config) {
console.log('data success');
console.log(data);
$scope.data = data.data.data;
$scope.labels=data.data.labels;
$scope.totalhour.data = data.data.data;
$scope.totalhour.labels=data.data.labels;
}, function(data, status, headers, config) {
console.log('data error');
});
//date analysis
$scope.last24hour= {
data:[],
labels: []
};
$http.get(urlapi + 'last24hour')
.then(function(data, status, headers, config) {
console.log('data success');
console.log(data);
$scope.last24hour.data = data.data.data;
$scope.last24hour.labels = data.data.labels;
}, function(data, status, headers, config) {
console.log('data error');
});
});