Skip to content
Snippets Groups Projects
Verified Commit 19170706 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Fix week default.

parent 6dc36e3e
No related branches found
No related tags found
No related merge requests found
...@@ -85,7 +85,7 @@ class Migration(migrations.Migration): ...@@ -85,7 +85,7 @@ class Migration(migrations.Migration):
name='LessonSubstitution', name='LessonSubstitution',
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('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')), ('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')), ('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')), ('school', models.ForeignKey(default=biscuit.core.util.core_helpers.get_current_school, on_delete=django.db.models.deletion.CASCADE, to='core.School')),
......
...@@ -116,7 +116,7 @@ class Lesson(SchoolRelated): ...@@ -116,7 +116,7 @@ class Lesson(SchoolRelated):
class LessonSubstitution(SchoolRelated): class LessonSubstitution(SchoolRelated):
week = models.IntegerField(verbose_name=_('Week'), week = models.IntegerField(verbose_name=_('Week'),
default=CalendarWeek().week) default=CalendarWeek.current_week)
lesson_period = models.ForeignKey( lesson_period = models.ForeignKey(
'LessonPeriod', models.CASCADE, 'substitutions') 'LessonPeriod', models.CASCADE, 'substitutions')
......
...@@ -22,6 +22,12 @@ class CalendarWeek: ...@@ -22,6 +22,12 @@ class CalendarWeek:
return cls(year=when.year, week=int(when.strftime('%V'))) 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: def __post_init__(self) -> None:
today = date.today() today = date.today()
......
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