From 738744c1437c457fef87450cc552d9736dde142d Mon Sep 17 00:00:00 2001 From: Konrad Date: Thu, 30 Oct 2025 17:46:07 +0100 Subject: [PATCH 1/2] machines under maintenance no longer show up when looking for machines --- src/make_queue/views/reservation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/make_queue/views/reservation.py b/src/make_queue/views/reservation.py index 717607ee7..cb351e87c 100644 --- a/src/make_queue/views/reservation.py +++ b/src/make_queue/views/reservation.py @@ -379,7 +379,7 @@ def form_valid(self, form): periods = [] for machine in form.cleaned_data['machine_type'].machines.all(): - if not machine.get_status() == Machine.Status.OUT_OF_ORDER: + if not (machine.get_status() == Machine.Status.OUT_OF_ORDER or machine.get_status() == Machine.Status.MAINTENANCE): periods.extend(self.get_periods(machine, required_time)) # Periods in the near future is more interesting than in the distant From 478cae73fe5f9dd856e5655a09220b1e9cd4689b Mon Sep 17 00:00:00 2001 From: Konrad Date: Thu, 6 Nov 2025 16:22:12 +0100 Subject: [PATCH 2/2] made statement prettier --- src/make_queue/views/reservation.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/make_queue/views/reservation.py b/src/make_queue/views/reservation.py index cb351e87c..11c622780 100644 --- a/src/make_queue/views/reservation.py +++ b/src/make_queue/views/reservation.py @@ -379,8 +379,9 @@ def form_valid(self, form): periods = [] for machine in form.cleaned_data['machine_type'].machines.all(): - if not (machine.get_status() == Machine.Status.OUT_OF_ORDER or machine.get_status() == Machine.Status.MAINTENANCE): - periods.extend(self.get_periods(machine, required_time)) + if machine.get_status() in (Machine.Status.OUT_OF_ORDER, Machine.Status.MAINTENANCE): + continue + periods.extend(self.get_periods(machine, required_time)) # Periods in the near future is more interesting than in the distant # future