Fix alphasights#128;

When having `startFromDate` and `startingDate` set, clicking on 'THIS WEEK' button should keep the same first weekday
rafaelbnp · Jul 14, 2017 · 2c4b64e · 2c4b64e
1 parent 3ec0cd1
commit 2c4b64e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/addon/models/calendar.js b/addon/models/calendar.js
@@ -15,7 +15,7 @@ export default Ember.Object.extend({
   occurrencePreview: null,
 
   isInCurrentWeek: Ember.computed('week', '_currentWeek', function() {
-    return this.get('week').isSame(this.get('_currentWeek'));
+    return this.get('week').isSame(this.get('_currentWeek'), 'week');
   }),
 
   timeSlots: Ember.computed(
@@ -71,6 +71,14 @@ export default Ember.Object.extend({
   },
 
   goToCurrentWeek: function() {
-    this.set('startingTime', moment());
+    const startingDate = this.get('startingDate');
+    const startFromDate = this.get('startFromDate');
+    let startingTime = moment();
+
+    if (startFromDate && startingDate) {
+      startingTime = moment().day(startingDate.day());
+    }
+
+    this.set('startingTime', startingTime);
   }
 });
diff --git a/addon/models/component-calendar.js b/addon/models/component-calendar.js
@@ -8,7 +8,8 @@ export default Calendar.extend({
   component: null,
   timeZone: Ember.computed.oneWay('component.timeZone'),
   startFromDate: Ember.computed.readOnly('component.startFromDate'),
-  startingTime: computedMoment('component.startingDate'),
+  startingDate: computedMoment('component.startingDate'),
+  startingTime: Ember.computed.reads('startingDate'),
   dayStartingTime: computedDuration('component.dayStartingTime'),
   dayEndingTime: computedDuration('component.dayEndingTime'),
   timeSlotDuration: computedDuration('component.timeSlotDuration'),