diff --git a/biscuit/apps/chronos/migrations/0001_initial.py b/biscuit/apps/chronos/migrations/0001_initial.py index 6fdf91d7c6bf58646b064dc99b6fb640de6191c7..9f3790ac458a4ff9ba56599dd97babeed853f894 100644 --- a/biscuit/apps/chronos/migrations/0001_initial.py +++ b/biscuit/apps/chronos/migrations/0001_initial.py @@ -85,7 +85,7 @@ class Migration(migrations.Migration): name='LessonSubstitution', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('week', models.IntegerField(default=biscuit.apps.chronos.util.current_week, verbose_name='Week')), + ('week', models.IntegerField(default=biscuit.apps.chronos.util.CalendarWeek.current_week, verbose_name='Week')), ('lesson_period', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='substitutions', to='chronos.LessonPeriod')), ('room', models.ForeignKey(null=True, blank=True, on_delete=django.db.models.deletion.CASCADE, to='chronos.Room')), ('school', models.ForeignKey(default=biscuit.core.util.core_helpers.get_current_school, on_delete=django.db.models.deletion.CASCADE, to='core.School')), diff --git a/biscuit/apps/chronos/models.py b/biscuit/apps/chronos/models.py index b8498ae4ad7eedbe9c7f9d8728ec3be69a27241f..6f6d6229c0a0c2cca376d40e18dfd59b54a64377 100644 --- a/biscuit/apps/chronos/models.py +++ b/biscuit/apps/chronos/models.py @@ -116,7 +116,7 @@ class Lesson(SchoolRelated): class LessonSubstitution(SchoolRelated): week = models.IntegerField(verbose_name=_('Week'), - default=CalendarWeek().week) + default=CalendarWeek.current_week) lesson_period = models.ForeignKey( 'LessonPeriod', models.CASCADE, 'substitutions') diff --git a/biscuit/apps/chronos/util.py b/biscuit/apps/chronos/util.py index 710d79491c5103b2dd8e42a95ab89f421d6d1a5f..f3988f425a70e4b59f9196dad58966c9175e6dcd 100644 --- a/biscuit/apps/chronos/util.py +++ b/biscuit/apps/chronos/util.py @@ -22,6 +22,12 @@ class CalendarWeek: return cls(year=when.year, week=int(when.strftime('%V'))) + @classmethod + def current_week(cls) -> int: + """ Get the current week number. """ + + return cls().week + def __post_init__(self) -> None: today = date.today()