Merge branch 'dev-1.1' into feature/several-days-in-one-tex-document-#288

biscuit/apps/untis/api.py

@@ -10,6 +10,7 @@ TYPE_CLASS = 2
 
 from datetime import date
 
+
 def run_all(obj, filter_term=True):
     return run_default_filter(run_using(obj).all(), filter_term=filter_term)
 
@@ -74,6 +75,13 @@ class Teacher(object):
         else:
             return "Unbekannt"
 
+    def __eq__(self, other):
+        if not isinstance(other, Teacher):
+            # don't attempt to compare against unrelated types
+            return NotImplemented
+
+        return self.id == other.id
+
     def create(self, db_obj):
         self.filled = True
         self.id = db_obj.teacher_id
@@ -116,6 +124,13 @@ class Class(object):
         else:
             return "Unbekannt"
 
+    def __eq__(self, other):
+        if not isinstance(other, Class):
+            # don't attempt to compare against unrelated types
+            return NotImplemented
+
+        return self.id == other.id
+
     def create(self, db_obj):
         self.filled = True
         self.id = db_obj.class_id
@@ -187,6 +202,13 @@ class Room(object):
         else:
             return "Unbekannt"
 
+    def __eq__(self, other):
+        if not isinstance(other, Room):
+            # don't attempt to compare against unrelated types
+            return NotImplemented
+
+        return self.id == other.id
+
     def create(self, db_obj):
         self.filled = True
         self.id = db_obj.room_id
@@ -219,6 +241,13 @@ class Corridor(object):
         else:
             return "Unbekannt"
 
+    def __eq__(self, other):
+        if not isinstance(other, Corridor):
+            # don't attempt to compare against unrelated types
+            return NotImplemented
+
+        return self.id == other.id
+
     def create(self, db_obj):
         self.filled = True
         self.id = db_obj.corridor_id
@@ -248,6 +277,19 @@ class Subject(object):
         self.color = None
         self.hex_color = None
 
+    def __str__(self):
+        if self.filled:
+            return self.shortcode or "Unbekannt"
+        else:
+            return "Unbekannt"
+
+    def __eq__(self, other):
+        if not isinstance(other, Teacher):
+            # don't attempt to compare against unrelated types
+            return NotImplemented
+
+        return self.id == other.id
+
     def create(self, db_obj):
         self.filled = True
         self.id = db_obj.subject_id
@@ -384,6 +426,7 @@ def get_all_events_by_date(date):
 def get_raw_lessons():
     return run_all(models.Lesson.objects)
 
+
 ###########
 # HOLIDAY #
 ###########
@@ -408,7 +451,7 @@ class Holiday(object):
 
 
 def get_today_holidays(date):
-    #db_holidays = row_by_row(models.Holiday, Holiday)
+    # db_holidays = row_by_row(models.Holiday, Holiday)
     d_i = int(date_to_untis_date(date))
     db_rows = run_all(models.Holiday.objects.filter(dateto__gte=d_i, datefrom__lte=d_i), filter_term=False)
-    return row_by_row_helper(db_rows, Holiday)
+    return row_by_row_helper(db_rows, Holiday)
\ No newline at end of file