Skip to content

Commit 6e60cd2

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 1d5fc84 commit 6e60cd2

File tree

2 files changed

+159
-149
lines changed

2 files changed

+159
-149
lines changed

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

Lines changed: 116 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -4,125 +4,126 @@
44
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
55
xmlns:sd="http://www.thymeleaf.org/spring-data">
66

7-
<div th:fragment="tw-task-form(task,listTaskState,listTaskEnergy,listTaskTime,contexts)">
8-
<input type="hidden" th:field="*{id}" />
9-
<input type="hidden" th:field="*{uuid}" />
10-
<input type="hidden" th:field="*{focus}" />
11-
<input type="hidden" th:field="*{rowCreatedAt.time}" />
12-
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
13-
<div class="form-row">
14-
<div class="col-md-12 mb-12">
15-
<div class="form-group">
16-
<label th:for="${#ids.next('title')}" class="control-label">
17-
<span th:utext="#{task.show.title}">Title</span>
18-
</label>
19-
<input type="text" th:field="*{title}" class="form-control form-control-lg is-invalid" required/>
20-
<div th:each="err : ${#fields.errors('title')}">
21-
<div class="invalid-feedback" th:text="${err}" >err</div>
22-
</div>
23-
</div>
24-
</div>
7+
<div th:fragment="tw-task-form(task,listTaskState,listTaskEnergy,listTaskTime,contexts)">
8+
<input type="hidden" th:field="*{id}"/>
9+
<input type="hidden" th:field="*{uuid}"/>
10+
<input type="hidden" th:field="*{focus}"/>
11+
<input type="hidden" th:field="*{rowCreatedAt.time}"/>
12+
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
13+
<div class="row">
14+
<div class="col">
15+
<div class="form-group">
16+
<label th:for="${#ids.next('title')}" class="control-label">
17+
<span th:utext="#{task.show.title}">Title</span>
18+
</label>
19+
<input type="text" th:field="*{title}" class="form-control form-control-lg is-invalid" required/>
20+
<div th:each="err : ${#fields.errors('title')}">
21+
<div class="invalid-feedback" th:text="${err}">err</div>
2522
</div>
26-
<div class="form-row">
27-
<div class="col-md-6 mb-6">
28-
<div class="form-group">
29-
<label th:for="${#ids.next('listTaskState')}" class="control-label">
30-
<span th:utext="#{tasks.col.taskState}">taskState</span>
31-
</label>
32-
<select th:field="*{taskState}" class="form-control form-control-lg is-invalid" required>
33-
<option th:each="taskStateItem : ${listTaskState}"
34-
th:value="${taskStateItem.value}"
35-
th:text="${#messages.msgOrNull(taskStateItem.code)}">
36-
taskStateItem
37-
</option>
38-
</select>
39-
<div th:each="err : ${#fields.errors('taskState')}">
40-
<div class="invalid-feedback" th:text="${err}" >err</div>
41-
</div>
42-
</div>
43-
</div>
44-
<div class="col-md-6 mb-6">
45-
<div class="form-group">
46-
<label for="taskDueDate" class="control-label">
47-
<span th:utext="#{task.show.dueDate}">dueDate</span>
48-
</label>
49-
<input id="taskDueDate" type="text" th:field="*{dueDate}"
50-
class="form-control form-control-lg is-invalid"/>
51-
<div th:each="err : ${#fields.errors('dueDate')}">
52-
<div class="invalid-feedback" th:text="${err}" >err</div>
53-
</div>
54-
</div>
55-
</div>
23+
</div>
24+
</div>
25+
</div>
26+
<div class="row">
27+
<div class="col">
28+
<div class="form-group">
29+
<label th:for="${#ids.next('listTaskState')}" class="control-label">
30+
<span th:utext="#{tasks.col.taskState}">taskState</span>
31+
</label>
32+
<select th:field="*{taskState}" class="form-control form-control-lg is-invalid" required>
33+
<option th:each="taskStateItem : ${listTaskState}"
34+
th:value="${taskStateItem.value}"
35+
th:text="${#messages.msgOrNull(taskStateItem.code)}">
36+
taskStateItem
37+
</option>
38+
</select>
39+
<div th:each="err : ${#fields.errors('taskState')}">
40+
<div class="invalid-feedback" th:text="${err}">err</div>
5641
</div>
57-
<div class="form-row">
58-
<div class="col-md-12 mb-12">
59-
<div class="form-group">
60-
<label th:for="textEditor" class="control-label">
61-
<span th:utext="#{task.show.text}">Text</span>
62-
</label>
63-
<textarea id="textEditor" name="textEditor" rows="10" cols="50"
64-
class="form-control form-control-lg is-invalid"
65-
th:field="*{text}">Text
66-
</textarea>
67-
<div th:each="err : ${#fields.errors('text')}">
68-
<div class="invalid-feedback" th:text="${err}" >err</div>
69-
</div>
70-
</div>
71-
</div>
42+
</div>
43+
</div>
44+
<div class="col">
45+
<div class="form-group">
46+
<label for="taskDueDate" class="control-label">
47+
<span th:utext="#{task.show.dueDate}">dueDate</span>
48+
</label>
49+
<input id="taskDueDate" type="text" th:field="*{dueDate}"
50+
class="form-control form-control-lg is-invalid"/>
51+
<div th:each="err : ${#fields.errors('dueDate')}">
52+
<div class="invalid-feedback" th:text="${err}">err</div>
7253
</div>
73-
<div class="form-row">
74-
<div class="col-md-4 mb-4">
75-
<div class="form-group">
76-
<label th:for="${#ids.next('taskEnergy')}" class="control-label">
77-
<span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
78-
</label>
79-
<select th:field="*{taskEnergy}" class="form-control form-control-lg is-invalid">
80-
<option th:each="taskEnergyItem : ${listTaskEnergy}"
81-
th:value="${taskEnergyItem.value}"
82-
th:text="${#messages.msgOrNull(taskEnergyItem.code)}">
83-
taskEnergyItem
84-
</option>
85-
</select>
86-
<div th:each="err : ${#fields.errors('taskEnergy')}">
87-
<div class="invalid-feedback" th:text="${err}" >err</div>
88-
</div>
89-
</div>
90-
</div>
91-
<div class="col-md-4 mb-4">
92-
<div class="form-group">
93-
<label th:for="${#ids.next('taskTime')}" class="control-label">
94-
<span th:utext="#{task.show.taskTime}">Time</span>
95-
</label>
96-
<select th:field="*{taskTime}" class="form-control form-control-lg is-invalid">
97-
<option th:each="taskTimeItem : ${listTaskTime}"
98-
th:value="${taskTimeItem.value}"
99-
th:text="${#messages.msgOrNull(taskTimeItem.code)}">
100-
taskTimeItem
101-
</option>
102-
</select>
103-
<div th:each="err : ${#fields.errors('taskEnergy')}">
104-
<div class="invalid-feedback" th:text="${err}" >err</div>
105-
</div>
106-
</div>&nbsp;
107-
</div>
108-
<div class="col-md-4 mb-4">
109-
<div class="form-group">
110-
<label th:for="${#ids.next('context.id')}" class="control-label">
111-
<span th:utext="#{task.show.context}">Context</span>
112-
</label>
113-
<select th:field="*{context.id}" class="form-control form-control-lg is-invalid">
114-
<option th:each="contextOption : ${contexts}"
115-
th:value="${contextOption.id}"
116-
th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
117-
contextOption
118-
</option>
119-
</select>
120-
<div th:each="err : ${#fields.errors('context.id')}">
121-
<div class="invalid-feedback" th:text="${err}" >err</div>
122-
</div>
123-
</div>
124-
</div>
54+
</div>
55+
</div>
56+
</div>
57+
<div class="row">
58+
<div class="col">
59+
<div class="form-group">
60+
<label th:for="${#ids.next('taskEnergy')}" class="control-label">
61+
<span th:utext="#{task.show.taskEnergy}">taskEnergy</span>
62+
</label>
63+
<select th:field="*{taskEnergy}" class="form-control form-control-lg is-invalid">
64+
<option th:each="taskEnergyItem : ${listTaskEnergy}"
65+
th:value="${taskEnergyItem.value}"
66+
th:text="${#messages.msgOrNull(taskEnergyItem.code)}">
67+
taskEnergyItem
68+
</option>
69+
</select>
70+
<div th:each="err : ${#fields.errors('taskEnergy')}">
71+
<div class="invalid-feedback" th:text="${err}">err</div>
72+
</div>
73+
</div>
74+
</div>
75+
<div class="col">
76+
<div class="form-group">
77+
<label th:for="${#ids.next('taskTime')}" class="control-label">
78+
<span th:utext="#{task.show.taskTime}">Time</span>
79+
</label>
80+
<select th:field="*{taskTime}" class="form-control form-control-lg is-invalid">
81+
<option th:each="taskTimeItem : ${listTaskTime}"
82+
th:value="${taskTimeItem.value}"
83+
th:text="${#messages.msgOrNull(taskTimeItem.code)}">
84+
taskTimeItem
85+
</option>
86+
</select>
87+
<div th:each="err : ${#fields.errors('taskEnergy')}">
88+
<div class="invalid-feedback" th:text="${err}">err</div>
89+
</div>
90+
</div>&nbsp;
91+
</div>
92+
<div class="col">
93+
<div class="form-group">
94+
<label th:for="${#ids.next('context.id')}" class="control-label">
95+
<span th:utext="#{task.show.context}">Context</span>
96+
</label>
97+
<select th:field="*{context.id}" class="form-control form-control-lg is-invalid">
98+
<option th:each="contextOption : ${contexts}"
99+
th:value="${contextOption.id}"
100+
th:text="${locale == 'de' ? contextOption.nameDe : contextOption.nameEn}">
101+
contextOption
102+
</option>
103+
</select>
104+
<div th:each="err : ${#fields.errors('context.id')}">
105+
<div class="invalid-feedback" th:text="${err}">err</div>
106+
</div>
107+
</div>
108+
</div>
109+
</div>
110+
<div class="row">
111+
<div class="col">
112+
<div class="form-group">
113+
<label th:for="textEditor" class="control-label">
114+
<span th:utext="#{task.show.text}">Text</span>
115+
</label>
116+
<textarea id="textEditor" name="textEditor" rows="10" cols="50"
117+
class="form-control form-control-lg is-invalid"
118+
th:field="*{text}">Text
119+
</textarea>
120+
<div th:each="err : ${#fields.errors('text')}">
121+
<div class="invalid-feedback" th:text="${err}">err</div>
125122
</div>
123+
</div>
126124
</div>
125+
</div>
126+
</div>
127+
</div>
127128

