From 32b7e2d7a4d281ba61f50ecc59751eb3b0c68cab Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Tue, 13 Aug 2019 19:36:24 +0200
Subject: [PATCH] Bug fix
---
biscuit/apps/untis/api.py | 6 +++---
biscuit/apps/untis/events.py | 2 +-
biscuit/apps/untis/sub.py | 6 +++++-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/biscuit/apps/untis/api.py b/biscuit/apps/untis/api.py
index 45a3603..d903d5d 100755
--- a/biscuit/apps/untis/api.py
+++ b/biscuit/apps/untis/api.py
@@ -290,8 +290,8 @@ class Absence(object):
def create(self, db_obj):
self.filled = True
- print(db_obj.ida)
- print(db_obj.typea)
+ # print(db_obj.ida)
+ # print(db_obj.typea)
if db_obj.typea == 101:
self.type = TYPE_TEACHER
elif db_obj.typea == 100:
@@ -300,7 +300,7 @@ class Absence(object):
self.type = TYPE_ROOM
if self.type == TYPE_TEACHER:
- print("IDA", db_obj.ida)
+ # print("IDA", db_obj.ida)
self.teacher = get_teacher_by_id(db_obj.ida)
else:
self.room = get_room_by_id(db_obj.ida)
diff --git a/biscuit/apps/untis/events.py b/biscuit/apps/untis/events.py
index 8b91663..66f76c6 100644
--- a/biscuit/apps/untis/events.py
+++ b/biscuit/apps/untis/events.py
@@ -53,7 +53,7 @@ class Event(object):
self.rooms.append(obj)
if element[4] != "0" and element[4] != "":
- print(element[4])
+ # print(element[4])
try:
absence_id = int(element[4])
absence = get_absence_by_id(absence_id)
diff --git a/biscuit/apps/untis/sub.py b/biscuit/apps/untis/sub.py
index fecb3cc..a51afdc 100644
--- a/biscuit/apps/untis/sub.py
+++ b/biscuit/apps/untis/sub.py
@@ -331,6 +331,10 @@ def get_substitutions_by_date_as_dict(date):
for i, sub_raw in enumerate(subs_raw):
if sub_raw.lesson_id not in subs.keys():
subs[sub_raw.lesson_id] = []
- subs[sub_raw.lesson_id].append({"sub": sub_raw, "table": sub_table[i]})
+ sub_row = None
+ for sub_item in sub_table:
+ if sub_item.sub.id == sub_raw.id:
+ sub_row = sub_item
+ subs[sub_raw.lesson_id].append({"sub": sub_raw, "table": sub_row})
return subs
--
GitLab