From 13abe008922b98dec7e0bbe72d729dcbabadfe69 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Fri, 2 Apr 2021 15:00:10 +0400
Subject: [PATCH] #8 -- Fix data pagination on view.

---
 .../controller/GitFilteringController.java    |  2 +-
 .../resources/templates/filterCommits.html    | 30 +++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ru/ulstu/extractor/controller/GitFilteringController.java b/src/main/java/ru/ulstu/extractor/controller/GitFilteringController.java
index 3d945dd..e3c5ffb 100644
--- a/src/main/java/ru/ulstu/extractor/controller/GitFilteringController.java
+++ b/src/main/java/ru/ulstu/extractor/controller/GitFilteringController.java
@@ -61,7 +61,7 @@ public class GitFilteringController {
         Page<Commit> commitsPage = indexService.getCommits(repositoryUrl, branchName, new OffsetablePageRequest(currentPage, pageSize));
         int totalPages = commitsPage.getTotalPages();
         if (totalPages > 0) {
-            List<Integer> pageNumbers = IntStream.rangeClosed(1, totalPages)
+            List<Integer> pageNumbers = IntStream.rangeClosed(1, totalPages - 1)
                     .boxed()
                     .collect(Collectors.toList());
             model.addAttribute("pageNumbers", pageNumbers);
diff --git a/src/main/resources/templates/filterCommits.html b/src/main/resources/templates/filterCommits.html
index eca26f5..535a59a 100644
--- a/src/main/resources/templates/filterCommits.html
+++ b/src/main/resources/templates/filterCommits.html
@@ -12,6 +12,24 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <div class="container" layout:fragment="content">
+    <style>
+        .pagination {
+            display: inline-block;
+        }
+
+        .pagination a {
+            color: black;
+            float: left;
+            padding: 5px 5px;
+            text-decoration: none;
+        }
+
+        .pagination a.active {
+            background-color: gray;
+            color: white;
+            border-radius: 2px;
+        }
+    </style>
     <form action="#" th:action="${@route.FILTER_COMMITS}" th:object="${filterForm}" method="post">
         <p><b>Фильтровать данные:</b><Br></p>
         По автору
@@ -54,10 +72,12 @@
             <input type="submit" value="Отправить"/>
         </p>
     </form>
-</div>
-<div th:if="${filterForm.commitPage.totalPages > 0}" class="pagination"
-     th:each="pageNumber : ${pageNumbers}">
-    <a th:href="@{/filtering.html(size=${commitPage.size}, page=${pageNumber})}"
-       th:class="${pageNumber==commitPage.number + 1} ? active"></a>
+    Страницы:
+    <div th:if="${filterForm.commitsPage.totalPages > 0}" class="pagination"
+         th:each="pageNumber : ${pageNumbers}">
+        <a th:href="@{/filterCommits(size=${filterForm.commitsPage.size}, page=${pageNumber}, repositoryUrl=${filterForm.url}, branchName=${filterForm.branch})}"
+           th:text=${pageNumber}
+           th:class="${pageNumber == filterForm.commitsPage.number} ? active"></a>
+    </div>
 </div>
 </html>