128129
</html>

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

Lines changed: 43 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,57 @@
11
<!DOCTYPE html>
22
<html th:lang="${#locale.language}"
3-
xmlns="http://www.w3.org/1999/xhtml"
4-
xmlns:th="http://www.thymeleaf.org"
5-
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
6-
xmlns:sd="http://www.thymeleaf.org/spring-data">
3+
xmlns="http://www.w3.org/1999/xhtml"
4+
xmlns:th="http://www.thymeleaf.org"
5+
xmlns:sec="http://www.thymeleaf.org/extras/spring-security"
6+
xmlns:sd="http://www.thymeleaf.org/spring-data">
77
<head th:replace="layout/page :: tw-page-head(headtitle=~{::title},links=~{},refreshMessages=false)">
8-
<title th:text="'SimpleWorklist | ' + #{task.show.h1}">Title</title>
8+
<title th:text="'SimpleWorklist | ' + #{task.show.h1}">Title</title>
99
</head>
1010
<body th:replace="layout/page :: tw-page-body(twcontent=~{::mytwcontent},twtitle=~{::mytwtitle},scripts=~{::script})">
1111

1212
<div th:fragment="mytwtitle">
13-
<!-- Document Window -->
14-
<h1>
15-
<i class="fas fa-edit"></i>&nbsp;
16-
<span th:utext="#{task.show.h1}">Edit Task</span>
17-
</h1>
13+
<!-- Document Window -->
14+
<h1>
15+
<i class="fas fa-edit"></i>&nbsp;
16+
<span th:utext="#{task.show.h1}">Edit Task</span>
17+
</h1>
1818
</div>
1919

