Update Templates | Update views | update SubRow-class | update...

Update Templates | Update views | update SubRow-class | update generateSubtable-function | update events | make everything work | but it doesn't work. Perhaps @hansegucker can help me

biscuit/apps/untis/events.py

+from django.conf import settings
+
 from .drive import drive
 from .api_helper import untis_date_to_date, date_to_untis_date
 from .api import row_by_row_helper, run_all
@@ -36,15 +38,18 @@ class Event(object):
                 self.classes.append(obj)
 
             if element[2] != "0" and element[2] != "":
-                teacher_id = int(element[0])
+                teacher_id = int(element[2])
                 obj = drive["teachers"][teacher_id]
                 self.teachers.append(obj)
 
             if element[3] != "0" and element[3] != "":
-                self.rooms.append(element[3])
+                room_id = int(element[3])
+                obj = drive["rooms"][room_id]
+                self.rooms.append(obj)
 
             if element[4] != "0" and element[4] != "":
-                self.absences.append(element[4])
+                absence = models.Absence.objects.using("untis").get(absence_id=int(element[4]))
+                self.absences.append(absence)
 
         self.text = db_obj.text
         self.from_date = untis_date_to_date(db_obj.datefrom)

biscuit/apps/untis/sub.py

@@ -145,12 +145,16 @@ class SubRow(object):
         self.classes = ""
         self.teacher = ""
         self.teacher_full = ""
+        self.teachers = []  # Only for events
+        self.rooms    = []  # Only for events
+        self.absences = []  # Only for events
         self.subject = ""
         self.subject_full = ""
         self.room = ""
         self.room_full = ""
         self.text = ""
         self.extra = ""
+        self.is_event = False
 
 
 def generate_teacher_row(sub, full=False):
@@ -210,7 +214,7 @@ def generate_room_row(sub, full=False):
     return room
 
 
-def generate_sub_table(subs):
+def generate_sub_table(subs, events=[]):
     """
     Parse substitutions and prepare than for displaying in plan
     :param subs: Substitutions to parse
@@ -261,6 +265,28 @@ def generate_sub_table(subs):
         sub_row.extra = "{} {}".format(sub.id, sub.lesson_id)
 
         sub_rows.append(sub_row)
+
+    for event in events:
+        sub_row = SubRow()
+        sub_row.is_event = True
+
+        sub_row.classes  = format_classes(event.classes)
+        sub_row.teachers = event.teachers
+        sub_row.rooms    = event.rooms
+        sub_row.absences = event.absences
+
+        sub_row.color = "purple"
+        sub_row.text = event.text
+
+        sub_rows.append(sub_row)
+
+    def returnClasses(sub_row):
+        # print(sub_row.classes, end=" | ")
+        return sub_row.classes
+
+    sub_rows.sort(key=returnClasses)
+
+
     return sub_rows