From 7eb8e501b6b51ecaeccf3ea04b4dc24029dc05c4 Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannes.millan@gmail.com>
Date: Fri, 6 Jan 2017 22:11:18 +0100
Subject: [PATCH] fix issue when task order is not saved

---
 app/scripts/work-view/work-view-d.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/scripts/work-view/work-view-d.js b/app/scripts/work-view/work-view-d.js
index dda5b5ef35..c06dbdc04c 100644
--- a/app/scripts/work-view/work-view-d.js
+++ b/app/scripts/work-view/work-view-d.js
@@ -30,9 +30,13 @@
 
     vm.r = $rootScope.r;
 
-    //vm.tasks = $rootScope.r.tasks;
-    //vm.backlogTasks = $rootScope.r.backlogTasks;
-    //vm.currentTask = $rootScope.r.currentTask;
+    function mergeDoneAndUndone() {
+      // we need to re-merge because of splitting up the tasks into two
+      if (vm.tasksUndone && vm.tasksDone) {
+        let newTaskList = vm.tasksDone.concat(vm.tasksUndone);
+        Tasks.updateToday(newTaskList);
+      }
+    }
 
     vm.openAddTask = () => {
       Dialogs('ADD_TASK');
@@ -54,6 +58,9 @@
       }
     };
 
+    $scope.$watch('vm.tasksDone', mergeDoneAndUndone, true);
+    $scope.$watch('vm.tasksUndone', mergeDoneAndUndone, true);
+
     $scope.$watch('vm.r.tasks', () => {
       vm.tasksUndone = Tasks.getUndoneToday();
       vm.tasksDone = Tasks.getDoneToday();