Skip to content

Commit 96b8458

Browse files
thomaswoehlkethomaswoehlke
committed
work in progress
1 parent d2d6a59 commit 96b8458

File tree

2 files changed

+21
-172
lines changed

2 files changed

+21
-172
lines changed

‎src/main/resources/templates/project/id/task/add.html‎

Lines changed: 10 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -18,93 +18,17 @@ <h1>
1818
</div>
1919

2020
<div th:fragment="mytwcontent">
21-
<form id="formId" method="post"
21+
<form id="formId" class="was-validated" method="post"
2222
th:action="@{/project/{projectId}/task/add(projectId=${thisProject.id})}" th:object="${task}">
23-
<input type="hidden" th:field="*{taskState}" />
24-
<input type="hidden" th:field="*{context.id}" />
25-
<input type="hidden" th:field="*{rowCreatedAt.time}" />
26-
<div class="form-group form-control-lg">
27-
<label th:for="${#ids.next('title')}" class="control-label">
28-
<span th:utext="#{task.show.title}">Title</span>
29-
</label>
30-
<input type="text" th:field="*{title}" class="form-control" />
31-
<div>
32-
<div th:each="err : ${#fields.errors('title')}" th:text="${err}" class="alert alert-danger" >
33-
</div>
34-
</div>
35-
</div>
36-
<div class="form-group form-control-lg">
37-
<label for="taskDueDate" class="control-label">
38-
<span th:utext="#{task.show.dueDate}">Due Date</span>
39-
</label>
40-
<input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control" />
41-
<div>
42-
<div th:each="err : ${#fields.errors('dueDate')}" th:text="${err}" class="alert alert-danger">
43-
</div>
44-
</div>
45-
</div>
46-
<div class="form-group form-control-lg">
47-
<label th:for="textEditor" class="control-label">
48-
<span th:utext="#{task.show.text}">Text</span>
49-
</label>
50-
<textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control"
51-
th:field="*{text}" >Text</textarea>
52-
<div>
53-
<div th:each="err : ${#fields.errors('text')}" th:text="${err}" class="alert alert-danger">
54-
</div>
55-
</div>
56-
</div>
57-
<div>
58-
<span class="form-group form-control-lg">
59-
<label th:for="${#ids.next('taskEnergy')}" class="control-label">
60-
<span th:utext="#{task.show.taskEnergy}">Energy</span>
61-
</label>
62-
<select th:field="*{taskEnergy}">
63-
<option th:each="taskEnergyItem : ${listTaskEnergy}"
64-
th:value="${taskEnergyItem.value}"
65-
th:text="${#messages.msgOrNull(taskEnergyItem.code)}">Wireframe</option>
66-
</select>
67-
<div>
68-
<div th:each="err : ${#fields.errors('taskEnergy')}" th:text="${err}" class="alert alert-danger">
69-
</div>
70-
</div>
71-
</span>&nbsp;
72-
<span class="form-group form-control-lg">
73-
<label th:for="${#ids.next('taskTime')}" class="control-label">
74-
<span th:utext="#{task.show.taskTime}">Time</span>
75-
</label>
76-
<select th:field="*{taskTime}">
77-
<option th:each="taskTimeItem : ${listTaskTime}"
78-
th:value="${taskTimeItem.value}"
79-
th:text="${#messages.msgOrNull(taskTimeItem.code)}">Wireframe</option>
80-
</select>
81-
<div>
82-
<div th:each="err : ${#fields.errors('taskTime')}" th:text="${err}" class="alert alert-danger">
83-
</div>
84-
</div>
85-
</span>&nbsp;
86-
<span class="form-group form-control-lg">
87-
<label th:for="${#ids.next('context.id')}" class="control-label">
88-
<span th:utext="#{task.show.context}">Area</span>
89-
</label>
90-
<select th:field="*{context.id}">
91-
<option th:each="areaOption : ${contexts}"
92-
th:value="${areaOption.id}"
93-
th:text="${locale == 'de' ? areaOption.nameDe : areaOption.nameEn}">Wireframe</option>
94-
</select>
95-
<div>
96-
<div th:each="err : ${#fields.errors('context.id')}" th:text="${err}" class="alert alert-danger">
97-
</div>
98-
</div>
99-
</span>
100-
</div>
101-
<input type="hidden"
102-
name="${_csrf.parameterName}"
103-
value="${_csrf.token}"/>
104-
<button id="createNewTask" type="submit" class="btn btn-primary">
105-
<i class="fas fa-save"></i>
106-
<span th:utext="#{task.add.button}">Add Task</span>
107-
</button>
23+
<div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
24+
<div class="form-row">
25+
<div class="col-md-12 mb-12">
26+
<button id="createNewTask" type="submit" class="btn btn-block btn-primary">
27+
<i class="fas fa-save"></i>
28+
<span th:utext="#{task.add.button}">Add Task</span>
29+
</button>
30+
</div>
31+
</div>
10832
</form>
10933
</div>
11034

