|
@@ -51,7 +51,9 @@ var generateTemplate = function(){
|
|
|
},
|
|
},
|
|
|
data: function () {
|
|
data: function () {
|
|
|
return {
|
|
return {
|
|
|
- chart: {}
|
|
|
|
|
|
|
+ chart: {},
|
|
|
|
|
+ labels: {},
|
|
|
|
|
+ stamp: null
|
|
|
// datasetTempalte:{
|
|
// datasetTempalte:{
|
|
|
// label: "Traffic",
|
|
// label: "Traffic",
|
|
|
// fill: true,
|
|
// fill: true,
|
|
@@ -94,7 +96,11 @@ var generateTemplate = function(){
|
|
|
}],
|
|
}],
|
|
|
xAxes: [{
|
|
xAxes: [{
|
|
|
display: true,
|
|
display: true,
|
|
|
- type: 'linear',
|
|
|
|
|
|
|
+ type: 'time',
|
|
|
|
|
+ time: {
|
|
|
|
|
+ tooltipFormat: "H:mm:ss",
|
|
|
|
|
+ displayFormat: "H:mm:ss"
|
|
|
|
|
+ },
|
|
|
position: 'bottom'
|
|
position: 'bottom'
|
|
|
}]
|
|
}]
|
|
|
}
|
|
}
|
|
@@ -151,6 +157,7 @@ var generateTemplate = function(){
|
|
|
self.graphdata.datasets[0].data = [];
|
|
self.graphdata.datasets[0].data = [];
|
|
|
self.graphdata.datasets = [];
|
|
self.graphdata.datasets = [];
|
|
|
var firstStamp = new Date(obj[0].createdAt);
|
|
var firstStamp = new Date(obj[0].createdAt);
|
|
|
|
|
+ self.stamp = firstStamp;
|
|
|
var dataset = {
|
|
var dataset = {
|
|
|
label: "Traffic",
|
|
label: "Traffic",
|
|
|
data: [],
|
|
data: [],
|
|
@@ -181,6 +188,7 @@ var generateTemplate = function(){
|
|
|
lastStamp = stamp;
|
|
lastStamp = stamp;
|
|
|
stamp /= 60;
|
|
stamp /= 60;
|
|
|
stamp = Math.floor(stamp);
|
|
stamp = Math.floor(stamp);
|
|
|
|
|
+ stamp = new Date(el.createdAt);
|
|
|
dataset.data.push({
|
|
dataset.data.push({
|
|
|
x: stamp,
|
|
x: stamp,
|
|
|
y: el.players
|
|
y: el.players
|