Fix cleaning task ordering

tutorial01/onshift/models.py

@@ -17,6 +17,9 @@ class ShiftSlot(models.Model):
                 self.start.isoformat(timespec='minutes'),
                 self.end.isoformat(timespec='minutes'))
 
+    class Meta:
+        ordering = ['start', 'end']
+
 class WeeklyShift(models.Model):
     DAY_OF_THE_WEEK = (
         (0, g('Monday')),
@@ -34,6 +37,9 @@ class WeeklyShift(models.Model):
         return "{0} {1}".format(self.get_day_of_the_week_display(),
                 self.shift_slot)
 
+    class Meta:
+        ordering = ['day_of_the_week', 'shift_slot']
+
 
 class CleaningTask(models.Model):
     shift = models.ForeignKey(WeeklyShift, on_delete=models.CASCADE)

tutorial01/onshift/views.py

@@ -127,8 +127,7 @@ def cleaning_task(request, cleaning_task_id):
         'signoffs': signoffs, })
 
 def cleaning_schedule(request):
-    tasks = CleaningTask.objects.order_by('shift__day_of_the_week')\
-            .order_by('shift__shift_slot__start')
+    tasks = CleaningTask.objects.all()
     if 'show-inactive' not in request.GET:
             tasks = tasks.filter(active=True)
     return render(request, 'mellemfolk/cleaning-schedule.html',