From 82949dc5c173dd17535a264b339a0d5c1ad3dca3 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 | 2 +-
.../migrations/0005_alter_seatingplan_room.py | 24 +++++++++++++++++++
.../apps/stoelindeling/model_extensions.py | 4 ++--
aleksis/apps/stoelindeling/models.py | 4 ++--
4 files changed, 29 insertions(+), 5 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..bf39c4c 100644
--- a/aleksis/apps/stoelindeling/migrations/0001_initial.py
+++ b/aleksis/apps/stoelindeling/migrations/0001_initial.py
@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('extended_data', models.JSONField(default=dict, editable=False)),
('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.group', verbose_name='Group')),
- ('room', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='chronos.room', verbose_name='Room')),
+ ('room', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.room', verbose_name='Room')),
('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.site')),
('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='chronos.subject', verbose_name='Subject')),
],
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..6b990ba
--- /dev/null
+++ b/aleksis/apps/stoelindeling/migrations/0005_alter_seatingplan_room.py
@@ -0,0 +1,24 @@
+# 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", "0049_calendarevent"),
+ ("stoelindeling", "0004_alter_seatingplan_subject"),
+ ]
+
+ 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