Skip to content
Snippets Groups Projects
Verified Commit 06011756 authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Update model fields

parent 027789fa
No related branches found
No related tags found
1 merge request!39Resolve "Models for advanced features from SchoolApps (imported from Untis)"
...@@ -592,11 +592,11 @@ class AbsenceReason(ExtensibleModel): ...@@ -592,11 +592,11 @@ class AbsenceReason(ExtensibleModel):
verbose_name = _("Absence reason") verbose_name = _("Absence reason")
class Absence(ExtensibleModel): class Absence(ExtensibleModel):
reason = models.ForeignKey("AbsenceReason", on_delete=models.CASCADE, related_name="reason") reason = models.ForeignKey("AbsenceReason", on_delete=models.CASCADE, related_name="absences")
person = models.ManyToManyField("core.Person", related_name="fk_person") person = models.ManyToManyField("core.Person", related_name="absences")
datefrom = models.DateField(verbose_name=_("Effective start date of absence"), null=True) date_start = models.DateField(verbose_name=_("Effective start date of absence"), null=True)
dateto = models.DateField(verbose_name=_("Effective end date of absence"), null=True) date_end = models.DateField(verbose_name=_("Effective end date of absence"), null=True)
periodfrom = models.IntegerField(verbose_name=_("Effective start period of absence"), null=True) periodfrom = models.IntegerField(verbose_name=_("Effective start period of absence"), null=True)
periodto = models.IntegerField(verbose_name=_("Effective end period of absence"), null=True) periodto = models.IntegerField(verbose_name=_("Effective end period of absence"), null=True)
comment = models.TextField(verbose_name=_("Comment")) comment = models.TextField(verbose_name=_("Comment"))
...@@ -608,21 +608,22 @@ class Absence(ExtensibleModel): ...@@ -608,21 +608,22 @@ class Absence(ExtensibleModel):
class Exam(ExtensibleModel): class Exam(ExtensibleModel):
lesson = models.ForeignKey("Lesson", on_delete=models.CASCADE, related_name="lesson") lesson = models.ForeignKey("Lesson", on_delete=models.CASCADE, related_name="exams")
date = models.DateField(verbose_name=_("Date of exam"), null=True) date = models.DateField(verbose_name=_("Date of exam"), null=True)
periodfrom = models.IntegerField(verbose_name=_("Effective start period of exam"), null=True) periodfrom = models.ForeignKey("LessonPeriod", on_delete=models.CASCADE, verbose_name=_("Effective start period of exam"), null=True)
periodto = models.IntegerField(verbose_name=_("Effective end period of exam"), null=True) periodto = models.ForeignKey("LessonPeriod", on_delete=models.CASCADE, verbose_name=_("Effective end period of exam"), null=True)
title = models.CharField(verbose_name=_("Title"), max_length=50) title = models.CharField(verbose_name=_("Title"), max_length=50)
comment = models.TextField(verbose_name=_("Comment")) comment = models.TextField(verbose_name=_("Comment"))
class Meta: class Meta:
ordering = ["date"] ordering = ["date"]
indexes = [models.Index(fields=["periodfrom", "periodto"])] indexes = [models.Index(fields=["periodfrom", "periodto", "date"])]
verbose_name = _("Exam") verbose_name = _("Exam")
class Holiday(ExtensibleModel): class Holiday(ExtensibleModel):
title = models.CharField(verbose_name=_("Title of the holidays"), max_length=50)
datefrom = models.DateField(verbose_name=_("Effective start date of holidays"), null=True) datefrom = models.DateField(verbose_name=_("Effective start date of holidays"), null=True)
dateto = models.DateField(verbose_name=_("Effective end date of holidays"), null=True) dateto = models.DateField(verbose_name=_("Effective end date of holidays"), null=True)
comments = models.TextField(verbose_name=_("Comments")) comments = models.TextField(verbose_name=_("Comments"))
...@@ -659,6 +660,6 @@ class Event(ExtensibleModel): ...@@ -659,6 +660,6 @@ class Event(ExtensibleModel):
class Meta: class Meta:
ordering = ["datefrom"] ordering = ["datefrom"]
indexes = [models.Index(fields=["periodfrom", "periodto"])] indexes = [models.Index(fields=["periodfrom", "periodto", "datefrom", "dateto"])]
verbose_name = _("Event") verbose_name = _("Event")
verbose_name = _("Events") verbose_name = _("Events")
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