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

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.
2020-10-05 10:32:12 +02:00
parent 4b5358bb42
commit 702f7a5a67
4 changed files with 18 additions and 10 deletions
@@ -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()
@@ -10,7 +10,11 @@
              {{i18n "admin.dashboard.community_health"}}
            </a>
          </h2>
-          {{period-chooser period=period action=(action "changePeriod") content=availablePeriods fullDay=true}}
+          {{period-chooser
+            period=period
+            action=(action "changePeriod")
+            content=availablePeriods
+            fullDay=false}}
        </div>

        <div class="section-body">
@@ -13,7 +13,7 @@
          period=period
          action=(action "changePeriod")
          content=availablePeriods
-          fullDay=true}}
+          fullDay=false}}
      </div>

      <div class="section-body">