Adjust fallenPanda's PR

* Use enum for frequency in task model
* Adjust ui of task selection
* Correct check for hasStarted
* Remove semicolons
* Set default start day to today
* Correct perfect day and resting in inn tests to have dailies with start dates of a week ago
* Add tests for dailies/weeklies functionality
This commit is contained in:
Blade Barringer
2015-05-17 21:10:40 -05:00
committed by Allen Pan
parent dd1b2a4b07
commit 664bf491d2
5 changed files with 374 additions and 15 deletions
+4 -4
View File
@@ -209,11 +209,11 @@ li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s
button(ng-class='{active: task.repeat.s}', type='button', ng-click='task.challenge.id || (task.repeat.s = !task.repeat.s)') {{::moment.weekdaysMin(6)}}
label.option-title=env.t('startDate')
p(class='input-group')
p.input-group
input(type='text' class='form-control' datepicker-popup ng-model='task._tempDateForPicker' ng-change='updateTaskStartDate(task)' is-open='task._isDatePickerOpen')
span(class='input-group-btn')
button(type="button" ng-click="openDatePicker($event, task)")
span.input-group-addon.glyphicon.glyphicon-calendar
span.input-group-btn
button.btn.btn-default(type='button' ng-click='openDatePicker($event, task)')
.glyphicon.glyphicon-calendar
// if Reward, pricing