diff --git a/migrations/20131204_classes.js b/migrations/20131204_classes.js index 4913703ba9..0e890cad88 100644 --- a/migrations/20131204_classes.js +++ b/migrations/20131204_classes.js @@ -27,5 +27,11 @@ db.users.find().forEach(function(user){ user.preferences.sleep = user.flags.rest; delete user.flags.rest; + // migrate task.priority from !, !!, !!! => 1, 1.5, 2 + _.each(user.tasks, function(task){ + var p = task.priority; + task.priority = p == '!!!' ? 2 : p == '!!' ? 1.5 : 1; + }) + db.users.update({_id:user._id}, user); }); \ No newline at end of file diff --git a/src/models/task.js b/src/models/task.js index f56c8fb63b..fc6a27bf91 100644 --- a/src/models/task.js +++ b/src/models/task.js @@ -19,7 +19,7 @@ var TaskSchema = { notes: {type: String, 'default': ''}, tags: {type: Schema.Types.Mixed, 'default': {}}, //{ "4ddf03d9-54bd-41a3-b011-ca1f1d2e9371" : true }, value: {type: Number, 'default': 0}, // redness - priority: {type: String, 'default': '!'}, //'!!' // FIXME this should be a number or something + priority: {type: Number, 'default': '1'}, challenge: { id: {type: 'String', ref:'Challenge'}, broken: String, // CHALLENGE_DELETED, TASK_DELETED, UNSUBSCRIBED, CHALLENGE_CLOSED diff --git a/views/shared/tasks/task.jade b/views/shared/tasks/task.jade index 770c643a1a..3c865586f4 100644 --- a/views/shared/tasks/task.jade +++ b/views/shared/tasks/task.jade @@ -153,9 +153,9 @@ li(bindonce='list', ng-repeat='task in obj[list.type+"s"]', class='task {{Shared i.icon-question-sign | Difficulty .task-controls.tile-group.priority-multiplier - button.task-action-btn.tile(type='button', ng-class='{active: task.priority=="!" || !task.priority}', ng-click='task.challenge.id || (task.priority="!")') Easy - button.task-action-btn.tile(type='button', ng-class='{active: task.priority=="!!"}', ng-click='task.challenge.id || (task.priority="!!")') Medium - button.task-action-btn.tile(type='button', ng-class='{active: task.priority=="!!!"}', ng-click='task.challenge.id || (task.priority="!!!")') Hard + button.task-action-btn.tile(type='button', ng-class='{active: task.priority==1 || !task.priority}', ng-click='task.challenge.id || (task.priority=1)') Easy + button.task-action-btn.tile(type='button', ng-class='{active: task.priority==1.5}', ng-click='task.challenge.id || (task.priority=1.5)') Medium + button.task-action-btn.tile(type='button', ng-class='{active: task.priority==2}', ng-click='task.challenge.id || (task.priority=2)') Hard //span(ng-if='task.type=="daily" && !task.challenge.id') br span(ng-if='task.type=="daily"')