Skip to content

Commit e36a5fb

Browse files
thomaswoehlkethomaswoehlke
committed
List of ALL Tasks
1 parent 6288f29 commit e36a5fb

File tree

4 files changed

+63
-77
lines changed

4 files changed

+63
-77
lines changed

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,16 @@
4343
<span th:text="#{layout.page.showUsers}">User</span>
4444
<span class="badge badge-pill badge-light"
4545
th:if="${numberOfNewIncomingMessages gt 0}"
46-
th:text="${numberOfNewIncomingMessages}">
47-
numberOfNewIncomingMessages
48-
</span>
46+
th:text="${numberOfNewIncomingMessages}">33</span>
47+
</a>
48+
</li>
49+
<li class="nav-item">
50+
<a class="nav-link" th:href="@{/user/selfservice/profile}">
51+
<i class="fas fa-user"></i>
52+
<span th:text="#{layout.page.showUsers}">User</span>
53+
<span class="badge badge-pill badge-light"
54+
th:if="${numberOfNewIncomingMessages gt 0}"
55+
th:text="${numberOfNewIncomingMessages}">33</span>
4956
</a>
5057
</li>
5158
<li class="nav-item">

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

Lines changed: 37 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,20 @@
3131
<th class="task_col task_col_title" th:text="#{tasks.col.title}">
3232
Title
3333
</th>
34-
<th class="task_col task_col_due_date"
35-
th:if="${myTaskState eq 'SCHEDULED' or myTaskState eq 'TODAY' or myTaskState eq 'PROJECT'}"
36-
th:text="#{tasks.col.dueDate}">
37-
Due Date
38-
</th>
34+
<th class="task_col task_col_energy_and_time" th:utext="#{tasks.col.energyandtime}">&nbsp;</th>
3935
<th class="task_col task_col_taskstate"
4036
th:if="${myTaskState eq 'FOCUS' or myTaskState eq 'ALL' or myTaskState eq 'PROJECT'}"
4137
th:text="#{tasks.col.taskState}">
4238
Task State
4339
</th>
40+
<th class="task_col task_col_due_date"
41+
th:text="#{tasks.col.dueDate}">
42+
Due Date
43+
</th>
4444
<th class="task_col task_col_project"
4545
th:if="${myTaskState ne 'PROJECT'}" th:text="#{tasks.col.project}">
4646
Project
4747
</th>
48-
<th class="task_col task_col_energy_and_time" th:utext="#{tasks.col.energyandtime}">&nbsp;</th>
49-
<th class="task_col task_col_context"
50-
th:if="${myTaskState eq 'ALL'}">
51-
<span th:text="#{tasks.col.context}">Context</span>
52-
</th>
5348
</tr>
5449
</thead>
5550
<tbody>
@@ -92,22 +87,21 @@
9287
<td th:id="'task_' + ${task.id} + '_col_title'" class="task_col task_col_title">
9388
<div th:replace="this :: tw-tasks-modal(task=${task},myUrlPath=${myUrlPath})"></div>
9489
</td>
95-
<td th:id="'task_' + ${task.id} + '_col_due_date'" class="task_col task_col_due_date"
96-
th:if="${myTaskState eq 'SCHEDULED' or myTaskState eq 'TODAY' or myTaskState eq 'PROJECT'}">
97-
<span th:if="${#locale.language eq 'de'}"
98-
th:id="'task_' + ${task.id} + '_col_due_date'"
99-
draggable="true" ondragstart="dragTask(event)"
100-
th:alt-title="#{task.col.twtooltip.duedate}"
101-
class="task_col_content task_col_content_duedate twtooltip"
102-
th:text="${#calendars.format(task.dueDate,'dd.MM.yyyy')}">
103-
</span>
104-
<span th:if="${#locale.language eq 'en'}"
105-
th:id="'task_' + ${task.id} + '_col_due_date'"
106-
draggable="true" ondragstart="dragTask(event)"
107-
th:alt-title="#{task.col.twtooltip.duedate}"
108-
class="task_col_content task_col_content_duedate twtooltip"
109-
th:text="${#calendars.format(task.dueDate,'MM/dd/yyyy')}">
110-
</span>
90+
<td th:id="'task_' + ${task.id} + '_col_energy_and_time'" class="task_col task_col_energy_and_time">
91+
<span class="badge bg-dark task_col_content task_col_content_taskenergy twtooltip"
92+
th:if="${task.taskEnergy.value ne 'NONE'}"
93+
th:id="'task_' + ${task.id} + '_col_energy_and_time_badge'"
94+
draggable="true" ondragstart="dragTask(event)"
95+
th:text="${#messages.msgOrNull(task.taskEnergy.code)}"
96+
th:alt-title="#{task.col.twtooltip.badge.taskEnergy}">
97+
</span>
98+
<span class="badge bg-dark task_col_content task_col_content_tasktime twtooltip"
99+
th:if="${task.taskTime.value ne 'NONE'}"
100+
th:id="'task_' + ${task.id} + '_col_energy_and_time_badge'"
101+
draggable="true" ondragstart="dragTask(event)"
102+
th:text="${#messages.msgOrNull(task.taskTime.code)}"
103+
th:alt-title="#{task.col.twtooltip.badge.taskTime}">
104+
</span>
111105
</td>
112106
<td th:id="'task_' + ${task.id} + '_col_taskstate'" class="task_col task_col_taskstate"
113107
th:if="${myTaskState eq 'FOCUS' or myTaskState eq 'ALL' or myTaskState eq 'PROJECT'}">
@@ -118,6 +112,22 @@
118112
<span th:utext="${#messages.msgOrNull(task.taskState.getMsgCode())}">Inbox</span>
119113
</a>
120114
</td>
115+
<td th:id="'task_' + ${task.id} + '_col_due_date'" class="task_col task_col_due_date">
116+
<span class="task_col_content task_col_content_duedate twtooltip"
117+
draggable="true" ondragstart="dragTask(event)"
118+
th:if="${#locale.language eq 'de'}"
119+
th:id="'task_' + ${task.id} + '_col_due_date'"
120+
th:alt-title="#{task.col.twtooltip.duedate}"
121+
th:text="${#calendars.format(task.dueDate,'dd.MM.yyyy')}">
122+
</span>
123+
<span class="task_col_content task_col_content_duedate twtooltip"
124+
draggable="true" ondragstart="dragTask(event)"
125+
th:if="${#locale.language eq 'en'}"
126+
th:id="'task_' + ${task.id} + '_col_due_date'"
127+
th:alt-title="#{task.col.twtooltip.duedate}"
128+
th:text="${#calendars.format(task.dueDate,'MM/dd/yyyy')}">
129+
</span>
130+
</td>
121131
<td th:id="'task_' + ${task.id} + '_col_project'" class="task_col task_col_project"
122132
th:if="${myTaskState ne 'PROJECT'}">
123133
<a th:href="@{/project/{id}(id=${task.project.id})}"
@@ -130,37 +140,6 @@
130140
<span th:text="${task.project.name}"></span>
131141
</a>
132142
</td>
133-
<td th:id="'task_' + ${task.id} + '_col_energy_and_time'" class="task_col task_col_energy_and_time">
134-
<span class="badge bg-dark task_col_content task_col_content_taskenergy twtooltip"
135-
th:if="${task.taskEnergy.value ne 'NONE'}"
136-
th:id="'task_' + ${task.id} + '_col_energy_and_time_badge'"
137-
draggable="true" ondragstart="dragTask(event)"
138-
th:text="${#messages.msgOrNull(task.taskEnergy.code)}"
139-
th:alt-title="#{task.col.twtooltip.badge.taskEnergy}">
140-
</span>
141-
<span class="badge bg-dark task_col_content task_col_content_tasktime twtooltip"
142-
th:if="${task.taskTime.value ne 'NONE'}"
143-
th:id="'task_' + ${task.id} + '_col_energy_and_time_badge'"
144-
draggable="true" ondragstart="dragTask(event)"
145-
th:text="${#messages.msgOrNull(task.taskTime.code)}"
146-
th:alt-title="#{task.col.twtooltip.badge.taskTime}">
147-
</span>
148-
</td>
149-
<td th:id="'task_' + ${task.id} + '_col_context'" class="task_col task_col_context"
150-
th:if="${myTaskState eq 'ALL'}">
151-
<span th:if="${#locale.language eq 'de'}"
152-
th:id="'task_' + ${task.id} + '_col_context_txt'"
153-
draggable="true" ondragstart="dragTask(event)"
154-
class="task_col_content task_col_content_context twtooltip"
155-
th:alt-title="#{task.col.twtooltip.context}"
156-
th:text="${task.context.nameDe}">task.context.nameDe</span>
157-
<span th:if="${#locale.language ne 'de'}"
158-
th:id="'task_' + ${task.id} + '_col_context_txt'"
159-
draggable="true" ondragstart="dragTask(event)"
160-
class="task_col_content task_col_content_context twtooltip"
161-
th:alt-title="#{task.col.twtooltip.context}"
162-
th:text="${task.context.nameEn}">task.context.nameEn</span>
163-
</td>
164143
</tr>
165144
</tbody>
166145
</table>
@@ -241,7 +220,7 @@ <h5 class="modal-title" id="taskModalScrollableTitle">
241220
<span th:utext="${#messages.msgOrNull(task.taskState.getMsgCode())}">Inbox</span>
242221
</a>
243222
</div>
244-
<div th:if="${myTaskState eq 'SCHEDULED' or myTaskState eq 'TODAY' or myTaskState eq 'PROJECT'}">
223+
<div>
245224
<b th:utext="#{tasks.focus.dueDate}">Due Date</b>
246225
<span th:if="${#locale.language eq 'de'}"
247226
th:text="${#calendars.format(task.dueDate,'dd.MM.yyyy')}">

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -133,20 +133,6 @@
133133
<span th:text="#{layout.page.trash}" class="link-dark">Trash</span>
134134
</a>
135135
</li>
136-
<li class="nav-item" ondrop="drop2trash(event)" ondragover="allowDropOfTask(event)">
137-
<a id="taskstate_all" class="nav-link active link-dark"
138-
th:href="@{/taskstate/all}"
139-
th:if="${taskstateType == 'all'}">
140-
<i class="fa-solid fa-database"></i>
141-
<span th:text="#{layout.page.all}" class="link-dark">All</span>
142-
</a>
143-
<a id="taskstate_all" class="nav-link link-dark"
144-
th:href="@{/taskstate/all}"
145-
th:if="${taskstateType != 'all'}">
146-
<i class="fa-solid fa-database"></i>
147-
<span th:text="#{layout.page.all}" class="link-dark">All</span>
148-
</a>
149-
</li>
150136
<li class="nav-item" ondrop="drop2trash(event)" ondragover="allowDropOfTask(event)">
151137
<a id="taskstate_projects" class="nav-link active link-dark"
152138
th:href="@{/project/root}"
@@ -161,6 +147,20 @@
161147
<span th:text="#{layout.page.projects}" class="link-dark">Projects</span>
162148
</a>
163149
</li>
150+
<li class="nav-item" ondrop="drop2trash(event)" ondragover="allowDropOfTask(event)">
151+
<a id="taskstate_all" class="nav-link active link-dark"
152+
th:href="@{/taskstate/all}"
153+
th:if="${taskstateType == 'all'}">
154+
<i class="fa-solid fa-database"></i>
155+
<span th:text="#{layout.page.all}" class="link-dark">All</span>
156+
</a>
157+
<a id="taskstate_all" class="nav-link link-dark"
158+
th:href="@{/taskstate/all}"
159+
th:if="${taskstateType != 'all'}">
160+
<i class="fa-solid fa-database"></i>
161+
<span th:text="#{layout.page.all}" class="link-dark">All</span>
162+
</a>
163+
</li>
164164
</ul>
165165
</div>
166166
</section>

‎src/main/resources/templates/taskstate/all.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ <h1 class="col-md-12 mb-12">
3434
</div>
3535
<div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
3636
<div
37-
th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage}, myTaskState='INBOX', myUrlPath=@{/taskstate})">
37+
th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage}, myTaskState='ALL', myUrlPath=@{/taskstate})">
3838
</div>
3939
</div>
4040
<div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
41-
<div th:text="#{tasks.inbox.noTasks}">You have no Tasks in Your Inbox</div>
41+
<div th:text="#{tasks.all.noTasks}">You have no Tasks in Your Inbox</div>
4242
</div>
4343
</div>
4444

0 commit comments

Comments
 (0)