* fixed #403 Task pagination is broken due to dependencies

* fixed #407 update Last Login Date is broken

Author: thomaswoehlke

etc/TODO.md

@@ -108,7 +108,7 @@
 * fixed #405 User List View: LocalDate and LocalDateTime HTML rendering for Locale and in desired format
 
 ## 3.0.0.rc.3
-* #403 Task pagination is broken due to dependencies
+* fixed #403 Task pagination is broken due to dependencies
 * #406 Liquibase Database Schema Evolution of changes by migrating spring-boot from 2 to 3 and Jakarta EE 10 JPA
 * fixed #407 update Last Login Date is broken
 

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

@@ -16,7 +16,7 @@
     <div th:fragment="tw-tasks-table(taskPage,myTaskState,myUrlPath)" sec:authorize="isAuthenticated()">
         <div class="container">
             <div th:replace="~{this :: tw-tasks-page-table(taskPage=${taskPage},myTaskState=${myTaskState},myUrlPath=${myUrlPath})}"></div>
-            <div th:replace="~{this :: tw-tasks-pagination(page=${taskPage})}"></div>
+            <div th:replace="~{this :: tw-tasks-pagination(page=${taskPage},myTaskState=${myTaskState},myUrlPath=${myUrlPath})}"></div>
         </div>
     </div>
 
@@ -259,7 +259,41 @@ <h5 class="modal-title" id="taskModalScrollableTitle">
         </span>
     </div>
 
-    <div th:fragment="tw-tasks-pagination(page)">
+    <div th:fragment="tw-tasks-pagination(page,myTaskState,myUrlPath)">
+        <div class="row">
+            <div class="col">
+                <p></p>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col">
+                <nav aria-label="Task Pagination">
+                    <ul class="pagination">
+                        <li class="page-item">
+                            <a th:href="@{{myUrlPath}/{myTaskState}?page={page}(myUrlPath=${myUrlPath},myTaskState=${#strings.toLowerCase(myTaskState)},page=${1})}" class="page-link" aria-label="Previous">
+                                <span aria-hidden="true">&laquo;</span>
+                            </a>
+                        </li>
+                        <li th:each="i : ${#numbers.sequence( 0, page.totalPages-1)}" class="page-item">
+                            <a th:if="${page.number == i}" th:href="@{{myUrlPath}/{myTaskState}?page={page}(myUrlPath=${myUrlPath},myTaskState=${#strings.toLowerCase(myTaskState)},page=${i})}" class="page-link active" aria-current="page">
+                              <span th:text="${i+1}">1</span>
+                            </a>
+                            <a th:unless="${page.number == i}" th:href="@{{myUrlPath}/{myTaskState}?page={page}(myUrlPath=${myUrlPath},myTaskState=${#strings.toLowerCase(myTaskState)},page=${i})}" class="page-link">
+                                <span th:text="${i+1}">1</span>
+                            </a>
+                        </li>
+                        <li class="page-item">
+                            <a th:href="@{{myUrlPath}/{myTaskState}?page={page}(myUrlPath=${myUrlPath},myTaskState=${#strings.toLowerCase(myTaskState)},page=${page.totalPages-1})}"  class="page-link" aria-label="Next">
+                                <span aria-hidden="true">&raquo;</span>
+                            </a>
+                        </li>
+                    </ul>
+                </nav>
+            </div>
+        </div>
+    </div>
+
+    <div th:fragment="tw-tasks-pagination-by-dialect(page)">
         <div class="row">
             <div class="col-sm">
                 <nav aria-label="pagination">