Resolve "Show course name on edition page"

Closes #122 (closed)

src/main/java/nl/tudelft/submit/controller/AssignmentController.java

@@ -34,7 +34,6 @@ import nl.tudelft.labracore.lib.security.user.AuthenticatedPerson;
 import nl.tudelft.labracore.lib.security.user.Person;
 import nl.tudelft.submit.cache.PersonCacheManager;
 import nl.tudelft.submit.cache.StudentGroupCacheManager;
-import nl.tudelft.submit.csv.CSVService;
 import nl.tudelft.submit.dto.create.SubmitAssignmentCreateDTO;
 import nl.tudelft.submit.dto.create.VersionCreateDTO;
 import nl.tudelft.submit.dto.create.grading.GradedFeedbackCreateDTO;
@@ -78,9 +77,6 @@ public class AssignmentController {
 	@Autowired
 	private AssignmentService assignmentService;
 
-	@Autowired
-	private ModuleService moduleService;
-
 	@Autowired
 	private StudentGroupService studentGroupService;
 
@@ -94,20 +90,11 @@ public class AssignmentController {
 	private AuthorizationService authorizationService;
 
 	@Autowired
-	private FeedbackService feedbackService;
-
-	@Autowired
-	private StudentGroupService groupService;
-
-	@Autowired
-	private PersonService personService;
+	private EditionService editionService;
 
 	@Autowired
 	private NoteService noteService;
 
-	@Autowired
-	private CSVService csvService;
-
 	@Autowired
 	private SubmissionService submissionService;
 
@@ -130,6 +117,7 @@ public class AssignmentController {
 			Model model) {
 		SubmitAssignmentDetailsDTO assignment = assignmentService.getSubmitAssignmentDetails(id.getId());
 		model.addAttribute("assignment", assignment);
+		model.addAttribute("edition", editionService.getEdition(assignment.getModule().getEdition().getId()));
 
 		boolean isStaff = authorizationService.isAtLeastTAInAssignment(id.getId());
 
@@ -216,6 +204,7 @@ public class AssignmentController {
 		groupCache.get(submissions.stream().map(s -> s.getGroup().getId()).distinct());
 
 		model.addAttribute("assignment", assignment);
+		model.addAttribute("edition", editionService.getEdition(assignment.getModule().getEdition().getId()));
 		model.addAttribute("submissions", submissions);
 		model.addAttribute("gradeCreate", new GradedFeedbackCreateDTO());
 		model.addAttribute("grades", submissions.stream()
@@ -238,6 +227,7 @@ public class AssignmentController {
 		AssignmentModuleDetailsDTO assignment = assignmentService.getAssignmentModuleDetails(id);
 
 		model.addAttribute("assignment", assignment);
+		model.addAttribute("edition", editionService.getEdition(assignment.getModule().getEdition().getId()));
 		model.addAttribute("statistics", statisticsService.getAssignmentStatistics(assignment));
 
 		return "assignment/statistics";
@@ -258,6 +248,7 @@ public class AssignmentController {
 		AssignmentModuleDetailsDTO assignment = assignmentService.getAssignmentModuleDetails(id);
 
 		model.addAttribute("assignment", assignment);
+		model.addAttribute("edition", editionService.getEdition(assignment.getModule().getEdition().getId()));
 		model.addAttribute("data", statisticsService.getAssignmentTableData(assignment, q,
 				status == null || status.equals("all") ? null : GradeStatistics.valueOf(status),
 				Long.valueOf(-1L).equals(version) ? null : version));