‎src/main/resources/templates/project/root/task/add.html‎

Lines changed: 11 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -18,92 +18,17 @@ <h1>
1818
</div>
1919

2020
<div th:fragment="mytwcontent">
21-
<form id="formId" th:action="@{/project/root/task/add/}" th:object="${task}" method="post">
22-
<input type="hidden" th:field="*{taskState}" />
23-
<input type="hidden" th:field="*{context.id}" />
24-
<input type="hidden" th:field="*{rowCreatedAt.time}" />
25-
<div class="form-group form-control-lg">
26-
<label th:for="${#ids.next('title')}" class="control-label">
27-
<span th:utext="#{task.show.title}">Title</span>
28-
</label>
29-
<input type="text" th:field="*{title}" class="form-control" />
30-
<div>
31-
<div th:each="err : ${#fields.errors('title')}" th:text="${err}" class="alert alert-danger" >
32-
</div>
33-
</div>
34-
</div>
35-
<div class="form-group form-control-lg">
36-
<label for="taskDueDate" class="control-label">
37-
<span th:utext="#{task.show.dueDate}">Due Date</span>
38-
</label>
39-
<input id="taskDueDate" type="text" th:field="*{dueDate}" class="form-control" />
40-
<div>
41-
<div th:each="err : ${#fields.errors('dueDate')}" th:text="${err}" class="alert alert-danger">
42-
</div>
43-
</div>
44-
</div>
45-
<div class="form-group form-control-lg">
46-
<label th:for="textEditor" class="control-label">
47-
<span th:utext="#{task.show.text}">Text</span>
48-
</label>
49-
<textarea id="textEditor" name="textEditor" rows="10" cols="50" class="form-control"
50-
th:field="*{text}" ></textarea>
51-
<div>
52-
<div th:each="err : ${#fields.errors('text')}" th:text="${err}" class="alert alert-danger">
53-
</div>
54-
</div>
55-
</div>
56-
<div>
57-
<span class="form-group form-control-lg">
58-
<label th:for="${#ids.next('taskEnergy')}" class="control-label">
59-
<span th:utext="#{task.show.taskEnergy}">Energy</span>
60-
</label>
61-
<select th:field="*{taskEnergy}">
62-
<option th:each="taskEnergyItem : ${listTaskEnergy}"
63-
th:value="${taskEnergyItem.value}"
64-
th:text="${#messages.msgOrNull(taskEnergyItem.code)}">Wireframe</option>
65-
</select>
66-
<div>
67-
<div th:each="err : ${#fields.errors('taskEnergy')}" th:text="${err}" class="alert alert-danger">
68-
</div>
69-
</div>
70-
</span>&nbsp;
71-
<span class="form-group form-control-lg">
72-
<label th:for="${#ids.next('taskTime')}" class="control-label">
73-
<span th:utext="#{task.show.taskTime}">Time</span>
74-
</label>
75-
<select th:field="*{taskTime}">
76-
<option th:each="taskTimeItem : ${listTaskTime}"
77-
th:value="${taskTimeItem.value}"
78-
th:text="${#messages.msgOrNull(taskTimeItem.code)}">Wireframe</option>
79-
</select>
80-
<div>
81-
<div th:each="err : ${#fields.errors('taskTime')}" th:text="${err}" class="alert alert-danger">
82-
</div>
83-
</div>
84-
</span>&nbsp;
85-
<span class="form-group form-control-lg">
86-
<label th:for="${#ids.next('context.id')}" class="control-label">
87-
<span th:utext="#{task.show.context}">Area</span>
88-
</label>
89-
<select th:field="*{context.id}">
90-
<option th:each="areaOption : ${contexts}"
91-
th:value="${areaOption.id}"
92-
th:text="${locale == 'de' ? areaOption.nameDe : areaOption.nameEn}">Wireframe</option>
93-
</select>
94-
<div>
95-
<div th:each="err : ${#fields.errors('context.id')}" th:text="${err}" class="alert alert-danger">
96-
</div>
97-
</div>
98-
</span>
99-
</div>
100-
<input type="hidden"
101-
name="${_csrf.parameterName}"
102-
value="${_csrf.token}"/>
103-
<button id="createNewTask" type="submit" class="btn btn-primary">
104-
<i class="fas fa-save"></i>
105-
<span th:utext="#{task.add.button}">Add Task</span>
106-
</button>
21+
<form id="formId" class="was-validated" method="post"
22+
th:action="@{/project/root/task/add/}" th:object="${task}">
23+
<div th:replace="layout/taskedit :: tw-task-edit-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
24+
<div class="form-row">
25+
<div class="col-md-12 mb-12">
26+
<button id="createNewTask" type="submit" class="btn btn-block btn-primary">
27+
<i class="fas fa-save"></i>
28+
<span th:utext="#{task.add.button}">Add Task</span>
29+
</button>
30+
</div>
31+
</div>
10732
</form>
10833
</div>
10934

0 commit comments

Comments
 (0)