Skip to content
Snippets Groups Projects

Resolve "Pagination on request table is broken"

6 files
+ 30
22
Compare changes
  • Side-by-side
  • Inline

Files

@@ -46,7 +46,6 @@ import nl.tudelft.queue.repository.LabRequestRepository;
import nl.tudelft.queue.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.web.PageableDefault;
@@ -146,15 +145,11 @@ public class RequestController {
.collect(Collectors.toList());
List<LabRequest> filteredRequests = rs
.filterRequestsSharedEditionCheck(lrr.findAllByFilter(labs, filter, pageable).getContent(),
assistant);
var requestsViews = rts.convertRequestsToView(
new PageImpl<>(filteredRequests, pageable, filteredRequests.size()), filteredRequests.size());
.filterRequestsSharedEditionCheck(lrr.findAllByFilter(labs, filter));
model.addAttribute("page", "requests");
model.addAttribute("filter", filter);
model.addAttribute("requests", requestsViews);
model.addAttribute("requests", rts.convertRequestsToView(filteredRequests, pageable));
model.addAttribute("requestCounts", rts.labRequestCounts(
labs, assistant, filter));
Loading