From 227ccabb8674508dda35246486b28837f8b93598 Mon Sep 17 00:00:00 2001
From: Hangzhi Yu <hangzhi@protonmail.com>
Date: Sun, 26 Feb 2023 16:51:36 +0100
Subject: [PATCH] Use room model from core
---
.../stoelindeling/migrations/0001_initial.py | 5 +++-
.../0004_alter_seatingplan_subject.py | 1 -
.../migrations/0005_alter_seatingplan_room.py | 28 +++++++++++++++++++
.../apps/stoelindeling/model_extensions.py | 4 +--
aleksis/apps/stoelindeling/models.py | 4 +--
5 files changed, 36 insertions(+), 6 deletions(-)
create mode 100644 aleksis/apps/stoelindeling/migrations/0005_alter_seatingplan_room.py
diff --git a/aleksis/apps/stoelindeling/migrations/0001_initial.py b/aleksis/apps/stoelindeling/migrations/0001_initial.py
index e5871f0..1e4c9af 100644
--- a/aleksis/apps/stoelindeling/migrations/0001_initial.py
+++ b/aleksis/apps/stoelindeling/migrations/0001_initial.py
@@ -10,11 +10,14 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- ('core', '0035_preference_model_unique'),
('sites', '0002_alter_domain_unique'),
('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/0004_alter_seatingplan_subject.py b/aleksis/apps/stoelindeling/migrations/0004_alter_seatingplan_subject.py
index 4182b55..28ecd3f 100644
--- a/aleksis/apps/stoelindeling/migrations/0004_alter_seatingplan_subject.py
+++ b/aleksis/apps/stoelindeling/migrations/0004_alter_seatingplan_subject.py
@@ -7,7 +7,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
- ('chronos', '0010_remove_subject_unique_name_per_site'),
('stoelindeling', '0003_seat_negative_x_y'),
]
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 0000000..ee8c880
--- /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 c61ae15..b5a46a8 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 e87c2e1..2071e4a 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):
--
GitLab