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 f6bd2e4e0ac6467c3549f50adf7d97a7909ea0ba..add8928ade55d08003bf2c829aaec8959872e8ad 100644 --- a/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py +++ b/aleksis/apps/chronos/migrations/0007_advanced_models_from_untis.py @@ -76,17 +76,17 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='exam', - name='fk_lesson', + name='lesson', field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='lesson', to='chronos.Lesson'), ), migrations.AddField( model_name='absence', - name='fk_person', - field=models.ManyToManyField(related_name='fk_person', to='core.Person'), + name='person', + field=models.ManyToManyField(related_name='person', to='core.Person'), ), migrations.AddField( model_name='absence', - name='fk_reason', + name='reason', field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reason', to='chronos.AbsenceReason'), ), migrations.AddIndex( diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py index f50be6210ca9c3e5381d6ec233f42841c51e1a41..012abce8fb7f11fb8bb7593cbfdf03237aef81fc 100644 --- a/aleksis/apps/chronos/models.py +++ b/aleksis/apps/chronos/models.py @@ -591,8 +591,8 @@ class AbsenceReason(ExtensibleModel): verbose_name = _("Absence reason") class Absence(ExtensibleModel): - fk_reason = models.ForeignKey("AbsenceReason", on_delete=models.CASCADE, related_name="reason") - fk_person = models.ManyToManyField("core.Person", related_name="fk_person") + reason = models.ForeignKey("AbsenceReason", on_delete=models.CASCADE, related_name="reason") + person = models.ManyToManyField("core.Person", related_name="fk_person") datefrom = models.DateField(verbose_name=_("Effective start date of absence"), null=True) dateto = models.DateField(verbose_name=_("Effective end date of absence"), null=True) @@ -607,7 +607,7 @@ class Absence(ExtensibleModel): class Exam(ExtensibleModel): - fk_lesson = models.ForeignKey("Lesson", on_delete=models.CASCADE, related_name="lesson") + lesson = models.ForeignKey("Lesson", on_delete=models.CASCADE, related_name="lesson") date = models.DateField(verbose_name=_("Date of exam"), null=True) periodfrom = models.IntegerField(verbose_name=_("Effective start period of exam"), null=True)