diff --git a/biscuit/apps/untis/api.py b/biscuit/apps/untis/api.py index e5198baa0063eb19dea17a62168ec047b6e53525..00584b0607a76d8b097dfa2670c354bc2f6f01c9 100755 --- a/biscuit/apps/untis/api.py +++ b/biscuit/apps/untis/api.py @@ -292,7 +292,13 @@ class Absence(object): self.filled = True print(db_obj.ida) print(db_obj.typea) - self.type = TYPE_TEACHER if db_obj.typea != 102 and db_obj.typea != 100 else TYPE_ROOM + if db_obj.typea == 101: + self.type = TYPE_TEACHER + elif db_obj.typea == 100: + self.type = TYPE_CLASS + elif db_obj.typea == 102: + self.type = TYPE_ROOM + if self.type == TYPE_TEACHER: print("IDA", db_obj.ida) self.teacher = get_teacher_by_id(db_obj.ida) @@ -310,6 +316,7 @@ def get_all_absences_by_date(date): db_rows = run_all(models.Absence.objects.filter(dateto__gte=d_i, datefrom__lte=d_i, deleted=0), filter_term=False) return row_by_row_helper(db_rows, Absence) + ######### # EVENT # ######### @@ -319,8 +326,8 @@ class Event(object): self.filled = None self.text = None self.teachers = [] - self.classes = [] - self.rooms = [] + self.classes = [] + self.rooms = [] self.absences = [] self.from_date = None self.to_date = None @@ -362,6 +369,7 @@ def get_all_events_by_date(date): db_rows = run_all(models.Event.objects.filter(dateto__gte=d_i, datefrom__lte=d_i, deleted=0), filter_term=False) return row_by_row_helper(db_rows, Event) + ########## # LESSON # ########## diff --git a/biscuit/apps/untis/events.py b/biscuit/apps/untis/events.py index 2d13314eb632640c2220355e5d805e4bdb3e4416..47b0a262b4e58c76a31913302dd953c29a56a690 100644 --- a/biscuit/apps/untis/events.py +++ b/biscuit/apps/untis/events.py @@ -53,9 +53,12 @@ class Event(object): self.rooms.append(obj) if element[4] != "0" and element[4] != "": - absence = models.Absence.objects.using("untis").get(absence_id=int(element[4])) - self.absences.append(absence) - + print(element[4]) + try: + absence = models.Absence.objects.using("untis").get(absence_id=int(element[4])) + self.absences.append(absence) + except models.Absence.DoesNotExist: + pass self.text = db_obj.text self.from_date = untis_date_to_date(db_obj.datefrom) self.to_date = untis_date_to_date(db_obj.dateto)