Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Programming exercises: Fix display of long feedback details and submission count in exams #7348

Merged
merged 8 commits into from
Oct 11, 2023
Merged

Programming exercises: Fix display of long feedback details and submission count in exams #7348

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ef965e0
add ID to feedback DTO
b-fein Oct 10, 2023
4a7d187
Merge branch 'develop' of https://github.com/ls1intum/Artemis into fi…
Strohgelaender Oct 10, 2023
4ef6376
add missing submissionCount field
Strohgelaender Oct 10, 2023
af313a8
add test case
Strohgelaender Oct 10, 2023
a44fa5a
Merge branch 'develop' of https://github.com/ls1intum/Artemis into fi…
Strohgelaender Oct 11, 2023
0c286fc
fix test
Strohgelaender Oct 11, 2023
5413ef5
add result and feedback test
Strohgelaender Oct 11, 2023
50b48fd
remove empty line
Strohgelaender Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/de/tum/in/www1/artemis/web/rest/dto/ParticipationDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import de.tum.in.www1.artemis.domain.participation.Participation;

@JsonInclude(JsonInclude.Include.NON_EMPTY)
public record ParticipationDTO(Long id, boolean testRun, String type) {
public record ParticipationDTO(Long id, boolean testRun, String type, Integer submissionCount) {

public static ParticipationDTO of(Participation participation) {
return new ParticipationDTO(participation.getId(), participation.isTestRun(), participation.getType());
return new ParticipationDTO(participation.getId(), participation.isTestRun(), participation.getType(), participation.getSubmissionCount());
}

}
6 changes: 3 additions & 3 deletions src/main/java/de/tum/in/www1/artemis/web/rest/dto/ResultDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ public record ResultDTO(Long id, ZonedDateTime completionDate, Boolean successfu
Integer codeIssueCount) {

@JsonInclude(JsonInclude.Include.NON_EMPTY)
public record FeedbackDTO(String text, String detailText, boolean hasLongFeedbackText, String reference, Double credits, Boolean positive, FeedbackType type,
public record FeedbackDTO(Long id, String text, String detailText, boolean hasLongFeedbackText, String reference, Double credits, Boolean positive, FeedbackType type,
Visibility visibility) {

public static FeedbackDTO of(Feedback feedback) {
return new FeedbackDTO(feedback.getText(), feedback.getDetailText(), feedback.getHasLongFeedbackText(), feedback.getReference(), feedback.getCredits(),
feedback.isPositive(), feedback.getType(), feedback.getVisibility());
return new FeedbackDTO(feedback.getId(), feedback.getText(), feedback.getDetailText(), feedback.getHasLongFeedbackText(), feedback.getReference(),
feedback.getCredits(), feedback.isPositive(), feedback.getType(), feedback.getVisibility());

}
}
Expand Down
Loading