[ConsecutiveQueueSlots] Fixed being able to take untakeable slots

CHANGELOG.md

@@ -15,10 +15,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - If a room has a map, students can now click the map to indicate their location. @rwbackx 
 
 ### Changed
-
 - Waiting time and processing time now uses consistent calculations. [@hpage](https://gitlab.ewi.tudelft.nl/hpage)
 ### Fixed
  - Fix the copying of labs  [@mmadara](https://gitlab.ewi.tudelft.nl/mmadara)
+ - Slot selection now throws an error if user selects non-consecutive slot in consecutive labs. [@hpage](https://gitlab.ewi.tudelft.nl/hpage)
 
 ## [2.4.0]
 

src/main/resources/static/js/time_slots.js

@@ -287,7 +287,7 @@ class TimeSlot {
      * @param requests The requests in the timeslot
      * @param options Optional configuration.
      */
-    constructor(id, start, end, occupancy, capacity, requests, options) {
+    constructor(id, start, end, occupancy, capacity, requests, options = {}) {
         this.id = id === undefined ? (TimeSlot.nextId++).toString() : id;
         this.start = start;
         this.end = end;

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

@@ -54,7 +54,7 @@
                         <span>Select a time slot</span>
                         <div id="slot-select" style="max-height: 30rem"></div>
                     </div>
-                    <p class="fw-500 colour-error" hidden id="time-slot-warning">Please select a time slot</p>
+                    <p class="fw-500 colour-error" hidden id="time-slot-warning">Please select a valid time slot</p>
                     <div>
                         <span>Selected time slot:</span>
                         <span id="selected-slot" class="fw-500">none</span>
@@ -120,7 +120,7 @@
 
                             // Show error if trying to enqueue without slot
                             document.getElementById("enqueue-form").addEventListener("submit", function (event) {
-                                if (timeSlots.selected === undefined) {
+                                if (timeSlots.selected === undefined || timeSlots.selected.untakable) {
                                     document.getElementById("time-slot-warning").removeAttribute("hidden");
                                     event.preventDefault();
                                     event.stopPropagation();