IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: makes dashboard periods use current day and weekly 7 days (#10817)

Browse Source 
Prior to this fix, weekly could be 8 days and we could have differences between period chooser text and actual results in the chart.

A good followup to this PR would be to add custom date ranges in period-chooser component.
This commit is contained in:
Joffrey JAFFEUX
2020-10-05 10:32:12 +02:00
committed by GitHub
parent 4b5358bb42
commit 702f7a5a67
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/addon/mixins/period-computation.js
View File

@@ -14,7 +14,7 @@ export default Mixin.create({
@discourseComputed("period")
startDate(period) {
let fullDay = moment().locale("en").utc().subtract(1, "day");
let fullDay = moment().locale("en").utc().endOf("day");
switch (period) {
case "yearly":
@@ -24,7 +24,7 @@ export default Mixin.create({
return fullDay.subtract(3, "month").startOf("day");
break;
case "weekly":
return fullDay.subtract(1, "week").startOf("day");
return fullDay.subtract(6, "days").startOf("day");
break;
case "monthly":
return fullDay.subtract(1, "month").startOf("day");
@@ -46,7 +46,7 @@ export default Mixin.create({
@discourseComputed()
endDate() {
return moment().locale("en").utc().subtract(1, "day").endOf("day");
return moment().locale("en").utc().endOf("day");
},
@discourseComputed()