Merge branch 'effecientCount' into 'development'

Only work with open labs on /request page

See merge request EIP/queue!77

src/main/java/nl/tudelft/ewi/queue/controller/LabController.java

@@ -71,7 +71,16 @@ public class LabController {
             model.addAttribute("requests", lab.getPending());
         }
 
+        List<Request> requestsForLab;
+        if (user.teaches(lab.getCourse()) || user.manages(lab.getCourse()) || user.assists(lab.getCourse())) {
+            requestsForLab = lab.getRequests();
+        }
+        else {
+            requestsForLab = lab.requestsBy(user);
+        }
+
         model.addAttribute("lab", lab);
+        model.addAttribute("requestsForLab", requestsForLab);
         model.addAttribute("course", lab.getCourse());
 
         return "lab/view";

src/main/java/nl/tudelft/ewi/queue/controller/RequestController.java

@@ -97,12 +97,13 @@ public class RequestController {
 
         List<Lab> activeLabs = courses.stream()
             .flatMap(course -> course.getLabs().stream())
+            .filter(Lab::isOpenOrSlotSelection)
             .distinct()
             .collect(Collectors.toList());
 
-        List<Long> activeLabIds = new ArrayList<>();
-        for(Lab lab : activeLabs)
-            activeLabIds.add(lab.getId());
+        List<Long> activeLabIds = activeLabs.stream()
+                .map(Lab::getId)
+                .collect(Collectors.toList());
 
         List<Assignment> assignments = activeLabs.stream()
                 .flatMap(lab -> lab.getAssignments().stream())

src/main/resources/templates/lab/view.html

@@ -186,7 +186,7 @@
                 <th>Feedback</th>
                 </thead>
                 <tbody>
-                <tr th:each="request : ${lab.requestsBy(#authentication.principal.user)}" class="text-white"
+                <tr th:each="request : ${requestsForLab}" class="text-white"
                     th:classappend="${#filter.mapStatusToBootstrapColor(request.status)}">
                     <td><span class="badge badge-pill bg-info" th:text="${request.status}"></span></td>
                     <td><a href="#" class="text-white" th:href="@{/request/{id}(id=${request.id})}"