work in progress

Author: thomaswoehlke

etc/TODO.md

@@ -98,3 +98,14 @@ https://github.com/thymeleaf/thymeleaf-testing
 
 # 2.3.16 
 Fixed #169, Fixed #170, Fixed #171, Fixed #172, Fixed #183 
+
+
+# 2.3.17
+#226 
+#227
+#228
+#229
+#230
+#231
+#232
+#233 

src/main/java/org/woehlke/simpleworklist/project/ProjectController.java

@@ -35,11 +35,13 @@ public class ProjectController extends AbstractController {
 
     private final ProjectControllerService projectControllerService;
     private final TaskService taskService;
+    private final TaskStateControllerService taskStateControllerService;
 
     @Autowired
-    public ProjectController(ProjectControllerService projectControllerService, TaskService taskService) {
+    public ProjectController(ProjectControllerService projectControllerService, TaskService taskService, TaskStateControllerService taskStateControllerService) {
         this.projectControllerService = projectControllerService;
         this.taskService = taskService;
+        this.taskStateControllerService = taskStateControllerService;
     }
 
     @RequestMapping(path = "/task/add", method = RequestMethod.GET)
@@ -601,4 +603,16 @@ public final String moveTaskToTrash(
         return thisProject.getUrl();
     }
 
+    @RequestMapping(path = "/task/{taskId}/transform", method = RequestMethod.GET)
+    public final String transformTaskIntoProjectGet(
+        @PathVariable("projectId") Project thisProject,
+        @PathVariable("taskId") Task task,
+        @ModelAttribute("userSession") UserSessionBean userSession
+    ) {
+        log.info("transformTaskIntoProjectGet");
+        userSession.setLastProjectId(thisProject.getId());
+        userSession.setLastTaskState(task.getTaskState());
+        userSession.setLastTaskId(task.getId());
+        return taskStateControllerService.transformTaskIntoProjectGet(task);
+    }
 }

src/main/java/org/woehlke/simpleworklist/project/ProjectControllerRoot.java

@@ -35,11 +35,13 @@ public class ProjectControllerRoot extends AbstractController {
 
     private final ProjectControllerService projectControllerService;
     private final TaskService taskService;
+    private final TaskStateControllerService taskStateControllerService;
 
     @Autowired
-    public ProjectControllerRoot(ProjectControllerService projectControllerService, TaskService taskService) {
+    public ProjectControllerRoot(ProjectControllerService projectControllerService, TaskService taskService, TaskStateControllerService taskStateControllerService) {
         this.projectControllerService = projectControllerService;
         this.taskService = taskService;
+        this.taskStateControllerService = taskStateControllerService;
     }
 
     @RequestMapping(path="", method = RequestMethod.GET)
@@ -479,11 +481,10 @@ public final String transformTaskIntoProjectGet(
         @ModelAttribute("userSession") UserSessionBean userSession
     ) {
         log.info("transformTaskIntoProjectGet");
-        //return transformTaskIntoProjectGet(task);
         userSession.setLastProjectId(rootProjectId);
         userSession.setLastTaskState(task.getTaskState());
         userSession.setLastTaskId(task.getId());
-        return rootProjectUrl;
+        return taskStateControllerService.transformTaskIntoProjectGet(task);
     }
 
     @RequestMapping(path = "/task/{taskId}/complete", method = RequestMethod.GET)