Merge branch 'small-fixes' into 'development'

Small fixes

See merge request EIP/queue!92

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

@@ -118,7 +118,7 @@ public class RequestController {
 
         List<Lab> activeLabs = courses.stream()
             .flatMap(course -> course.getLabs().stream())
-            .filter(Lab::isOpenOrSlotSelection)
+            .filter(Lab::display)
             .distinct()
             .collect(Collectors.toList());
 
@@ -150,7 +150,6 @@ public class RequestController {
             .addAttribute("requests", filteredRequests)
             .addAttribute("state", parameters)
             .addAttribute("courses", courses)
-            .addAttribute("labs", labs)
             .addAttribute("rooms", rooms)
             .addAttribute("assignments", assignments)
             .addAttribute("activeLabs", activeLabs)

src/main/java/nl/tudelft/ewi/queue/model/Lab.java

@@ -30,6 +30,8 @@ import java.util.OptionalDouble;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static java.time.LocalDateTime.now;
+
 @Entity
 @SQLDelete(sql = "UPDATE lab SET deleted_at = NOW(), slot_id = NULL WHERE id = ?")
 @Where(clause = "deleted_at IS NULL")
@@ -258,14 +260,14 @@ public class Lab implements Serializable {
 
     public OptionalDouble averageWaitingDouble() {
         return getHandled().stream()
-                .filter(r -> r.getCreatedAt().isAfter(LocalDateTime.now().minusHours(1)))
+                .filter(r -> r.getCreatedAt().isAfter(now().minusHours(1)))
                 .mapToLong(Request::waitingTime)
                 .average();
     }
 
     public OptionalDouble averageProcessingDouble() {
         return getHandled().stream()
-                .filter(r -> r.getCreatedAt().isAfter(LocalDateTime.now().minusHours(1)))
+                .filter(r -> r.getCreatedAt().isAfter(now().minusHours(1)))
                 .mapToLong(Request::processingTime)
                 .average();
     }
@@ -284,7 +286,7 @@ public class Lab implements Serializable {
 
     public Stream<User> activeAssistants() {
         return getArchived().stream()
-                .filter(r -> r.getCreatedAt().isAfter(LocalDateTime.now().minusHours(1)))
+                .filter(r -> r.getCreatedAt().isAfter(now().minusHours(1)))
                 .map(Request::getAssistant).filter(Objects::nonNull);
     }
 
@@ -416,7 +418,7 @@ public class Lab implements Serializable {
     }
 
     public Boolean slotIsAvailable(RequestSlot slot) {
-        LocalDateTime twoMinutesGracePeriod = LocalDateTime.now().minusMinutes(2L);
+        LocalDateTime twoMinutesGracePeriod = now().minusMinutes(2L);
         if (slot.getOpensAt().isBefore(twoMinutesGracePeriod)) {
             return false;
         }
@@ -501,18 +503,22 @@ public class Lab implements Serializable {
     }
 
     public boolean isOpen() {
-        return slot.contains(LocalDateTime.now());
+        return slot.contains(now());
     }
 
     public boolean slotSelectionIsOpen() {
-        return signOffIntervals && slotSelectionOpensAt != null && LocalDateTime.now().isAfter(slotSelectionOpensAt)
-                && LocalDateTime.now().isBefore(getSlot().getClosesAt());
+        return signOffIntervals && slotSelectionOpensAt != null && now().isAfter(slotSelectionOpensAt)
+                && now().isBefore(getSlot().getClosesAt());
     }
 
     public boolean isOpenOrSlotSelection() {
         return isOpen() || slotSelectionIsOpen();
     }
 
+    public boolean display() {
+        return slot.getClosesAt().plusMinutes(15).isAfter(now()) || isOpenOrSlotSelection();
+    }
+
     public List<Room> getRooms() {
         return rooms;
     }
@@ -683,7 +689,7 @@ public class Lab implements Serializable {
                 .filter(request -> request.getStatus().equals(Request.Status.PENDING))
                 .collect(Collectors.toList());
         if (getSignOffIntervals()) {
-            LocalDateTime tenMinutes = LocalDateTime.now().plusMinutes(10L);
+            LocalDateTime tenMinutes = now().plusMinutes(10L);
             queuedForThisLab = queuedForThisLab.stream().filter(req -> req.getSlot() != null &&
                     req.getSlot().getOpensAt().isBefore(tenMinutes))
                     .collect(Collectors.toList());

src/main/resources/templates/request/list/filters.html

@@ -27,7 +27,7 @@
             <div class="form-group filter">
                 <label class="form-control-label" for="labSelect">Lab</label>
                 <select multiple="multiple" class="form-control" id="labSelect" name="lab">
-                    <th:block th:each="lab : ${labs}">
+                    <th:block th:each="lab : ${activeLabs}">
                         <option
                                 th:value="${lab.id}"
                                 th:unless="${#filter.valueInMultiMap('lab', lab, state)}" th:text="${lab.toReadableString()}">One