Skip to content
Snippets Groups Projects

Resolve "[Queue-2.0] Only show Request Course button to teachers"

Files

@@ -34,8 +34,6 @@ import nl.tudelft.queue.cache.*;
import nl.tudelft.queue.dto.create.CourseRequestCreateDTO;
import nl.tudelft.queue.dto.create.QueueRoleCreateDTO;
import nl.tudelft.queue.dto.view.LabSummaryDTO;
import nl.tudelft.queue.model.Lab;
import nl.tudelft.queue.model.Request;
import nl.tudelft.queue.model.enums.LabType;
import nl.tudelft.queue.repository.LabRepository;
import nl.tudelft.queue.service.EditionService;
@@ -139,6 +137,7 @@ public class EditionController {
* @return The Thymeleaf template to resolve.
*/
@GetMapping("/editions/request-course")
@PreAuthorize("@permissionService.isAdminOrTeacher()")
public String getRequestCoursePage(Model model) {
model.addAttribute("dto", new CourseRequestCreateDTO());
@@ -456,24 +455,4 @@ public class EditionController {
.collect(Collectors.toList())),
LabSummaryDTO.class);
}
/**
* Gets the table containing the amount of requests each TA handled during the given list of labs.
*
* @param editionId The id of the edition the status page is viewed of.
* @param labs The list of labs whose requests should be counted.
* @param model The Thymeleaf model to fill out.
* @return The part of the Thymeleaf template to resolve.
*/
@GetMapping("/edition/{editionId}/status/freq/assistant")
@PreAuthorize("@permissionService.canViewEditionStatus(#editionId)")
public String getAssistantCounts(@PathVariable Long editionId,
@RequestParam(required = false, defaultValue = "") List<Lab> labs,
Model model) {
List<Request> requests = ess.getFilteredRequests(labs);
model.addAttribute("assistants", ess.countRequestsPerAssistant(requests).entrySet());
return "edition/view/status :: #assistant-table";
}
}
Loading