Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Submit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
Submit
Merge requests
!247
Deploy
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
Deploy
development
into
master
Overview
0
Commits
5
Pipelines
0
Changes
4
Merged
Deploy
Ruben Backx
requested to merge
development
into
master
10 months ago
Overview
0
Commits
5
Pipelines
0
Changes
4
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
62c34e5c
5 commits,
10 months ago
4 files
+
36
−
17
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
4
src/main/java/nl/tudelft/submit/service/AssignmentService.java
+
2
−
5
View file @ 62c34e5c
Edit in single-file editor
Open in Web IDE
Show full file
@@ -17,8 +17,6 @@
*/
package
nl.tudelft.submit.service
;
import
static
nl
.
tudelft
.
labracore
.
lib
.
LabracoreApiUtil
.
sortToString
;
import
java.io.File
;
import
java.io.IOException
;
import
java.io.Reader
;
@@ -344,12 +342,11 @@ public class AssignmentService {
public
Page
<
SubmitSubmissionViewDTO
>
getAllSubmissionsFilteredAndPaged
(
Long
assignmentId
,
String
filter
,
Boolean
isLatest
,
Pageable
pageable
)
{
PageSubmissionDetailsDTO
submissionPage
=
submissionService
.
getSubmissionsByAssignmentFiltered
(
Page
<
SubmissionDetailsDTO
>
submissionPage
=
submissionService
.
getSubmissionsByAssignmentFiltered
(
assignmentId
,
filter
,
isLatest
,
new
LCPageable
().
page
(
pageable
.
getPageNumber
()).
size
(
pageable
.
getPageSize
())
.
sort
(
sortToString
(
pageable
.
getSort
())));
pageable
);
Page
<
SubmitSubmissionViewDTO
>
submissions
=
new
PageImpl
<
SubmitSubmissionViewDTO
>(
converter
.
convert
(
submissionPage
.
getContent
(),
SubmitSubmissionViewDTO
.
class
),
Loading