Skip to content
Snippets Groups Projects
Commit 82949dc5 authored by Hangzhi Yu's avatar Hangzhi Yu
Browse files

Use room model from core

parent 020db15f
No related branches found
No related tags found
No related merge requests found
Pipeline #114878 passed with warnings
This commit is part of merge request !24. Comments created here will be created in the context of that merge request.
......@@ -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')),
],
......
# 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",
),
),
]
......@@ -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
......
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):
......
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