2020
<div th:fragment="mytwcontent">
21-
<div>
22-
<form id="formId" method="post" class="was-validated"
23-
th:action="@{/taskstate/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}">
24-
<div th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
25-
<div class="form-row">
26-
<div class="col-md-6 mb-6">
27-
<button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">
28-
<i class="fas fa-save"></i>
29-
<span th:utext="#{task.show.button}">Save Task</span>
30-
</button>
31-
</div>
32-
<div class="col-md-6 mb-6">
33-
<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block" role="button">
34-
<i class="fas fa-project-diagram"></i>
35-
<span th:utext="#{task.show.transform}">Transform into Project</span>
36-
</a>
37-
</div>
38-
</div>
39-
</form>
40-
</div>
21+
<div>
22+
<form id="formId" method="post" class="was-validated"
23+
th:action="@{/taskstate/task/{taskId}/edit(taskId=${task.id})}" th:object="${task}">
24+
<div
25+
th:replace="layout/task :: tw-task-form(task=${task},listTaskState=${listTaskState},listTaskEnergy=${listTaskEnergy},listTaskTime=${listTaskTime},contexts=${contexts})"></div>
26+
<div class="row">
27+
<div class="col">
28+
<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block"
29+
role="button">
30+
<i class="fas fa-project-diagram"></i>
31+
<span th:utext="#{task.show.button.close}">cancel and back</span>
32+
</a>
33+
</div>
34+
<div class="col">
35+
<button id="editTaskSubmit" type="submit" class="btn btn-primary btn-block">
36+
<i class="fas fa-save"></i>
37+
<span th:utext="#{task.show.button}">Save Task</span>
38+
</button>
39+
</div>
40+
<div class="col">
41+
<a th:href="@{/taskstate/task/{id}/transform(id=${task.id})}" class="btn btn-secondary btn-block"
42+
role="button">
43+
<i class="fas fa-project-diagram"></i>
44+
<span th:utext="#{task.show.transform}">Transform into Project</span>
45+
</a>
46+
</div>
47+
</div>
48+
</form>
49+
</div>
4150
</div>
4251

43-
<script th:src="@{/webjars/ckeditor/4.14.0/full/ckeditor.js}"></script>
44-
<script th:inline="javascript">
45-
CKEDITOR.replace( 'textEditor' );
46-
</script>
52+
<script th:src="@{/webjars/ckeditor/4.14.0/full/ckeditor.js}"></script>
53+
<script th:inline="javascript">
54+
CKEDITOR.replace('textEditor');
55+
</script>
4756
</body>
4857
</html>

0 commit comments

Comments
 (0)