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 90c97f7b3dc3b1917b40987e9cce30543277fabf..18a1073108e909afe9082689aa6e0952239cf00f 100644 --- a/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py +++ b/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py @@ -47,8 +47,6 @@ class Migration(migrations.Migration): ('title', models.CharField(max_length=50, verbose_name='Title')), ('date_start', models.DateField(null=True, verbose_name='Effective start date of event')), ('date_end', models.DateField(null=True, verbose_name='Effective end date of event')), - ('timefrom', models.DateTimeField(null=True, verbose_name='Effective start time of event')), - ('timeto', models.DateTimeField(null=True, verbose_name='Effective end time of event')), ], options={ 'verbose_name': 'Events', diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py index b746f8f0fa6754e5d148c7a04133acf79b35cc03..7e05735ede7a6642c1216fd28f4d9e0667372554 100644 --- a/aleksis/apps/chronos/models.py +++ b/aleksis/apps/chronos/models.py @@ -617,7 +617,6 @@ class Exam(ExtensibleModel): lesson = models.ForeignKey("Lesson", on_delete=models.CASCADE, related_name="exams") date = models.DateField(verbose_name=_("Date of exam"), null=True) - periodfrom = models.ForeignKey("TimePeriod", on_delete=models.CASCADE, verbose_name=_("Effective start period of exam"), null=True, related_name="+") period_from = models.ForeignKey("TimePeriod", on_delete=models.CASCADE, verbose_name=_("Effective start period of exam"), null=True, related_name="+") period_to = models.ForeignKey("TimePeriod", on_delete=models.CASCADE, verbose_name=_("Effective end period of exam"), null=True, related_name="+") @@ -665,8 +664,6 @@ class Event(ExtensibleModel): groups = models.ManyToManyField("core.Group", related_name="events", verbose_name=_("Groups")) rooms = models.ManyToManyField("Room", related_name="events", verbose_name=_("Rooms")) teachers = models.ManyToManyField("core.Person", related_name="events", verbose_name=_("Teachers")) - timefrom = models.DateTimeField(verbose_name=_("Effective start time of event"), null=True) - timeto = models.DateTimeField(verbose_name=_("Effective end time of event"), null=True) class Meta: ordering = ["date_start"]