Skip to content
Snippets Groups Projects

Resolve "Test submission for scripts"

Compare and
29 files
+ 842
124
Compare changes
  • Side-by-side
  • Inline

Files

@@ -24,6 +24,7 @@ import java.nio.charset.StandardCharsets;
@@ -24,6 +24,7 @@ import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.util.List;
import java.util.List;
import java.util.Map;
import java.util.Map;
 
import java.util.Optional;
import java.util.function.Function;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Collectors;
@@ -51,6 +52,7 @@ import com.opencsv.exceptions.CsvValidationException;
@@ -51,6 +52,7 @@ import com.opencsv.exceptions.CsvValidationException;
import nl.tudelft.labracore.api.dto.*;
import nl.tudelft.labracore.api.dto.*;
import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
import nl.tudelft.labracore.lib.security.user.Person;
import nl.tudelft.labracore.lib.security.user.Person;
 
import nl.tudelft.librador.dto.view.View;
import nl.tudelft.submit.cache.PersonCacheManager;
import nl.tudelft.submit.cache.PersonCacheManager;
import nl.tudelft.submit.cache.StudentGroupCacheManager;
import nl.tudelft.submit.cache.StudentGroupCacheManager;
import nl.tudelft.submit.dto.create.SubmitAssignmentCreateDTO;
import nl.tudelft.submit.dto.create.SubmitAssignmentCreateDTO;
@@ -70,8 +72,10 @@ import nl.tudelft.submit.dto.view.FeedbackViewDTO;
@@ -70,8 +72,10 @@ import nl.tudelft.submit.dto.view.FeedbackViewDTO;
import nl.tudelft.submit.dto.view.VersionViewDTO;
import nl.tudelft.submit.dto.view.VersionViewDTO;
import nl.tudelft.submit.dto.view.labracore.SubmitAssignmentDetailsDTO;
import nl.tudelft.submit.dto.view.labracore.SubmitAssignmentDetailsDTO;
import nl.tudelft.submit.dto.view.labracore.SubmitSubmissionViewDTO;
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.external.PageUtil;
import nl.tudelft.submit.model.Signature;
import nl.tudelft.submit.model.Signature;
 
import nl.tudelft.submit.model.TestSubmission;
import nl.tudelft.submit.security.AuthorizationService;
import nl.tudelft.submit.security.AuthorizationService;
import nl.tudelft.submit.service.*;
import nl.tudelft.submit.service.*;
@@ -166,6 +170,15 @@ public class AssignmentController {
@@ -166,6 +170,15 @@ public class AssignmentController {
model.addAttribute("version", version);
model.addAttribute("version", version);
model.addAttribute("availableGroups", availableGroups);
model.addAttribute("availableGroups", availableGroups);
 
Optional<TestSubmission> sub = submissionService
 
.getLatestTestSubmissionByAssignment(assignment.getId());
 
if (sub.isPresent()) {
 
List<ScriptTrainResultViewDTO> scriptResults = View.convert(sub.get().getScriptResults(),
 
ScriptTrainResultViewDTO.class);
 
model.addAttribute("testSubmission", sub.get());
 
model.addAttribute("testScriptResults", scriptResults);
 
}
 
if (isTransparent) {
if (isTransparent) {
model.addAttribute("train",
model.addAttribute("train",
scriptService.getScriptTrainById(versions.get(0).getScriptTrain().getId()));
scriptService.getScriptTrainById(versions.get(0).getScriptTrain().getId()));
Loading