Fix ForeignKeys

aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py

-# Generated by Django 3.0.2 on 2020-03-08 13:49
+# Generated by Django 3.0.3 on 2020-03-08 20:16
 
 import colorfield.fields
 import django.contrib.postgres.fields.jsonb
@@ -18,15 +18,13 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('extended_data', django.contrib.postgres.fields.jsonb.JSONField(default=dict, editable=False)),
-                ('datefrom', models.DateField(null=True, verbose_name='Effective start date of absence')),
-                ('dateto', models.DateField(null=True, verbose_name='Effective end date of absence')),
-                ('periodfrom', models.IntegerField(null=True, verbose_name='Effective start period of absence')),
-                ('periodto', models.IntegerField(null=True, verbose_name='Effective end period of absence')),
+                ('date_start', models.DateField(null=True, verbose_name='Effective start date of absence')),
+                ('date_end', models.DateField(null=True, verbose_name='Effective end date of absence')),
                 ('comment', models.TextField(verbose_name='Comment')),
             ],
             options={
                 'verbose_name': 'Absence',
-                'ordering': ['datefrom'],
+                'ordering': ['date_start'],
             },
         ),
         migrations.CreateModel(
@@ -47,14 +45,14 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('extended_data', django.contrib.postgres.fields.jsonb.JSONField(default=dict, editable=False)),
                 ('title', models.CharField(max_length=50, verbose_name='Title')),
-                ('datefrom', models.DateField(null=True, verbose_name='Effective start date of event')),
-                ('dateto', models.DateField(null=True, verbose_name='Effective end 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')),
                 ('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',
-                'ordering': ['datefrom'],
+                'ordering': ['date_start'],
             },
         ),
         migrations.CreateModel(
@@ -63,8 +61,6 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('extended_data', django.contrib.postgres.fields.jsonb.JSONField(default=dict, editable=False)),
                 ('date', models.DateField(null=True, verbose_name='Date of exam')),
-                ('periodfrom', models.IntegerField(null=True, verbose_name='Effective start period of exam')),
-                ('periodto', models.IntegerField(null=True, verbose_name='Effective end period of exam')),
                 ('title', models.CharField(max_length=50, verbose_name='Title')),
                 ('comment', models.TextField(verbose_name='Comment')),
             ],
@@ -78,13 +74,14 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('extended_data', django.contrib.postgres.fields.jsonb.JSONField(default=dict, editable=False)),
-                ('datefrom', models.DateField(null=True, verbose_name='Effective start date of holidays')),
-                ('dateto', models.DateField(null=True, verbose_name='Effective end date of holidays')),
+                ('title', models.CharField(max_length=50, verbose_name='Title of the holidays')),
+                ('date_start', models.DateField(null=True, verbose_name='Effective start date of holidays')),
+                ('date_end', models.DateField(null=True, verbose_name='Effective end date of holidays')),
                 ('comments', models.TextField(verbose_name='Comments')),
             ],
             options={
                 'verbose_name': 'Holiday',
-                'ordering': ['datefrom'],
+                'ordering': ['date_start'],
             },
         ),
         migrations.CreateModel(
@@ -102,26 +99,24 @@ class Migration(migrations.Migration):
                 'ordering': ['name'],
             },
         ),
-        migrations.CreateModel(
-            name='TimetableWidget',
-            fields=[
-            ],
-            options={
-                'verbose_name': 'Timetable widget',
-                'proxy': True,
-                'indexes': [],
-                'constraints': [],
-            },
-            bases=('core.dashboardwidget',),
-        ),
         migrations.AddIndex(
             model_name='holiday',
-            index=models.Index(fields=['datefrom', 'dateto'], name='chronos_hol_datefro_36520a_idx'),
+            index=models.Index(fields=['date_start', 'date_end'], name='chronos_hol_date_st_a47004_idx'),
         ),
         migrations.AddField(
             model_name='exam',
             name='lesson',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='lesson', to='chronos.Lesson'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='exams', to='chronos.Lesson'),
+        ),
+        migrations.AddField(
+            model_name='exam',
+            name='periodfrom',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='chronos.TimePeriod', verbose_name='Effective start period of exam'),
+        ),
+        migrations.AddField(
+            model_name='exam',
+            name='periodto',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='chronos.TimePeriod', verbose_name='Effective end period of exam'),
         ),
         migrations.AddField(
             model_name='event',
@@ -136,38 +131,48 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='event',
             name='periodfrom',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='periodfrom', to='chronos.TimePeriod', verbose_name='Effective start period of event'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='chronos.TimePeriod', verbose_name='Effective start period of event'),
         ),
         migrations.AddField(
             model_name='event',
             name='periodto',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='periodto', to='chronos.TimePeriod', verbose_name='Effective end period of event'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='chronos.TimePeriod', verbose_name='Effective end period of event'),
         ),
         migrations.AddField(
             model_name='event',
             name='subject',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subject', to='chronos.Subject', verbose_name='Subject'),
         ),
