diff --git a/aleksis/apps/stoelindeling/migrations/0001_initial.py b/aleksis/apps/stoelindeling/migrations/0001_initial.py index e5871f0f668720aa41abd543c3741dc5d39f2308..8e62e8fc86567d2eadf802a1ce2c94e58118ee44 100644 --- a/aleksis/apps/stoelindeling/migrations/0001_initial.py +++ b/aleksis/apps/stoelindeling/migrations/0001_initial.py @@ -15,6 +15,10 @@ class Migration(migrations.Migration): ('chronos', '0010_remove_subject_unique_name_per_site'), ] + run_before = [ + ('core', '0047_add_room_model'), + ] + operations = [ migrations.CreateModel( name='SeatingPlan', diff --git a/aleksis/apps/stoelindeling/migrations/0005_alter_seatingplan_room.py b/aleksis/apps/stoelindeling/migrations/0005_alter_seatingplan_room.py new file mode 100644 index 0000000000000000000000000000000000000000..ee8c88052efacf140d36b080610503310a2cbe26 --- /dev/null +++ b/aleksis/apps/stoelindeling/migrations/0005_alter_seatingplan_room.py @@ -0,0 +1,28 @@ +# Generated by Django 4.1.5 on 2023-02-26 15:44 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ("core", "0047_add_room_model"), + ("stoelindeling", "0004_alter_seatingplan_subject"), + ] + + run_before = [ + ("chronos", "0013_move_room_to_core"), + ] + + operations = [ + migrations.AlterField( + model_name="seatingplan", + name="room", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="core.room", + verbose_name="Room", + ), + ), + ] diff --git a/aleksis/apps/stoelindeling/model_extensions.py b/aleksis/apps/stoelindeling/model_extensions.py index c61ae1583dbe7bedcd5ecf95e9d95aaca6b0e0f0..b5a46a8ff4c57773eb60fd0c5bc2baea71ef2256 100644 --- a/aleksis/apps/stoelindeling/model_extensions.py +++ b/aleksis/apps/stoelindeling/model_extensions.py @@ -2,9 +2,9 @@ from typing import Union from django.apps import apps -from aleksis.apps.chronos.models import Room, Subject +from aleksis.apps.chronos.models import Subject from aleksis.apps.stoelindeling.models import SeatingPlan -from aleksis.core.models import Group +from aleksis.core.models import Group, Room @Group.method diff --git a/aleksis/apps/stoelindeling/models.py b/aleksis/apps/stoelindeling/models.py index e87c2e1f8b5ca2ed7cfb02a2b37e4cd555815ae0..2071e4ac3b28397a8909d7d419c114fbe0c4fd77 100644 --- a/aleksis/apps/stoelindeling/models.py +++ b/aleksis/apps/stoelindeling/models.py @@ -1,10 +1,10 @@ from django.db import models from django.utils.translation import gettext_lazy as _ -from aleksis.apps.chronos.models import Room, Subject +from aleksis.apps.chronos.models import Subject from aleksis.apps.stoelindeling.managers import SeatManager, SeatQuerySet from aleksis.core.mixins import ExtensibleModel -from aleksis.core.models import Group, Person +from aleksis.core.models import Group, Person, Room class SeatingPlan(ExtensibleModel):