From b213a135ebf6064b3777790bac0e29dd511d8ff9 Mon Sep 17 00:00:00 2001 From: Stefan Topfstedt Date: Thu, 7 Jul 2016 16:23:15 -0700 Subject: [PATCH 1/3] rm maxDate constraint b/c pikaday does not update correctly on date change. --- app/components/course-rollover.js | 9 --------- app/templates/components/course-rollover.hbs | 1 - 2 files changed, 10 deletions(-) diff --git a/app/components/course-rollover.js b/app/components/course-rollover.js index 527ab1931e..e4f745c78c 100644 --- a/app/components/course-rollover.js +++ b/app/components/course-rollover.js @@ -127,15 +127,6 @@ export default Component.extend(ValidationErrorDisplay, Validations, { return today.dayOfYear(1).toDate(); }), - maxDate: computed('selectedYear', function(){ - const selectedYear = this.get('selectedYear'); - let today = moment(); - if (isPresent(selectedYear)) { - today.year(selectedYear+1); - } - return today.dayOfYear(365).toDate(); - }), - /** * "disableDayFn" callback function pikaday. * @link https://github.com/dbushell/Pikaday#configuration diff --git a/app/templates/components/course-rollover.hbs b/app/templates/components/course-rollover.hbs index bbefa91bb3..beba4c85b5 100644 --- a/app/templates/components/course-rollover.hbs +++ b/app/templates/components/course-rollover.hbs @@ -51,7 +51,6 @@ {{pikaday-input size=10 value=startDate - maxDate=maxDate minDate=minDate format='YYYY-MM-DD' onSelection=(action (mut startDate)) From 87380765dfe6b5e917d3cd7b13a72e328049365b Mon Sep 17 00:00:00 2001 From: Stefan Topfstedt Date: Thu, 7 Jul 2016 16:28:09 -0700 Subject: [PATCH 2/3] set min date for course rollover date picker to be original course start date. --- app/components/course-rollover.js | 11 +---------- app/templates/components/course-rollover.hbs | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/app/components/course-rollover.js b/app/components/course-rollover.js index e4f745c78c..85745ebe25 100644 --- a/app/components/course-rollover.js +++ b/app/components/course-rollover.js @@ -117,16 +117,7 @@ export default Component.extend(ValidationErrorDisplay, Validations, { let startDate = moment().year(selectedYear).isoWeek(week).day(day).toDate(); this.setProperties({startDate}); }).restartable(), - - minDate: computed('selectedYear', function(){ - const selectedYear = this.get('selectedYear'); - let today = moment(); - if (isPresent(selectedYear)) { - today.year(selectedYear); - } - return today.dayOfYear(1).toDate(); - }), - + /** * "disableDayFn" callback function pikaday. * @link https://github.com/dbushell/Pikaday#configuration diff --git a/app/templates/components/course-rollover.hbs b/app/templates/components/course-rollover.hbs index beba4c85b5..e76ef2a5a9 100644 --- a/app/templates/components/course-rollover.hbs +++ b/app/templates/components/course-rollover.hbs @@ -51,7 +51,7 @@ {{pikaday-input size=10 value=startDate - minDate=minDate + minDate=startDate format='YYYY-MM-DD' onSelection=(action (mut startDate)) options=(hash disableDayFn=disableDayFn course=course) From 07665f8bd09fa33f865b4a6148ad5d52d2d89778 Mon Sep 17 00:00:00 2001 From: Stefan Topfstedt Date: Fri, 8 Jul 2016 13:58:21 -0700 Subject: [PATCH 3/3] corrected minDate to be the course's start date. --- app/templates/components/course-rollover.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/components/course-rollover.hbs b/app/templates/components/course-rollover.hbs index e76ef2a5a9..d007a7dcf9 100644 --- a/app/templates/components/course-rollover.hbs +++ b/app/templates/components/course-rollover.hbs @@ -51,7 +51,7 @@ {{pikaday-input size=10 value=startDate - minDate=startDate + minDate=course.startDate format='YYYY-MM-DD' onSelection=(action (mut startDate)) options=(hash disableDayFn=disableDayFn course=course)