Merge Cambro into Chronos.

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

@@ -10,7 +10,6 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('core', '0005_person_short_name'),
         ('cambro', '0001_initial'),
     ]
 
@@ -50,7 +49,7 @@ class Migration(migrations.Migration):
                 ('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(null=True, on_delete=django.db.models.deletion.CASCADE, to='cambro.Room')),
+                ('room', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='chronos.Room')),
             ],
         ),
         migrations.AddField(

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

@@ -24,4 +24,14 @@ class Migration(migrations.Migration):
             name='timeperiod',
             unique_together={('weekday', 'period')},
         ),
+        migrations.AlterField(
+            model_name='room',
+            name='name',
+            field=models.CharField(max_length=30, unique=True, verbose_name='Long name'),
+        ),
+        migrations.AlterField(
+            model_name='room',
+            name='short_name',
+            field=models.CharField(max_length=10, unique=True, verbose_name='Short name, e.g. room number'),
+        ),
     ]

biscuit/apps/chronos/models.py

@@ -52,6 +52,15 @@ class Subject(models.Model):
         return '%s - %s' % (self.abbrev, self.name)
 
 
+class Room(models.Model):
+    short_name = models.CharField(verbose_name=_(
+        'Short name, e.g. room number'), max_length=10, unique=True)
+    name = models.CharField(verbose_name=_('Long name'), max_length=30, unique=True)
+
+    def __str__(self):
+        return '%s (%s)' % (self.name, self.short_name)
+
+
 class Lesson(models.Model):
     subject = models.ForeignKey(
         'Subject', on_delete=models.CASCADE, related_name='lessons')
@@ -70,4 +79,4 @@ 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)
+    room = models.ForeignKey('Room', models.CASCADE, null=True)

setup.py

@@ -18,7 +18,6 @@ setup(
     include_package_data=True,
     install_requires=[
         'BiscuIT-ng',
-        'BiscuIT-App-Cambro'
     ],
     classifiers=[
         "Development Status :: 3 - Alpha",