work

Author: thomaswoehlke

src/main/resources/messages_de.properties

@@ -243,6 +243,7 @@ user.selfservice.contexts.edit.button=Kontext speichern
 user.selfservice.context.default=Setze voreingestellten Kontext
 user.selfservice.context.default.button=Voreingestellten Kontext speichern
 task.show.context=Kontext ändern
+task.show.project=Projekt ändern
 project.edit.context=Kontext
 tasks.all.h1=Alle Aufgaben
 tasks.all.noTasks=Sie haben keine Aufgaben

src/main/resources/messages_en.properties

@@ -241,6 +241,7 @@ user.selfservice.contexts.edit.button=Save Context
 user.selfservice.context.default=Set Default Context
 user.selfservice.context.default.button=Save Default Context
 task.show.context=change Context
+task.show.project=change Project
 project.edit.context=Context
 tasks.all.h1=All Tasks
 tasks.all.noTasks=You have no Tasks at all

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

@@ -66,6 +66,7 @@
           <th:block th:replace="${twcontent}" />
         </div>
 		</div>
+    </div>
 	</section>
 
 	<!-- Footer -->

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

@@ -16,11 +16,9 @@
         <span th:utext="#{task.show.title}">Title</span>
       </label>
       <div class="form-group input-group is-invalid">
-
         <span class="input-group-text is-invalid" id="basic-addon1">
           <i class="fa-solid fa-at"></i>
         </span>
-
         <input type="text" th:field="*{title}" class="form-control form-control-lg is-invalid" aria-describedby="basic-addon1" required/>
         <div th:each="err : ${#fields.errors('title')}">
           <div class="invalid-feedback" th:text="${err}">err</div>
@@ -35,19 +33,16 @@
         <span th:utext="#{tasks.col.taskState}">taskState</span>
       </label>
       <div class="form-group input-group is-invalid">
-
         <span class="input-group-text is-invalid" id="basic-addon2">
           <i class="fa-solid fa-person-digging"></i>
         </span>
-
         <select th:field="*{taskState}" class="form-control form-control-lg is-invalid" aria-describedby="basic-addon2" required>
           <option th:each="taskStateItem : ${listTaskState}"
                   th:value="${taskStateItem.value}"
                   th:text="${#messages.msgOrNull(taskStateItem.code)}">
             taskStateItem
           </option>
         </select>
-
         <div th:each="err : ${#fields.errors('taskState')}">
           <div class="invalid-feedback" th:text="${err}">err</div>
         </div>
@@ -59,11 +54,9 @@
         <span th:utext="#{task.show.dueDate}">dueDate</span>
       </label>
       <div class="form-group input-group is-invalid">
-
         <span class="input-group-text is-invalid" id="basic-addon3">
           <i class="fa-solid fa-calendar-days"></i>
         </span>
-
         <input id="taskDueDate" type="date" th:field="*{dueDate}"
                class="form-control form-control-lg is-invalid" aria-describedby="basic-addon3"/>
         <div th:each="err : ${#fields.errors('dueDate')}">
@@ -79,19 +72,16 @@
         <span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
       </label>
       <div class="form-group input-group is-invalid">
-
         <span class="input-group-text is-invalid" id="basic-addon4">
           <i class="fa-solid fa-bolt"></i>
         </span>
-
         <select th:field="*{taskEnergy}" class="form-control form-control-lg is-invalid" aria-describedby="basic-addon4">
           <option th:each="taskEnergyItem : ${listTaskEnergy}"
                   th:value="${taskEnergyItem.value}"
                   th:text="${#messages.msgOrNull(taskEnergyItem.code)}">
             taskEnergyItem
           </option>
         </select>
-
         <div th:each="err : ${#fields.errors('taskEnergy')}">
           <div class="invalid-feedback" th:text="${err}">err</div>
         </div>
@@ -103,71 +93,83 @@
         <span th:utext="#{task.show.taskTime}">Time</span>
       </label>
       <div class="form-group input-group is-invalid">
-
         <span class="input-group-text is-invalid" id="basic-addon5">
           <i class="fa-solid fa-clock"></i>
         </span>
-
         <select th:field="*{taskTime}" class="form-control form-control-lg is-invalid" aria-describedby="basic-addon5">
           <option th:each="taskTimeItem : ${listTaskTime}"
                   th:value="${taskTimeItem.value}"
                   th:text="${#messages.msgOrNull(taskTimeItem.code)}">
             taskTimeItem
           </option>
         </select>
-
         <div th:each="err : ${#fields.errors('taskEnergy')}">
           <div class="invalid-feedback" th:text="${err}">err</div>
         </div>
-
       </div>&nbsp;
     </div>
+
     <div class="col-md">
       <label th:for="${#ids.next('context.id')}" class="control-label">
         <span th:utext="#{task.show.context}">Context</span>
       </label>
       <div class="form-group input-group is-invalid">
-
         <span class="input-group-text is-invalid" id="basic-addon6">
           <i class="fa-solid fa-cloud"></i>
         </span>
-
         <select th:field="*{context.id}" class="form-control form-control-lg" aria-describedby="basic-addon6">
           <option th:each="contextOption : ${contexts}"
                   th:value="${contextOption.id}"
                   th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
             contextOption
           </option>
         </select>
-
         <div th:each="err : ${#fields.errors('context.id')}">
           <div class="invalid-feedback" th:text="${err}">err</div>
         </div>
       </div>
     </div>
+
+  </div>
+  <div class="row my-2">
+    <div class="col-md">
+      <label th:for="${#ids.next('project.id')}" class="control-label">
+        <span th:utext="#{task.show.project}">Project</span>
+      </label>
+      <div class="form-group input-group is-invalid">
+          <span class="input-group-text is-invalid" id="basic-addon7">
+            <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}"
+                    th:value="${projectOption.id}"
+                    th:text="${projectOption.name}">Project
+            </option>
+          </select>
+          <div th:each="err : ${#fields.errors('project.id')}">
+            <div class="invalid-feedback" th:text="${err}">err</div>
+          </div>
+        </div>
+      </div>
   </div>
 
   <div class="row my-2">
     <div class="col-md">
       <div class="form-group is-invalid">
-
         <label th:for="textEditor" class="control-label">
           <span th:utext="#{task.show.text}">Text</span>
         </label>
-
         <textarea id="textEditor" name="textEditor" rows="10" cols="50"
                   class="form-control form-control-lg is-invalid"
                   th:field="*{text}">Text
         </textarea>
-
         <div th:each="err : ${#fields.errors('text')}">
           <div class="invalid-feedback" th:text="${err}">err</div>
         </div>
-
       </div>
     </div>
   </div>
-</div>
+
 </div>
 
 </html>