Fixed #129, Fixed #126, working on 168

Author: thomaswoehlke

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

@@ -136,7 +136,9 @@ public final String addNewTaskToRootProjectGet(
     public final String addNewTaskToRootProjectPost(
         @ModelAttribute("userSession") UserSessionBean userSession,
         @Valid Task task,
-        BindingResult result, Locale locale, Model model
+        BindingResult result,
+        Locale locale,
+        Model model
     ) {
         log.info("/project/root/add/task (POST)");
         Context context = super.getContext(userSession);
@@ -152,15 +154,17 @@ public final String addNewTaskToRootProjectPost(
             model.addAttribute("task", task);
             return "project/root/add/task";
         } else {
-            task.setProject(null);
+            task.setRootProject();
+            /*
             if(task.getDueDate()==null){
                 task.setTaskState(TaskState.INBOX);
             } else {
                 task.setTaskState(TaskState.SCHEDULED);
             }
-            task.setFocus(false);
+            */
+            task.unsetFocus();
             task.setContext(context);
-            long maxOrderIdProject = taskMoveService.getMaxOrderIdProject(task.getProject(),context);
+            long maxOrderIdProject = taskMoveService.getMaxOrderIdRootProject(context);
             task.setOrderIdProject(++maxOrderIdProject);
             long maxOrderIdTaskState = taskMoveService.getMaxOrderIdTaskState(task.getTaskState(),task.getContext());
             task.setOrderIdTaskState(++maxOrderIdTaskState);

src/main/java/org/woehlke/simpleworklist/taskstate/TaskMoveServiceImpl.java

@@ -118,6 +118,7 @@ public Task addToProject(Task task) {
     public Task addToRootProject(Task task) {
         log.info("addToRootProject");
         task.setUuid(UUID.randomUUID().toString());
+        task.unsetFocus();
         task = taskRepository.saveAndFlush(task);
         log.info("persisted: " + task.getId());
         return task;
@@ -487,21 +488,24 @@ private void moveTasksDownByProject( Task sourceTask, Task destinationTask ) {
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
     public Task addToInbox(Task task) {
+        log.info("addToInbox");
         task.setUuid(UUID.randomUUID().toString());
         task.setRootProject();
+        task.unsetFocus();
+        task.setTaskState(TaskState.INBOX);
+        /*
         if(task.getDueDate()==null){
             task.setTaskState(TaskState.INBOX);
         } else {
             task.setTaskState(TaskState.SCHEDULED);
         }
+        */
         //task.setFocus(false);
         //task.setContext(context);
         long maxOrderIdProject = this.getMaxOrderIdRootProject(task.getContext());
         task.setOrderIdProject(++maxOrderIdProject);
         long maxOrderIdTaskState = this.getMaxOrderIdTaskState(task.getTaskState(),task.getContext());
         task.setOrderIdTaskState(++maxOrderIdTaskState);
-
-        log.info("addToRootProject");
         task = taskRepository.saveAndFlush(task);
         log.info("persisted: " + task.getId());
         return task;

src/main/resources/templates/taskstate/task/edit.html

@@ -21,6 +21,7 @@ <h1>
 	<div>
 		<form id="formId" th:action="@{/taskstate/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}" method="post">
 			<input type="hidden" th:field="*{id}" />
+            <input type="hidden" th:field="*{uuid}" />
 			<input type="hidden" th:field="*{rowCreatedAt.time}" />
 			<div class="form-group">
 				<label th:for="${#ids.next('title')}" class="control-label">