Skip to content
Snippets Groups Projects
Commit b2a19771 authored by Jochem de Goede's avatar Jochem de Goede
Browse files

Counter on view lab page showed all requests instead of only pending

parent b1ee79b6
No related branches found
No related tags found
No related merge requests found
...@@ -68,11 +68,11 @@ public class LabController { ...@@ -68,11 +68,11 @@ public class LabController {
if (lab.getSignOffIntervals()) { if (lab.getSignOffIntervals()) {
model.addAttribute("timeslots", labService.getIntervalsForLab(lab)); model.addAttribute("timeslots", labService.getIntervalsForLab(lab));
model.addAttribute("requests", lab.getPending());
} }
model.addAttribute("lab", lab); model.addAttribute("lab", lab);
model.addAttribute("course", lab.getCourse()); model.addAttribute("course", lab.getCourse());
model.addAttribute("requests", lab.getRequests());
return "lab/view"; return "lab/view";
} }
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<th:block th:if="${(#authenticated.teaches(course) || #authenticated.assists(course) || #authenticated.manages(course)) and lab.getSignOffIntervals()}"> <th:block th:if="${(#authenticated.teaches(course) || #authenticated.assists(course) || #authenticated.manages(course)) and lab.getSignOffIntervals()}">
<div class="col-sm-12" style="margin-top:1em;"> <div class="col-sm-12" style="margin-top:1em;">
<h3>Slot overview</h3> <h3>Slot overview</h3>
Total nr of requests submitted: <span th:inline="text">[[${requests.size()}]]</span> Total # of pending requests: <span th:inline="text">[[${requests.size()}]]</span>
<div class="col-sm-8 mb-3"> <div class="col-sm-8 mb-3">
<div class="row"> <div class="row">
<div class="col-sm-4" th:each="slot : ${timeslots}" th:value="${slot.getOpensAt()}"> <div class="col-sm-4" th:each="slot : ${timeslots}" th:value="${slot.getOpensAt()}">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment