#21 -- Fix pagination

This commit is contained in:
Anton Romanov 2025-04-03 16:15:18 +04:00
parent 7d40a52f19
commit 82823d6245
3 changed files with 6 additions and 2 deletions

View File

@ -77,7 +77,7 @@ public class ReportController {
model.addAttribute("pageNumbers", pageNumbers); model.addAttribute("pageNumbers", pageNumbers);
} }
model.addAttribute("report", new Report()); model.addAttribute("report", new Report(0));
return "report/editReport"; return "report/editReport";
} }
} }

View File

@ -26,6 +26,10 @@ public class Report extends BaseEntity {
@ManyToOne @ManyToOne
private Aspirant aspirant; private Aspirant aspirant;
public Report(Integer id) {
setId(id);
}
public List<ReportValue> getValues() { public List<ReportValue> getValues() {
return values; return values;
} }

View File

@ -105,7 +105,7 @@
</div> </div>
<div th:if="${indicators.totalPages > 0}" class="pagination" <div th:if="${indicators.totalPages > 0}" class="pagination"
th:each="pageNumber : ${pageNumbers}"> th:each="pageNumber : ${pageNumbers}">
<a th:href="@{'/report/editReport/' + ${report.id}+'(size=${indicators.size}, page=${pageNumber})'}" <a th:href="@{'/report/editReport/' + ${report.id}+'?size=' + ${indicators.size} + '&page='+${pageNumber}}"
th:text=${pageNumber} th:text=${pageNumber}
th:class="${pageNumber == indicators.number+1} ? active"></a> th:class="${pageNumber == indicators.number+1} ? active"></a>
</div> </div>