work

Author: thomaswoehlke

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

@@ -86,6 +86,7 @@ public final String projectTaskAddGet(
         model.addAttribute("userSession", userSession);
         model.addAttribute("taskstateType",PROJECTS.getType());
         model.addAttribute("dataPage", true);
+        model.addAttribute("addProjectToTask", false);
         return "project/id/task/add";
     }
 
@@ -101,6 +102,7 @@ public final String projectTaskAddPost(
         UserAccount userAccount = context.getUserAccount();
         model.addAttribute("taskstateType",PROJECTS.getType());
         model.addAttribute("dataPage", true);
+        model.addAttribute("addProjectToTask", false);
         if (result.hasErrors()) {
             for (ObjectError e : result.getAllErrors()) {
                 log.info(e.toString());

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

@@ -165,6 +165,7 @@ public final String projectRootTaskAddPost(
         log.info("/project/root/task/add (POST)");
         Context context = super.getContext(userSession);
         model.addAttribute("dataPage", true);
+        model.addAttribute("addProjectToTask", false);
         model.addAttribute("taskstateType",PROJECTS.getType());
         if (result.hasErrors()) {
             for (ObjectError e : result.getAllErrors()) {
@@ -214,6 +215,7 @@ public final String editTaskGet(
         model.addAttribute("userSession", userSession);
         model.addAttribute("taskstateType",PROJECTS.getType());
         model.addAttribute("dataPage", true);
+        model.addAttribute("addProjectToTask", true);
         return "project/root/task/edit";
     }
 
@@ -229,6 +231,7 @@ public final String editTaskPost(
         log.info("editTaskPost");
         model.addAttribute("taskstateType",PROJECTS.getType());
         model.addAttribute("dataPage", true);
+        model.addAttribute("addProjectToTask", true);
         if(task.getTaskState()==TaskState.SCHEDULED && task.getDueDate()==null){
             String objectName="task";
             String field="dueDate";

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

@@ -78,6 +78,7 @@ public final String addNewTaskToInboxGet(
         model.addAttribute("task", task);
         model.addAttribute("userSession", userSession);
         model.addAttribute("dataPage", true);
+        model.addAttribute("addProjectToTask", false);
         return "taskstate/task/add";
     }
 
@@ -122,7 +123,7 @@ public final String editTaskGet(
         UserAccount userAccount = userAccountLoginSuccessService.retrieveCurrentUser();
         List<Context> contexts = contextService.getAllForUser(userAccount);
         Project thisProject;
-        if (task.getContext() == null) {
+        if (task.getProject() == null) {
             thisProject = new Project();
             thisProject.setId(0L);
         } else {
@@ -137,6 +138,7 @@ public final String editTaskGet(
         model.addAttribute("contexts", contexts);
         model.addAttribute("userSession", userSession);
         model.addAttribute("dataPage", true);
+        model.addAttribute("addProjectToTask", true);
         return "taskstate/task/edit";
     }
 
@@ -186,6 +188,7 @@ public final String editTaskPost(
             model.addAttribute("task", task);
             model.addAttribute("contexts", contexts);
             model.addAttribute("userSession", userSession);
+            model.addAttribute("addProjectToTask", true);
             return "taskstate/task/edit";
         } else {
             task.unsetFocus();

src/main/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceImpl.java

@@ -9,24 +9,25 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.woehlke.java.simpleworklist.domain.context.Context;
 import org.woehlke.java.simpleworklist.domain.project.Project;
+import org.woehlke.java.simpleworklist.domain.project.ProjectRepository;
 import org.woehlke.java.simpleworklist.domain.taskworkflow.TaskState;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 @Slf4j
 @Service
 public class TaskServiceImpl implements TaskService {
 
     private final TaskRepository taskRepository;
 
+    private final ProjectRepository projectRepository;
+
     @Autowired
-    public TaskServiceImpl(TaskRepository taskRepository ) {
+    public TaskServiceImpl(TaskRepository taskRepository, ProjectRepository projectRepository) {
         this.taskRepository = taskRepository;
+      this.projectRepository = projectRepository;
     }
 
     @Override
@@ -89,6 +90,16 @@ public Task findOne(@Min(1L) long taskId) {
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task updatedViaTaskstate(@NotNull Task task) {
         log.info("updatedViaTaskstate");
+        if(task.getProject() != null){
+          Long projectId = task.getProject().getId();
+          Project project = projectRepository.getReferenceById(projectId);
+          task.setProject(project);
+        }
+        if(task.getLastProject()!=null){
+          Long projectId = task.getLastProject().getId();
+          Project project = projectRepository.getReferenceById(projectId);
+          task.setLastProject(project);
+        }
         task = taskRepository.saveAndFlush(task);
         log.info("persisted: " + task.outTaskstate());
         return task;
@@ -120,6 +131,7 @@ public Task addToInbox(@NotNull Task task) {
         task.setRootProject();
         task.unsetFocus();
         task.setTaskState(TaskState.INBOX);
+        task.setLastProject(null);
         long maxOrderIdProject = this.getMaxOrderIdProjectRoot(task.getContext());
         task.setOrderIdProject(++maxOrderIdProject);
         long maxOrderIdTaskState = this.getMaxOrderIdTaskState(task.getTaskState(),task.getContext());

src/main/resources/templates/layout/task.html

@@ -106,7 +106,7 @@
         <div th:each="err : ${#fields.errors('taskEnergy')}">
           <div class="invalid-feedback" th:text="${err}">err</div>
         </div>
-      </div>&nbsp;
+      </div>nbsp;
     </div>
 
     <div class="col-md">
@@ -129,9 +129,9 @@
         </div>
       </div>
     </div>
-
   </div>
-  <div class="row my-2">
+
+  <div class="row my-2" th:if="${addProjectToTask}">
     <div class="col-md">
       <label th:for="${#ids.next('project.id')}" class="control-label">
         <span th:utext="#{task.show.project}">Project</span>
@@ -141,7 +141,8 @@
             <i class="fa-solid fa-cloud"></i>
           </span>
           <select th:field="*{project.id}" class="form-control form-control-lg" aria-describedby="basic-addon7">
-            <option th:each="projectOption : ${rootProjects}"
+            <option value="0"></option>
+            <option th:each="projectOption : ${allProjects}"
                     th:value="${projectOption.id}"
                     th:text="${projectOption.name}">Project
             </option>