hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes #5606

Browse Source
v1.18.x
Julian Lam 8 years ago
parent 51a85031f7
commit 816809ce3c
5 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File

4
public/language/en-GB/admin/general/dashboard.json
Unescape Escape View File

@ -5,8 +5,8 @@
"users": "Users", "users": "Users",
"posts": "Posts", "posts": "Posts",
"topics": "Topics", "topics": "Topics",
"page-views-last-month": "Last Month", "page-views-seven": "Last 7 Days",
"page-views-this-month": "This Month", "page-views-thirty": "Last 30 Days",
"page-views-last-day": "Last 24 hours", "page-views-last-day": "Last 24 hours",
"page-views-custom": "Custom Date Range", "page-views-custom": "Custom Date Range",
"page-views-custom-start": "Range Start", "page-views-custom-start": "Range Start",

21
public/src/admin/general/dashboard.js
Unescape Escape View File

@ -295,14 +295,11 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
adjustPieCharts(); adjustPieCharts();
$('[data-action="updateGraph"]:not([data-units="custom"])').on('click', function () { $('[data-action="updateGraph"]:not([data-units="custom"])').on('click', function () {
var until; var until = new Date();
switch ($(this).attr('data-until')) { var amount = $(this).attr('data-amount');
case 'last-month': until.setHours(0, 0, 0, 0);
var lastMonth = new Date(); until = until.getTime();
lastMonth.setDate(lastMonth.getDate() - 30); updateTrafficGraph($(this).attr('data-units'), until, amount);
until = lastMonth.getTime();
}
updateTrafficGraph($(this).attr('data-units'), until);
$('[data-action="updateGraph"]').removeClass('active'); $('[data-action="updateGraph"]').removeClass('active');
$(this).addClass('active'); $(this).addClass('active');
@ -406,11 +403,11 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
} else { } else {
graphs.traffic.data.xLabels = utils.getHoursArray(); graphs.traffic.data.xLabels = utils.getHoursArray();
$('#pageViewsThisMonth').html(data.monthlyPageViews.thisMonth); $('#pageViewsThirty').html(data.summary.thirty);
$('#pageViewsLastMonth').html(data.monthlyPageViews.lastMonth); $('#pageViewsSeven').html(data.summary.seven);
$('#pageViewsPastDay').html(data.pastDay); $('#pageViewsPastDay').html(data.pastDay);
utils.addCommasToNumbers($('#pageViewsThisMonth')); utils.addCommasToNumbers($('#pageViewsThirty'));
utils.addCommasToNumbers($('#pageViewsLastMonth')); utils.addCommasToNumbers($('#pageViewsSeven'));
utils.addCommasToNumbers($('#pageViewsPastDay')); utils.addCommasToNumbers($('#pageViewsPastDay'));
} }

25
src/analytics.js
Unescape Escape View File

@ -168,21 +168,18 @@ Analytics.getUnwrittenPageviews = function () {
return pageViews; return pageViews;
}; };
Analytics.getMonthlyPageViews = function (callback) { Analytics.getSummary = function (callback) {
var thisMonth = new Date(); var today = new Date();
var lastMonth = new Date(); today.setHours(0, 0, 0, 0);
thisMonth.setMonth(thisMonth.getMonth(), 1);
thisMonth.setHours(0, 0, 0, 0);
lastMonth.setMonth(thisMonth.getMonth() - 1, 1);
lastMonth.setHours(0, 0, 0, 0);
var values = [thisMonth.getTime(), lastMonth.getTime()];
db.sortedSetScores('analytics:pageviews:month', values, function (err, scores) { async.parallel({
if (err) { seven: async.apply(Analytics.getDailyStatsForSet, 'analytics:pageviews', today, 7),
return callback(err); thirty: async.apply(Analytics.getDailyStatsForSet, 'analytics:pageviews', today, 30),
} }, function (err, scores) {
callback(null, { thisMonth: scores[0] || 0, lastMonth: scores[1] || 0 }); callback(null, {
seven: scores.seven.reduce(function (sum, cur) { return sum += cur; }, 0),
thirty: scores.thirty.reduce(function (sum, cur) { return sum += cur; }, 0),
});
}); });
}; };

4
src/socket.io/admin.js
Unescape Escape View File

@ -235,8 +235,8 @@ SocketAdmin.analytics.get = function (socket, data, callback) {
analytics.getHourlyStatsForSet('analytics:pageviews', data.until || Date.now(), data.amount, next); analytics.getHourlyStatsForSet('analytics:pageviews', data.until || Date.now(), data.amount, next);
} }
}, },
monthlyPageViews: function (next) { summary: function (next) {
analytics.getMonthlyPageViews(next); analytics.getSummary(next);
}, },
}, function (err, data) { }, function (err, data) {
data.pastDay = data.pageviews.reduce(function (a, b) { return parseInt(a, 10) + parseInt(b, 10); }); data.pastDay = data.pageviews.reduce(function (a, b) { return parseInt(a, 10) + parseInt(b, 10); });

8
src/views/admin/general/dashboard.tpl
Unescape Escape View File

@ -13,12 +13,12 @@
<hr/> <hr/>
<div class="row"> <div class="row">
<div class="col-sm-3 hidden-xs text-center pageview-stats"> <div class="col-sm-3 hidden-xs text-center pageview-stats">
<div><strong id="pageViewsLastMonth">0</strong></div> <div><strong id="pageViewsThirty">0</strong></div>
<div><a href="#" class="updatePageviewsGraph" data-action="updateGraph" data-units="days" data-until="last-month">[[admin/general/dashboard:page-views-last-month]]</a></div> <div><a href="#" class="updatePageviewsGraph" data-action="updateGraph" data-units="days" data-amount="30">[[admin/general/dashboard:page-views-thirty]]</a></div>
</div> </div>
<div class="col-sm-3 text-center pageview-stats"> <div class="col-sm-3 text-center pageview-stats">
<div><strong id="pageViewsThisMonth">0</strong></div> <div><strong id="pageViewsSeven">0</strong></div>
<div><a href="#" class="updatePageviewsGraph" data-action="updateGraph" data-units="days">[[admin/general/dashboard:page-views-this-month]]</a></div> <div><a href="#" class="updatePageviewsGraph" data-action="updateGraph" data-units="days" data-amount="7">[[admin/general/dashboard:page-views-seven]]</a></div>
</div> </div>
<div class="col-sm-3 hidden-xs text-center pageview-stats"> <div class="col-sm-3 hidden-xs text-center pageview-stats">
<div><strong id="pageViewsPastDay">0</strong></div> <div><strong id="pageViewsPastDay">0</strong></div>

Write Preview
Loading…
Cancel
Save