Skip to content
Snippets Groups Projects

Retrieve submissions as a page instead of fully

Files

@@ -34,6 +34,7 @@ import javax.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.Resource;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PageableDefault;
import org.springframework.http.HttpHeaders;
@@ -73,7 +74,6 @@ import nl.tudelft.submit.dto.view.VersionViewDTO;
import nl.tudelft.submit.dto.view.labracore.SubmitAssignmentDetailsDTO;
import nl.tudelft.submit.dto.view.labracore.SubmitSubmissionViewDTO;
import nl.tudelft.submit.dto.view.script.ScriptTrainResultViewDTO;
import nl.tudelft.submit.external.PageUtil;
import nl.tudelft.submit.model.Signature;
import nl.tudelft.submit.model.TestSubmission;
import nl.tudelft.submit.security.AuthorizationService;
@@ -229,8 +229,8 @@ public class AssignmentController {
@RequestParam(defaultValue = "false") Boolean latest,
Model model) {
SubmitAssignmentDetailsDTO assignment = assignmentService.getSubmitAssignmentDetails(id);
List<SubmitSubmissionViewDTO> submissions = assignmentService.getAllSubmissionsFiltered(id, q,
latest);
Page<SubmitSubmissionViewDTO> submissions = assignmentService.getAllSubmissionsFilteredAndPaged(id,
q, latest, pageable);
personCache.get(submissions.stream().flatMap(s -> s.getFeedback().stream())
.filter(f -> !f.getIsScriptFeedback())
@@ -238,11 +238,9 @@ public class AssignmentController {
personCache.get(submissions.stream().map(s -> s.getSubmitter().getId()).distinct());
groupCache.get(submissions.stream().map(s -> s.getGroup().getId()).distinct());
var page = PageUtil.toPage(pageable, submissions);
model.addAttribute("assignment", assignment);
model.addAttribute("edition", editionService.getEdition(assignment.getModule().getEdition().getId()));
model.addAttribute("submissions", page);
model.addAttribute("submissions", submissions);
model.addAttribute("gradeCreate", new GradedFeedbackCreateDTO());
model.addAttribute("grades", submissions.stream()
.flatMap(s -> s.getGrades().stream())
Loading