Turn room information into n:m property of period.

biscuit/apps/chronos/migrations/0001_initial.py

@@ -17,33 +17,62 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Subject',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('abbrev', models.CharField(max_length=10, verbose_name='Abbreviation of subject in timetable')),
-                ('name', models.CharField(max_length=30, verbose_name='Long name of subject')),
-                ('colour_fg', models.CharField(blank=True, max_length=7, validators=[django.core.validators.RegexValidator('#[0-9A-F]{6}')], verbose_name='Foreground colour in timetable')),
-                ('colour_bg', models.CharField(blank=True, max_length=7, validators=[django.core.validators.RegexValidator('#[0-9A-F]{6}')], verbose_name='Background colour in timetable')),
+                ('id', models.AutoField(auto_created=True,
+                                        primary_key=True, serialize=False, verbose_name='ID')),
+                ('abbrev', models.CharField(max_length=10,
+                                            verbose_name='Abbreviation of subject in timetable')),
+                ('name', models.CharField(max_length=30,
+                                          verbose_name='Long name of subject')),
+                ('colour_fg', models.CharField(blank=True, max_length=7, validators=[
+                 django.core.validators.RegexValidator('#[0-9A-F]{6}')], verbose_name='Foreground colour in timetable')),
+                ('colour_bg', models.CharField(blank=True, max_length=7, validators=[
+                 django.core.validators.RegexValidator('#[0-9A-F]{6}')], verbose_name='Background colour in timetable')),
             ],
         ),
         migrations.CreateModel(
             name='TimePeriod',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('weekday', models.PositiveSmallIntegerField(choices=[(0, 'Sunday'), (1, 'Monday'), (2, 'Tuesday'), (3, 'Wednesday'), (4, 'Thursday'), (5, 'Friday'), (6, 'Saturday')], verbose_name='Week day')),
-                ('period', models.PositiveSmallIntegerField(verbose_name='Number of period')),
-                ('time_start', models.TimeField(verbose_name='Time the period starts')),
+                ('id', models.AutoField(auto_created=True,
+                                        primary_key=True, serialize=False, verbose_name='ID')),
+                ('weekday', models.PositiveSmallIntegerField(choices=[(0, 'Sunday'), (1, 'Monday'), (2, 'Tuesday'), (
+                    3, 'Wednesday'), (4, 'Thursday'), (5, 'Friday'), (6, 'Saturday')], verbose_name='Week day')),
+                ('period', models.PositiveSmallIntegerField(
+                    verbose_name='Number of period')),
+                ('time_start', models.TimeField(
+                    verbose_name='Time the period starts')),
                 ('time_end', models.TimeField(verbose_name='Time the period ends')),
             ],
         ),
+        migrations.CreateModel(
+            name='LessonPeriod',
+            fields=[
+                ('id', models.AutoField(auto_created=True,
+                                        primary_key=True, serialize=False, verbose_name='ID')),
+                ('lesson', models.ForeignKey(
+                    on_delete=django.db.models.deletion.CASCADE, to='chronos.Lesson')),
+                ('period', models.ForeignKey(
+                    on_delete=django.db.models.deletion.CASCADE, to='chronos.TimePeriod')),
+                ('room', models.ForeignKey(
+                    on_delete=django.db.models.deletion.CASCADE, to='cambro.Room', null=True)),
+            ],
+        ),
         migrations.CreateModel(
             name='Lesson',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('date_start', models.DateField(null=True, verbose_name='Effective start date of lesson')),
-                ('date_end', models.DateField(null=True, verbose_name='Effective end date of lesson')),
-                ('groups', models.ManyToManyField(related_name='lessons', to='core.Group')),
-                ('periods', models.ManyToManyField(related_name='lessons', to='chronos.TimePeriod')),
-                ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='lessons', to='chronos.Subject')),
-                ('teachers', models.ManyToManyField(related_name='lessons', to='core.Person')),
+                ('id', models.AutoField(auto_created=True,
+                                        primary_key=True, serialize=False, verbose_name='ID')),
+                ('date_start', models.DateField(null=True,
+                                                verbose_name='Effective start date of lesson')),
+                ('date_end', models.DateField(null=True,
+                                              verbose_name='Effective end date of lesson')),
+                ('groups', models.ManyToManyField(
+                    related_name='lessons', to='core.Group')),
+                ('periods', models.ManyToManyField(related_name='lessons',
+                                                   through='chronos.LessonPeriod', to='chronos.TimePeriod')),
+                ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
+                                              related_name='lessons', to='chronos.Subject')),
+                ('teachers', models.ManyToManyField(
+                    related_name='lessons', to='core.Person')),
             ],
         ),
     ]

biscuit/apps/chronos/migrations/0002_lesson_room.py

-# Generated by Django 2.2.3 on 2019-07-16 21:54
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cambro', '0001_initial'),
-        ('chronos', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='lesson',
-            name='room',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='lessons', to='cambro.Room'),
-        ),
-    ]

biscuit/apps/chronos/models.py

@@ -44,12 +44,18 @@ class Lesson(models.Model):
     subject = models.ForeignKey(
         'Subject', on_delete=models.CASCADE, related_name='lessons')
     teachers = models.ManyToManyField('core.Person', related_name='lessons')
-    periods = models.ManyToManyField('TimePeriod', related_name='lessons')
+    periods = models.ManyToManyField(
+        'TimePeriod', related_name='lessons', through='LessonPeriod')
     groups = models.ManyToManyField('core.Group', related_name='lessons')
-    room = models.ForeignKey(
-        'cambro.Room', related_name='lessons', on_delete=models.CASCADE, null=True)
 
     date_start = models.DateField(verbose_name=_(
         'Effective start date of lesson'), null=True)
     date_end = models.DateField(verbose_name=_(
         'Effective end date of lesson'), null=True)
+
+
+class LessonPeriod(models.Model):
+    lesson = models.ForeignKey('Lesson', models.CASCADE)
+    period = models.ForeignKey('TimePeriod', models.CASCADE)
+
+    room = models.ForeignKey('cambro.Room', models.CASCADE, null=True)