From 36a3c81abaf85cf4f5a13fc0fd986a50824314f9 Mon Sep 17 00:00:00 2001
From: mirabilos <thorsten.glaser@teckids.org>
Date: Tue, 3 Sep 2019 18:40:38 +0000
Subject: [PATCH] Regenerate migrations from scratch.
---
.../apps/chronos/migrations/0001_initial.py | 122 ++++++++++++------
.../chronos/migrations/0002_make_unique.py | 39 ------
.../migrations/0003_lesson_substitution.py | 33 -----
.../migrations/0004_auto_20190821_1550.py | 32 -----
.../chronos/migrations/0005_school_related.py | 78 -----------
5 files changed, 82 insertions(+), 222 deletions(-)
delete mode 100644 biscuit/apps/chronos/migrations/0002_make_unique.py
delete mode 100644 biscuit/apps/chronos/migrations/0003_lesson_substitution.py
delete mode 100644 biscuit/apps/chronos/migrations/0004_auto_20190821_1550.py
delete mode 100644 biscuit/apps/chronos/migrations/0005_school_related.py
diff --git a/biscuit/apps/chronos/migrations/0001_initial.py b/biscuit/apps/chronos/migrations/0001_initial.py
index 369b7bfc..ee4f83f6 100644
--- a/biscuit/apps/chronos/migrations/0001_initial.py
+++ b/biscuit/apps/chronos/migrations/0001_initial.py
@@ -1,5 +1,7 @@
-# Generated by Django 2.2.3 on 2019-07-16 22:12
+# Generated by Django 2.2.5 on 2019-09-03 18:30
+import biscuit.apps.chronos.util
+import biscuit.core.util.core_helpers
import django.core.validators
from django.db import migrations, models
import django.db.models.deletion
@@ -10,79 +12,119 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- ('core', '0008_school_person_group'),
+ ('core', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='Lesson',
fields=[
- ('id', models.AutoField(auto_created=True,
- primary_key=True, serialize=False, verbose_name='ID')),
+ ('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')),
],
+ options={
+ 'ordering': ['date_start'],
+ },
),
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')),
- ],
- ),
- migrations.CreateModel(
- name='Room',
+ name='LessonPeriod',
fields=[
- ('id', models.AutoField(auto_created=True,
- primary_key=True, serialize=False, verbose_name='ID')),
- ('short_name', models.CharField(max_length=10, unique=True,
- verbose_name='Short name, e.g. room number')),
- ('name', models.CharField(max_length=30, unique=True, verbose_name='Long name')),
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('lesson', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='lesson_periods', to='chronos.Lesson')),
],
+ options={
+ 'ordering': ['lesson__date_start', 'period__weekday', 'period__period'],
+ },
),
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')),
+ ('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')),
+ ('school', models.ForeignKey(default=biscuit.core.util.core_helpers.get_current_school, on_delete=django.db.models.deletion.CASCADE, to='core.School')),
],
+ options={
+ 'ordering': ['weekday', 'period'],
+ 'unique_together': {('school', 'weekday', 'period')},
+ },
),
migrations.CreateModel(
- name='LessonPeriod',
+ name='Subject',
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(null=True,
- on_delete=django.db.models.deletion.CASCADE, to='chronos.Room')),
+ ('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')),
+ ('school', models.ForeignKey(default=biscuit.core.util.core_helpers.get_current_school, on_delete=django.db.models.deletion.CASCADE, to='core.School')),
],
+ options={
+ 'ordering': ['name', 'abbrev'],
+ 'unique_together': {('school', 'abbrev'), ('school', 'name')},
+ },
+ ),
+ migrations.CreateModel(
+ name='Room',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('short_name', models.CharField(max_length=10, verbose_name='Short name, e.g. room number')),
+ ('name', models.CharField(max_length=30, verbose_name='Long name')),
+ ('school', models.ForeignKey(default=biscuit.core.util.core_helpers.get_current_school, on_delete=django.db.models.deletion.CASCADE, to='core.School')),
+ ],
+ options={
+ 'ordering': ['name', 'short_name'],
+ 'unique_together': {('school', 'name'), ('school', 'short_name')},
+ },
+ ),
+ migrations.CreateModel(
+ name='LessonSubstitution',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('week', models.IntegerField(default=biscuit.apps.chronos.util.current_week, verbose_name='Week')),
+ ('lesson_period', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='substitutions', to='chronos.LessonPeriod')),
+ ('room', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='chronos.Room')),
+ ('school', models.ForeignKey(default=biscuit.core.util.core_helpers.get_current_school, on_delete=django.db.models.deletion.CASCADE, to='core.School')),
+ ('subject', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='lesson_substitutions', to='chronos.Subject')),
+ ('teachers', models.ManyToManyField(related_name='lesson_substitutions', to='core.Person')),
+ ],
+ options={
+ 'ordering': ['lesson_period__lesson__date_start', 'week', 'lesson_period__period__weekday', 'lesson_period__period__period'],
+ },
+ ),
+ migrations.AddField(
+ model_name='lessonperiod',
+ name='period',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='lesson_periods', to='chronos.TimePeriod'),
+ ),
+ migrations.AddField(
+ model_name='lessonperiod',
+ name='room',
+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='lesson_periods', to='chronos.Room'),
+ ),
+ migrations.AddField(
+ model_name='lessonperiod',
+ name='school',
+ field=models.ForeignKey(default=biscuit.core.util.core_helpers.get_current_school, on_delete=django.db.models.deletion.CASCADE, to='core.School'),
),
migrations.AddField(
model_name='lesson',
name='periods',
- field=models.ManyToManyField(related_name='lessons',
- through='chronos.LessonPeriod', to='chronos.TimePeriod'),
+ field=models.ManyToManyField(related_name='lessons', through='chronos.LessonPeriod', to='chronos.TimePeriod'),
+ ),
+ migrations.AddField(
+ model_name='lesson',
+ name='school',
+ field=models.ForeignKey(default=biscuit.core.util.core_helpers.get_current_school, on_delete=django.db.models.deletion.CASCADE, to='core.School'),
),
migrations.AddField(
model_name='lesson',
name='subject',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
- related_name='lessons', to='chronos.Subject'),
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='lessons', to='chronos.Subject'),
),
migrations.AddField(
model_name='lesson',
diff --git a/biscuit/apps/chronos/migrations/0002_make_unique.py b/biscuit/apps/chronos/migrations/0002_make_unique.py
deleted file mode 100644
index d8792112..00000000
--- a/biscuit/apps/chronos/migrations/0002_make_unique.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Generated by Django 2.2.3 on 2019-07-24 21:26
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('chronos', '0001_initial'),
- ]
-
- operations = [
- migrations.AlterField(
- model_name='subject',
- name='abbrev',
- field=models.CharField(max_length=10, unique=True,
- verbose_name='Abbreviation of subject in timetable'),
- ),
- migrations.AlterField(
- model_name='subject',
- name='name',
- field=models.CharField(max_length=30, unique=True, verbose_name='Long name of subject'),
- ),
- migrations.AlterUniqueTogether(
- 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'),
- ),
- ]
diff --git a/biscuit/apps/chronos/migrations/0003_lesson_substitution.py b/biscuit/apps/chronos/migrations/0003_lesson_substitution.py
deleted file mode 100644
index b17774aa..00000000
--- a/biscuit/apps/chronos/migrations/0003_lesson_substitution.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Generated by Django 2.2.4 on 2019-08-21 14:18
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('core', '0013_person_primary_group'),
- ('chronos', '0002_make_unique'),
- ]
-
- operations = [
- migrations.CreateModel(
- name='LessonSubstitution',
- fields=[
- ('id', models.AutoField(auto_created=True,
- primary_key=True, serialize=False, verbose_name='ID')),
- ('room', models.ForeignKey(null=True,
- on_delete=django.db.models.deletion.CASCADE, to='chronos.Room')),
- ('subject', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE,
- related_name='lesson_substitutions', to='chronos.Subject')),
- ('teachers', models.ManyToManyField(related_name='lesson_substitutions', to='core.Person')),
- ],
- ),
- migrations.AddField(
- model_name='lessonperiod',
- name='substitution',
- field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE,
- related_name='lesson_period', to='chronos.LessonSubstitution'),
- ),
- ]
diff --git a/biscuit/apps/chronos/migrations/0004_auto_20190821_1550.py b/biscuit/apps/chronos/migrations/0004_auto_20190821_1550.py
deleted file mode 100644
index 303fbed2..00000000
--- a/biscuit/apps/chronos/migrations/0004_auto_20190821_1550.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Generated by Django 2.2.4 on 2019-08-21 15:50
-
-import biscuit.apps.chronos.util
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('chronos', '0003_lesson_substitution'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='lessonperiod',
- name='substitution',
- ),
- migrations.AddField(
- model_name='lessonsubstitution',
- name='lesson_period',
- field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE,
- related_name='substitutions', to='chronos.LessonPeriod'),
- preserve_default=False,
- ),
- migrations.AddField(
- model_name='lessonsubstitution',
- name='week',
- field=models.IntegerField(
- default=biscuit.apps.chronos.util.current_week, verbose_name='Kalenderwoche'),
- ),
- ]
diff --git a/biscuit/apps/chronos/migrations/0005_school_related.py b/biscuit/apps/chronos/migrations/0005_school_related.py
deleted file mode 100644
index 90e8920f..00000000
--- a/biscuit/apps/chronos/migrations/0005_school_related.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# Generated by Django 2.2.4 on 2019-09-03 14:10
-
-import biscuit.apps.chronos.util
-import biscuit.core.util.core_helpers
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('chronos', '0004_auto_20190821_1550'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='lesson',
- name='school',
- field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='core.School'),
- ),
- migrations.AddField(
- model_name='lessonperiod',
- name='school',
- field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='core.School'),
- ),
- migrations.AddField(
- model_name='lessonsubstitution',
- name='school',
- field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='core.School'),
- ),
- migrations.AddField(
- model_name='room',
- name='school',
- field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='core.School'),
- ),
- migrations.AddField(
- model_name='subject',
- name='school',
- field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='core.School'),
- ),
- migrations.AddField(
- model_name='timeperiod',
- name='school',
- field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='core.School'),
- ),
- migrations.AlterField(
- model_name='room',
- name='name',
- field=models.CharField(max_length=30, verbose_name='Long name'),
- ),
- migrations.AlterField(
- model_name='room',
- name='short_name',
- field=models.CharField(max_length=10, verbose_name='Short name, e.g. room number'),
- ),
- migrations.AlterField(
- model_name='subject',
- name='abbrev',
- field=models.CharField(max_length=10, verbose_name='Abbreviation of subject in timetable'),
- ),
- migrations.AlterField(
- model_name='subject',
- name='name',
- field=models.CharField(max_length=30, verbose_name='Long name of subject'),
- ),
- migrations.AlterUniqueTogether(
- name='room',
- unique_together={('school', 'name'), ('school', 'short_name')},
- ),
- migrations.AlterUniqueTogether(
- name='subject',
- unique_together={('school', 'abbrev'), ('school', 'name')},
- ),
- migrations.AlterUniqueTogether(
- name='timeperiod',
- unique_together={('school', 'weekday', 'period')},
- ),
- ]
--
GitLab