bugfix

Author: thomaswoehlke

src/main/java/org/woehlke/java/simpleworklist/domain/TaskMoveController.java

@@ -107,6 +107,19 @@ public final String moveTaskToWaiting(
     return task.getTaskState().getUrlPathRedirect();
   }
 
+    @RequestMapping(path = "/{taskId}/move/to/taskstate/scheduled", method = RequestMethod.GET)
+    public final String moveTaskToScheduled(
+        @NotNull @PathVariable("taskId") Task task,
+        @NotNull @ModelAttribute("userSession") UserSessionBean userSession,
+        Model model
+    ) {
+        log.info("dragged and dropped "+task.getId()+" to scheduled");
+        task = taskMoveService.moveTaskToScheduled(task);
+        model.addAttribute("userSession", userSession);
+        model.addAttribute("dataPage", true);
+        return task.getTaskState().getUrlPathRedirect();
+    }
+
   @RequestMapping(path = "/{taskId}/move/to/taskstate/someday", method = RequestMethod.GET)
   public final String moveTaskToSomeday(
     @NotNull @PathVariable("taskId") Task task,

src/main/java/org/woehlke/java/simpleworklist/domain/db/data/Task.java

@@ -305,33 +305,24 @@ private void pushProject(Project newProject){
         this.project = newProject;
     }
 
-    //TODO: delete Due Date
     public void moveToInbox(){
         pushTaskstate(TaskState.INBOX);
     }
 
-    //TODO: Due Date = Date of Today
-    public void moveToToday(){
-        pushTaskstate(TaskState.TODAY);
-        this.dueDate = new Date();
-    }
+    public void moveToToday(){ pushTaskstate(TaskState.TODAY); }
 
-    //TODO: delete Due Date
     public void moveToNext(){
         pushTaskstate(TaskState.NEXT);
     }
 
-    //TODO: delete Due Date
     public void moveToWaiting(){
         pushTaskstate(TaskState.WAITING);
     }
 
-    //TODO: Due Date = Date of Tomorrow
     public void moveToScheduled(){
         pushTaskstate(TaskState.SCHEDULED);
     }
 
-    //TODO: delete Due Date
     public void moveToSomeday(){
         pushTaskstate(TaskState.SOMEDAY);
     }

src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskMoveService.java

@@ -18,6 +18,8 @@ public interface TaskMoveService {
 
   Task moveTaskToWaiting(Task task);
 
+  Task moveTaskToScheduled(Task task);
+
   Task moveTaskToSomeday(Task task);
 
   Task moveTaskToFocus(Task task);

src/main/java/org/woehlke/java/simpleworklist/domain/meso/task/TaskMoveServiceImpl.java

@@ -90,6 +90,16 @@ public Task moveTaskToWaiting(Task task) {
     return task;
   }
 
+    @Override
+    public Task moveTaskToScheduled(Task task) {
+        long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.SCHEDULED,task.getContext());
+        task.moveToScheduled();
+        task.setOrderIdTaskState(++newOrderIdTaskState);
+        task = taskService.saveAndFlush(task);
+        log.info("moved to scheduled: " + task.outTaskstate());
+        return task;
+    }
+
   @Override
   public Task moveTaskToSomeday(Task task) {
     long newOrderIdTaskState = taskLifecycleService.getMaxOrderIdTaskState(TaskState.SOMEDAY,task.getContext());