From 528ed6efca77172d6f9e063b531eab358a5a9393 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sat, 28 Mar 2020 12:56:35 +0100
Subject: [PATCH] Add missing fields for LessonSubstitution
cancelled_for_teachers, comment
---
.../migrations/0007_advanced_models_from_untis.py | 15 +++++++++++++++
aleksis/apps/chronos/models.py | 7 +++++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py b/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py
index e7ae5fc0..afca61fc 100644
--- a/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py
+++ b/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py
@@ -178,4 +178,19 @@ class Migration(migrations.Migration):
model_name='absence',
index=models.Index(fields=['date_start', 'date_end'], name='chronos_abs_date_st_337ff5_idx'),
),
+ migrations.AddField(
+ model_name='lessonsubstitution',
+ name='cancelled_for_teachers',
+ field=models.BooleanField(default=False, verbose_name='Cancelled for teachers?'),
+ ),
+ migrations.AddField(
+ model_name='lessonsubstitution',
+ name='comment',
+ field=models.TextField(blank=True, null=True, verbose_name='Comment'),
+ ),
+ migrations.AlterField(
+ model_name='lessonsubstitution',
+ name='cancelled',
+ field=models.BooleanField(default=False, verbose_name='Cancelled?'),
+ ),
]
diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py
index 7e05735e..49b57d66 100644
--- a/aleksis/apps/chronos/models.py
+++ b/aleksis/apps/chronos/models.py
@@ -467,7 +467,10 @@ class LessonSubstitution(models.Model):
)
room = models.ForeignKey("Room", models.CASCADE, null=True, blank=True, verbose_name=_("Room"))
- cancelled = models.BooleanField(default=False)
+ cancelled = models.BooleanField(default=False, verbose_name=_("Cancelled?"))
+ cancelled_for_teachers = models.BooleanField(default=False, verbose_name=_("Cancelled for teachers?"))
+
+ comment = models.TextField(verbose_name=_("Comment"), blank=True, null=True)
def clean(self) -> None:
if self.subject and self.cancelled:
@@ -667,6 +670,6 @@ class Event(ExtensibleModel):
class Meta:
ordering = ["date_start"]
- indexes = [models.Index(fields=["periodfrom", "periodto", "date_start", "date_end"])]
+ indexes = [models.Index(fields=["period_from", "period_to", "date_start", "date_end"])]
verbose_name = _("Event")
verbose_name = _("Events")
--
GitLab