+        migrations.AddField(
+            model_name='absence',
+            name='periodfrom',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='chronos.TimePeriod', verbose_name='Effective start period of absence'),
+        ),
+        migrations.AddField(
+            model_name='absence',
+            name='periodto',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='chronos.TimePeriod', verbose_name='Effective end period of absence'),
+        ),
         migrations.AddField(
             model_name='absence',
             name='person',
-            field=models.ManyToManyField(related_name='fk_person', to='core.Person'),
+            field=models.ManyToManyField(related_name='absences', to='core.Person'),
         ),
         migrations.AddField(
             model_name='absence',
             name='reason',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reason', to='chronos.AbsenceReason'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='absences', to='chronos.AbsenceReason'),
         ),
         migrations.AddIndex(
             model_name='exam',
-            index=models.Index(fields=['periodfrom', 'periodto'], name='chronos_exa_periodf_2f686a_idx'),
+            index=models.Index(fields=['date'], name='chronos_exa_date_5ba442_idx'),
         ),
         migrations.AddIndex(
             model_name='event',
-            index=models.Index(fields=['periodfrom', 'periodto'], name='chronos_eve_periodf_1fa12c_idx'),
+            index=models.Index(fields=['periodfrom', 'periodto', 'date_start', 'date_end'], name='chronos_eve_periodf_56eb18_idx'),
         ),
         migrations.AddIndex(
             model_name='absence',
-            index=models.Index(fields=['datefrom', 'dateto'], name='chronos_abs_datefro_d55b67_idx'),
+            index=models.Index(fields=['date_start', 'date_end'], name='chronos_abs_date_st_337ff5_idx'),
         ),
     ]

aleksis/apps/chronos/models.py

@@ -597,13 +597,13 @@ class Absence(ExtensibleModel):
 
     date_start = models.DateField(verbose_name=_("Effective start 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)
-    periodto = models.IntegerField(verbose_name=_("Effective end period of absence"), null=True)
+    periodfrom = models.ForeignKey("TimePeriod", on_delete=models.CASCADE, verbose_name=_("Effective start period of absence"), null=True, related_name="+")
+    periodto = models.ForeignKey("TimePeriod", on_delete=models.CASCADE, verbose_name=_("Effective end period of absence"), null=True, related_name="+")
     comment = models.TextField(verbose_name=_("Comment"))
 
     class Meta:
-        ordering = ["datefrom"]
-        indexes = [models.Index(fields=["datefrom", "dateto"])]
+        ordering = ["date_start"]
+        indexes = [models.Index(fields=["date_start", "date_end"])]
         verbose_name = _("Absence")
 
 
@@ -611,26 +611,26 @@ 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("LessonPeriod", on_delete=models.CASCADE, verbose_name=_("Effective start period of exam"), null=True)
-    periodto = models.ForeignKey("LessonPeriod", on_delete=models.CASCADE, verbose_name=_("Effective end period of exam"), null=True)
+    periodfrom = models.ForeignKey("TimePeriod", on_delete=models.CASCADE, verbose_name=_("Effective start period of exam"), null=True, related_name="+")
+    periodto = models.ForeignKey("TimePeriod", on_delete=models.CASCADE, verbose_name=_("Effective end period of exam"), null=True, related_name="+")
     title = models.CharField(verbose_name=_("Title"), max_length=50)
     comment = models.TextField(verbose_name=_("Comment"))
 
     class Meta:
         ordering = ["date"]
-        indexes = [models.Index(fields=["periodfrom", "periodto", "date"])]
+        indexes = [models.Index(fields=["date"])]
         verbose_name = _("Exam")
 
 
 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)
-    dateto = models.DateField(verbose_name=_("Effective end date of holidays"), null=True)
+    date_start = models.DateField(verbose_name=_("Effective start date of holidays"), null=True)
+    date_end = models.DateField(verbose_name=_("Effective end date of holidays"), null=True)
     comments = models.TextField(verbose_name=_("Comments"))
 
     class Meta:
-        ordering = ["datefrom"]
-        indexes = [models.Index(fields=["datefrom", "dateto"])]
+        ordering = ["date_start"]
+        indexes = [models.Index(fields=["date_start", "date_end"])]
         verbose_name = _("Holiday")
 
 
@@ -648,18 +648,18 @@ class SupervisionArea(ExtensibleModel):
 
 class Event(ExtensibleModel):
     title = models.CharField(verbose_name=_("Title"), max_length=50)
-    datefrom = models.DateField(verbose_name=_("Effective start date of event"), null=True)
-    dateto = models.DateField(verbose_name=_("Effective end date of event"), null=True)
+    date_start = models.DateField(verbose_name=_("Effective start date of event"), null=True)
+    date_end = models.DateField(verbose_name=_("Effective end date of event"), null=True)
     absence_reason = models.ForeignKey("AbsenceReason", on_delete=models.CASCADE, related_name="absence_reason", verbose_name=_("Absence reason"))
-    periodfrom = models.ForeignKey("TimePeriod", on_delete=models.CASCADE, related_name="periodfrom", verbose_name=_("Effective start period of event"))
-    periodto = models.ForeignKey("TimePeriod", on_delete=models.CASCADE, related_name="periodto", verbose_name=_("Effective end period of event"))
+    periodfrom = models.ForeignKey("TimePeriod", on_delete=models.CASCADE, verbose_name=_("Effective start period of event"), related_name="+")
+    periodto = models.ForeignKey("TimePeriod", on_delete=models.CASCADE, verbose_name=_("Effective end period of event"), related_name="+")
     group = models.ForeignKey("core.Group", on_delete=models.CASCADE, related_name="group", verbose_name=_("Group"))
     subject = models.ForeignKey("Subject", on_delete=models.CASCADE, related_name="subject", verbose_name=_("Subject"))
     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 = ["datefrom"]
-        indexes = [models.Index(fields=["periodfrom", "periodto", "datefrom", "dateto"])]
+        ordering = ["date_start"]
+        indexes = [models.Index(fields=["periodfrom", "periodto", "date_start", "date_end"])]
         verbose_name = _("Event")
         verbose_name = _("Events")