From 4e1ce2a77f60cc678d692e67a9ddec539fb50a5b Mon Sep 17 00:00:00 2001 From: Johannes Millan Date: Fri, 10 Feb 2017 00:03:16 +0100 Subject: [PATCH] add configurable mov to backlog and move to today keyboard shortcuts #2 --- app-src/scripts/constants.js | 2 ++ app-src/scripts/main/global-services/tasks-s.js | 16 ++++++++++++++++ .../keyboard-settings/keyboard-settings-d.html | 12 ++++++++++++ app-src/scripts/task-list/task-list-d.js | 6 ++++++ 4 files changed, 36 insertions(+) diff --git a/app-src/scripts/constants.js b/app-src/scripts/constants.js index ac17b00c9e..28c570f851 100644 --- a/app-src/scripts/constants.js +++ b/app-src/scripts/constants.js @@ -47,6 +47,8 @@ taskDelete: 'Delete', selectPreviousTask: 'k', selectNextTask: 'j', + moveToBacklog: '', + moveToTodaysTasks: '' }, config: { isTakeABreakEnabled: false, diff --git a/app-src/scripts/main/global-services/tasks-s.js b/app-src/scripts/main/global-services/tasks-s.js index 4c7128eb4b..878fada7be 100644 --- a/app-src/scripts/main/global-services/tasks-s.js +++ b/app-src/scripts/main/global-services/tasks-s.js @@ -496,6 +496,22 @@ } } + moveTask(task, fromArray, toArray) { + const index = _.findIndex(fromArray, ['id', task.id]); + if (index >= 0) { + fromArray.splice(index, 1); + toArray.unshift(task); + } + } + + moveTaskFromBackLogToToday(task) { + this.moveTask(task, this.$localStorage.backlogTasks, this.$localStorage.tasks); + } + + moveTaskFromTodayToBackLog(task) { + this.moveTask(task, this.$localStorage.tasks, this.$localStorage.backlogTasks); + } + addTasksToTopOfBacklog(tasks) { this.$localStorage.backlogTasks = tasks.concat(this.$localStorage.backlogTasks); } diff --git a/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.html b/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.html index 1e5378487c..cbfd189183 100644 --- a/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.html +++ b/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.html @@ -89,4 +89,16 @@ keyboard-key-input ng-model="vm.keys.selectPreviousTask"> + + + + + + + + \ No newline at end of file diff --git a/app-src/scripts/task-list/task-list-d.js b/app-src/scripts/task-list/task-list-d.js index 58d6f7305f..915bdb082b 100644 --- a/app-src/scripts/task-list/task-list-d.js +++ b/app-src/scripts/task-list/task-list-d.js @@ -229,6 +229,12 @@ if ($event.key === this.$localStorage.keys.taskAddSubTask) { this.addSubTask(task); } + if ($event.key === this.$localStorage.keys.moveToBacklog) { + this.Tasks.moveTaskFromTodayToBackLog(task); + } + if ($event.key === this.$localStorage.keys.moveToTodaysTasks) { + this.Tasks.moveTaskFromBackLogToToday(task); + } if ($event.key === this.$localStorage.keys.taskDelete) { this.deleteTask(task);