Use ISO standard as the start of the week

MusikAnimal · Jan 16, 2017 · cffe744 · cffe744
1 parent efda8f5
commit cffe744
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/javascripts/shared/pv_config.js b/javascripts/shared/pv_config.js
@@ -17,11 +17,11 @@ class PvConfig {
   constructor() {
     let self = this;
     const formatXAxisTick = value => {
-      const dayOfWeek = moment(value, this.dateFormat).weekday();
-      if (dayOfWeek % 7) {
-        return value;
-      } else {
+      const dayOfWeek = moment(value, this.dateFormat).isoWeekday();
+      if (dayOfWeek === 1) {
         return `• ${value}`;
+      } else {
+        return value;
       }
     };
 
@@ -213,7 +213,7 @@ class PvConfig {
       minDate: moment('2015-07-01').startOf('day'),
       maxDate,
       specialRanges: {
-        'last-week': [moment().subtract(1, 'week').startOf('week'), moment().subtract(1, 'week').endOf('week')],
+        'last-week': [moment().subtract(1, 'isoweek').startOf('isoweek'), moment().subtract(1, 'isoweek').endOf('isoweek')],
         'this-month': [moment().startOf('month'), moment().startOf('month').isAfter(maxDate) ? moment().startOf('month') : maxDate],
         'last-month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')],
         'this-year': [moment().startOf('year'), moment().startOf('year').isAfter(maxDate) ? moment().startOf('year') : maxDate],

diff --git a/public_html/application.js b/public_html/application.js
diff --git a/public_html/langviews/application.js b/public_html/langviews/application.js
diff --git a/public_html/massviews/application.js b/public_html/massviews/application.js
diff --git a/public_html/meta/application.js b/public_html/meta/application.js
diff --git a/public_html/redirectviews/application.js b/public_html/redirectviews/application.js
diff --git a/public_html/siteviews/application.js b/public_html/siteviews/application.js
diff --git a/public_html/topviews/application.js b/public_html/topviews/application.js