From 25905bedeb359994ab631b3cacad1bd6e816b707 Mon Sep 17 00:00:00 2001
From: "N. Geisler" <ngeisler@fachschaft.informatik.tu-darmstadt.de>
Date: Sat, 19 Oct 2019 01:15:59 +0200
Subject: [PATCH] allow AK slots without rooms
---
AKModel/migrations/0016_slot_room_blank.py | 20 ++++++++++++++++++++
AKModel/models.py | 5 +++--
2 files changed, 23 insertions(+), 2 deletions(-)
create mode 100644 AKModel/migrations/0016_slot_room_blank.py
diff --git a/AKModel/migrations/0016_slot_room_blank.py b/AKModel/migrations/0016_slot_room_blank.py
new file mode 100644
index 0000000..8ba204e
--- /dev/null
+++ b/AKModel/migrations/0016_slot_room_blank.py
@@ -0,0 +1,20 @@
+# Generated by Django 2.2.6 on 2019-10-18 23:15
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ('AKModel', '0015_ak_present_field'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='akslot',
+ name='room',
+ field=models.ForeignKey(blank=True, help_text='Room the AK will take place in', null=True,
+ on_delete=django.db.models.deletion.SET_NULL, to='AKModel.Room',
+ verbose_name='Room'),
+ ),
+ ]
diff --git a/AKModel/models.py b/AKModel/models.py
index 676fe52..0be0fd0 100644
--- a/AKModel/models.py
+++ b/AKModel/models.py
@@ -135,7 +135,8 @@ class AK(models.Model):
reso = models.BooleanField(verbose_name=_('Resolution Intention'), default=False,
help_text=_('Intends to submit a resolution'))
- present = models.BooleanField(verbose_name=_("Present this AK"), null=True, help_text=_("Present results of this AK"))
+ present = models.BooleanField(verbose_name=_("Present this AK"), null=True,
+ help_text=_("Present results of this AK"))
requirements = models.ManyToManyField(to=AKRequirement, blank=True, verbose_name=_('Requirements'),
help_text=_("AK's Requirements"))
@@ -199,7 +200,7 @@ class AKSlot(models.Model):
""" An AK Mapping matches an AK to a room during a certain time.
"""
ak = models.ForeignKey(to=AK, on_delete=models.CASCADE, verbose_name=_('AK'), help_text=_('AK being mapped'))
- room = models.ForeignKey(to=Room, null=True, on_delete=models.SET_NULL, verbose_name=_('Room'),
+ room = models.ForeignKey(to=Room, blank=True, null=True, on_delete=models.SET_NULL, verbose_name=_('Room'),
help_text=_('Room the AK will take place in'))
start = models.DateTimeField(verbose_name=_('Slot Begin'), help_text=_('Time and date the slot begins'))
duration = models.DecimalField(max_digits=4, decimal_places=2, default=2, verbose_name=_('Duration'),
--
GitLab