Skip to content
Snippets Groups Projects
Verified Commit 674a8c43 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Add ordering to models. Advances BiscuIT-ng#54.

parent 442d030f
No related branches found
No related tags found
No related merge requests found
...@@ -42,6 +42,7 @@ class TimePeriod(models.Model): ...@@ -42,6 +42,7 @@ class TimePeriod(models.Model):
class Meta: class Meta:
unique_together = [['weekday', 'period']] unique_together = [['weekday', 'period']]
ordering = ['weekday', 'period']
class Subject(models.Model): class Subject(models.Model):
...@@ -58,6 +59,9 @@ class Subject(models.Model): ...@@ -58,6 +59,9 @@ class Subject(models.Model):
def __str__(self) -> str: def __str__(self) -> str:
return '%s - %s' % (self.abbrev, self.name) return '%s - %s' % (self.abbrev, self.name)
class Meta:
ordering = ['name', 'abbrev']
class Room(models.Model): class Room(models.Model):
short_name = models.CharField(verbose_name=_( short_name = models.CharField(verbose_name=_(
...@@ -68,6 +72,9 @@ class Room(models.Model): ...@@ -68,6 +72,9 @@ class Room(models.Model):
def __str__(self) -> str: def __str__(self) -> str:
return '%s (%s)' % (self.name, self.short_name) return '%s (%s)' % (self.name, self.short_name)
class Meta:
ordering = ['name', 'short_name']
class Lesson(models.Model): class Lesson(models.Model):
subject = models.ForeignKey( subject = models.ForeignKey(
...@@ -82,6 +89,10 @@ class Lesson(models.Model): ...@@ -82,6 +89,10 @@ class Lesson(models.Model):
date_end = models.DateField(verbose_name=_( date_end = models.DateField(verbose_name=_(
'Effective end date of lesson'), null=True) 'Effective end date of lesson'), null=True)
class Meta:
ordering = ['date_start']
class LessonSubstitution(models.Model): class LessonSubstitution(models.Model):
week = models.IntegerField(verbose_name=_('Week'), week = models.IntegerField(verbose_name=_('Week'),
default=current_week) default=current_week)
...@@ -96,6 +107,9 @@ class LessonSubstitution(models.Model): ...@@ -96,6 +107,9 @@ class LessonSubstitution(models.Model):
related_name='lesson_substitutions') related_name='lesson_substitutions')
room = models.ForeignKey('Room', models.CASCADE, null=True) room = models.ForeignKey('Room', models.CASCADE, null=True)
class Meta:
ordering = ['lesson_period__lesson__date_start', 'week', 'lesson_period__period__weekday', 'lesson_period__period__period']
class LessonPeriod(models.Model): class LessonPeriod(models.Model):
lesson = models.ForeignKey('Lesson', models.CASCADE, related_name='lesson_periods') lesson = models.ForeignKey('Lesson', models.CASCADE, related_name='lesson_periods')
...@@ -127,3 +141,6 @@ class LessonPeriod(models.Model): ...@@ -127,3 +141,6 @@ class LessonPeriod(models.Model):
def get_groups(self) -> models.query.QuerySet: def get_groups(self) -> models.query.QuerySet:
return self.lesson.groups return self.lesson.groups
class Meta:
ordering = ['lesson__date_start', 'period__weekday', 'period__period']
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment