Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-04 21:15:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some labelling issues and added support for last month

Browse Source
This commit is contained in:
Julian Lam
2015-11-25 14:48:32 -05:00
parent 7f9ac3f1fe
commit 6d386dd2ee
3 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
public/src/admin/general/dashboard.js
View File

@@ -12,7 +12,10 @@ define('admin/general/dashboard', ['semver'], function(semver) {
rooms: {},
traffic: {}
},
currentGraph = 'hours';
currentGraph = {
units: 'hours',
until: undefined
};
var DEFAULTS = {
roomInterval: 10000,
@@ -157,8 +160,8 @@ define('admin/general/dashboard', ['semver'], function(semver) {
return labels.reverse();
}
function getDaysArray() {
var currentDay = new Date().getTime(),
function getDaysArray(from) {
var currentDay = new Date(from || Date.now()).getTime(),
months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
labels = [],
tmpDate;
@@ -280,8 +283,15 @@ define('admin/general/dashboard', ['semver'], function(semver) {
adjustPieCharts();
$('[data-action="updateGraph"]').on('click', function() {
updateTrafficGraph($(this).attr('data-units'));
})
var until = undefined;
switch($(this).attr('data-until')) {
case 'last-month':
var lastMonth = new Date();
lastMonth.setDate(lastMonth.getDate()-30);
until = lastMonth.getTime();
}
updateTrafficGraph($(this).attr('data-units'), until);
});
}
function adjustPieCharts() {
@@ -296,20 +306,20 @@ define('admin/general/dashboard', ['semver'], function(semver) {
});
}
function updateTrafficGraph(units) {
function updateTrafficGraph(units, until) {
if (!app.isFocused) {
return;
}
units = units || currentGraph;
socket.emit('admin.analytics.get', {
graph: 'traffic',
units: units
units: units || 'hours',
until: until
}, function (err, data) {
if (JSON.stringify(graphData.traffic) === JSON.stringify(data)) {
return;
}
console.log(data);
graphData.traffic = data;
@@ -319,7 +329,7 @@ define('admin/general/dashboard', ['semver'], function(semver) {
}
if (units === 'days') {
graphs.traffic.scale.xLabels = getDaysArray();
graphs.traffic.scale.xLabels = getDaysArray(until);
} else {
graphs.traffic.scale.xLabels = getHoursArray();
}
@@ -337,7 +347,8 @@ define('admin/general/dashboard', ['semver'], function(semver) {
}
graphs.traffic.update();
currentGraph = units;
currentGraph.units = units;
currentGraph.until = until;
$('#pageViewsThisMonth').html(data.monthlyPageViews.thisMonth);
$('#pageViewsLastMonth').html(data.monthlyPageViews.lastMonth);
@@ -483,7 +494,9 @@ define('admin/general/dashboard', ['semver'], function(semver) {
}
}, realtime ? DEFAULTS.realtimeInterval : DEFAULTS.roomInterval);
intervals.graphs = setInterval(updateTrafficGraph, realtime ? DEFAULTS.realtimeInterval : DEFAULTS.graphInterval);
intervals.graphs = setInterval(function() {
updateTrafficGraph(currentGraph.units, currentGraph.until);
}, realtime ? DEFAULTS.realtimeInterval : DEFAULTS.graphInterval);
}
return Admin;