Skip to content
Snippets Groups Projects
Verified Commit dd278d28 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Remove superfluous fields

- timefrom/timeto from Event
- periodfrom from Exam
parent 11a2224a
No related branches found
No related tags found
1 merge request!39Resolve "Models for advanced features from SchoolApps (imported from Untis)"
...@@ -47,8 +47,6 @@ class Migration(migrations.Migration): ...@@ -47,8 +47,6 @@ class Migration(migrations.Migration):
('title', models.CharField(max_length=50, verbose_name='Title')), ('title', models.CharField(max_length=50, verbose_name='Title')),
('date_start', models.DateField(null=True, verbose_name='Effective start date of event')), ('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')), ('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={ options={
'verbose_name': 'Events', 'verbose_name': 'Events',
......
...@@ -617,7 +617,6 @@ class Exam(ExtensibleModel): ...@@ -617,7 +617,6 @@ class Exam(ExtensibleModel):
lesson = models.ForeignKey("Lesson", on_delete=models.CASCADE, related_name="exams") 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.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_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="+") 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): ...@@ -665,8 +664,6 @@ class Event(ExtensibleModel):
groups = models.ManyToManyField("core.Group", related_name="events", verbose_name=_("Groups")) groups = models.ManyToManyField("core.Group", related_name="events", verbose_name=_("Groups"))
rooms = models.ManyToManyField("Room", related_name="events", verbose_name=_("Rooms")) rooms = models.ManyToManyField("Room", related_name="events", verbose_name=_("Rooms"))
teachers = models.ManyToManyField("core.Person", related_name="events", verbose_name=_("Teachers")) 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: class Meta:
ordering = ["date_start"] ordering = ["date_start"]
......
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