From 127939d9fba7931fe8bb1da7b41996616d99bb79 Mon Sep 17 00:00:00 2001
From: Frank Poetzsch-Heffter <p-h@katharineum.de>
Date: Fri, 4 Oct 2019 08:51:10 +0200
Subject: [PATCH] =?UTF-8?q?rename=20class=20to=20aktuell=20in=20generate?=
=?UTF-8?q?=5Fpdf,=20exclude=20flags=20b=20(Verf=C3=BCgungsstunde)=20and?=
=?UTF-8?q?=20F=20(Lehrerfrei)=20in=20get=5Fsubstituitions=5Fby=5Fdate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
biscuit/apps/untis/sub.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/biscuit/apps/untis/sub.py b/biscuit/apps/untis/sub.py
index a51afdc..e7afef1 100644
--- a/biscuit/apps/untis/sub.py
+++ b/biscuit/apps/untis/sub.py
@@ -1,4 +1,5 @@
from django.utils import timezone
+from django.db.models import Q
from untisconnect import models
from untisconnect.api import run_default_filter, row_by_row_helper, format_classes, get_all_absences_by_date, \
@@ -316,7 +317,7 @@ def get_header_information(subs, date, events=[]):
def get_substitutions_by_date(date):
subs_raw = run_default_filter(
run_using(models.Substitution.objects.filter(date=date_to_untis_date(date), deleted=0).exclude(
- flags__contains="N").order_by("classids", "lesson")),
+ Q(flags__contains="N") | Q(flags__contains="b") | Q(flags__contains="F")).order_by("classids", "lesson")),
filter_term=False)
subs = row_by_row_helper(subs_raw, Substitution)
--
GitLab