romanov73/seminar
1
0
Fork 0
Code Issues 9 Pull Requests 1 Projects Releases 1 Wiki Activity

21-rating #22

Merged
romanov73 merged 33 commits from 21-rating into aspir 2025-04-15 23:18:30 +04:00
Conversation 0 Commits 33 Files Changed 60 +6 -2
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 82823d6245 - Show all commits

2
src/main/java/ru/ulstu/report/controller/ReportController.java
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";
} }
} }

4
src/main/java/ru/ulstu/report/model/Report.java
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;
} }

2
src/main/resources/templates/report/editReport.html
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>