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

Closes #3884

Browse Source 
Added toggles to change graph to monthly view vs regular
single-day view.

Also fixed issue where labels were out of date as the graph
data changed.
This commit is contained in:
Julian Lam
2015-11-25 14:22:32 -05:00
parent 9f48d3e6d2
commit 9c1b067445
3 changed files with 90 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/socket.io/admin.js
View File

@@ -206,17 +206,29 @@ SocketAdmin.email.test = function(socket, data, callback) {
};
SocketAdmin.analytics.get = function(socket, data, callback) {
data.units = 'hours'; // temp
data.amount = 24;
// Default returns views from past 24 hours, by hour
if (data.units === 'days') {
data.amount = 30;
} else {
data.amount = 24;
}
if (data && data.graph && data.units && data.amount) {
if (data.graph === 'traffic') {
async.parallel({
uniqueVisitors: function(next) {
getHourlyStatsForSet('analytics:uniquevisitors', data.amount, next);
if (data.units === 'days') {
getDailyStatsForSet('analytics:uniquevisitors', Date.now(), data.amount, next);
} else {
getHourlyStatsForSet('analytics:uniquevisitors', Date.now(), data.amount, next);
}
},
pageviews: function(next) {
getHourlyStatsForSet('analytics:pageviews', data.amount, next);
if (data.units === 'days') {
getDailyStatsForSet('analytics:pageviews', Date.now(), data.amount, next);
} else {
getHourlyStatsForSet('analytics:pageviews', Date.now(), data.amount, next);
}
},
monthlyPageViews: function(next) {
analytics.getMonthlyPageViews(next);
@@ -240,14 +252,14 @@ SocketAdmin.logs.clear = function(socket, data, callback) {
meta.logs.clear(callback);
};
function getHourlyStatsForSet(set, hours, callback) {
var hour = new Date(),
terms = {},
function getHourlyStatsForSet(set, hour, numHours, callback) {
var terms = {},
hoursArr = [];
hour = new Date(hour);
hour.setHours(hour.getHours(), 0, 0, 0);
for (var i = 0, ii = hours; i < ii; i++) {
for (var i = 0, ii = numHours; i < ii; i++) {
hoursArr.push(hour.getTime());
hour.setHours(hour.getHours() - 1, 0, 0, 0);
}
@@ -272,6 +284,30 @@ function getHourlyStatsForSet(set, hours, callback) {
});
}
function getDailyStatsForSet(set, day, numDays, callback) {
var daysArr = [];
day = new Date(day);
day.setHours(0, 0, 0, 0);
async.whilst(function() {
return numDays--;
}, function(next) {
getHourlyStatsForSet(set, day.getTime()-(1000*60*60*24*numDays), 24, function(err, day) {
if (err) {
return next(err);
}
daysArr.push(day.reduce(function(cur, next) {
return cur+next;
}));
next();
});
}, function(err) {
callback(err, daysArr);
});
};
SocketAdmin.getMoreEvents = function(socket, next, callback) {
var start = parseInt(next, 10);
if (start < 0) {