From 9bc2c2b509cdf90e99d1d98be2de0ef6ace49281 Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Tue, 4 Jan 2022 20:09:04 +0000 Subject: [PATCH] Squash migrations --- training/migrations/0001_initial.py | 61 ++++++++++++++----- .../migrations/0002_auto_20210706_0053.py | 42 ------------- .../migrations/0003_auto_20210716_0150.py | 24 -------- .../migrations/0004_auto_20210819_1808.py | 21 ------- .../migrations/0005_auto_20210819_1833.py | 17 ------ .../migrations/0006_auto_20210903_2158.py | 23 ------- .../migrations/0007_auto_20210908_2043.py | 25 -------- .../migrations/0008_trainingitem_active.py | 18 ------ .../migrations/0009_auto_20211221_1539.py | 22 ------- .../migrations/0010_auto_20211228_1144.py | 23 ------- .../migrations/0011_auto_20220102_1106.py | 23 ------- .../migrations/0012_auto_20220102_2051.py | 23 ------- .../migrations/0013_auto_20220104_1940.py | 59 ------------------ 13 files changed, 47 insertions(+), 334 deletions(-) delete mode 100644 training/migrations/0002_auto_20210706_0053.py delete mode 100644 training/migrations/0003_auto_20210716_0150.py delete mode 100644 training/migrations/0004_auto_20210819_1808.py delete mode 100644 training/migrations/0005_auto_20210819_1833.py delete mode 100644 training/migrations/0006_auto_20210903_2158.py delete mode 100644 training/migrations/0007_auto_20210908_2043.py delete mode 100644 training/migrations/0008_trainingitem_active.py delete mode 100644 training/migrations/0009_auto_20211221_1539.py delete mode 100644 training/migrations/0010_auto_20211228_1144.py delete mode 100644 training/migrations/0011_auto_20220102_1106.py delete mode 100644 training/migrations/0012_auto_20220102_2051.py delete mode 100644 training/migrations/0013_auto_20220104_1940.py diff --git a/training/migrations/0001_initial.py b/training/migrations/0001_initial.py index 3298076e..17f0407a 100644 --- a/training/migrations/0001_initial.py +++ b/training/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.5 on 2021-07-05 22:01 +# Generated by Django 3.2.11 on 2022-01-04 20:08 import RIGS.models import django.contrib.auth.models @@ -11,7 +11,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('RIGS', '0041_auto_20210302_1204'), + ('RIGS', '0043_auto_20211027_1519'), ] operations = [ @@ -19,25 +19,36 @@ class Migration(migrations.Migration): name='TrainingCategory', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('reference_number', models.CharField(max_length=3)), + ('reference_number', models.IntegerField(unique=True)), ('name', models.CharField(max_length=50)), ], + options={ + 'verbose_name_plural': 'Training Categories', + }, ), migrations.CreateModel( name='TrainingItem', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('reference_number', models.CharField(max_length=3)), + ('reference_number', models.IntegerField()), ('name', models.CharField(max_length=50)), - ('category', models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, related_name='items', to='training.trainingcategory')), + ('active', models.BooleanField(default=True)), + ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='training.trainingcategory')), ], + options={ + 'ordering': ['category__reference_number', 'reference_number'], + 'unique_together': {('reference_number', 'active', 'category')}, + }, ), migrations.CreateModel( name='TrainingLevel', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('department', models.CharField(max_length=50, null=True)), + ('description', models.TextField(blank=True)), + ('department', models.IntegerField(blank=True, choices=[(0, 'Sound'), (1, 'Lighting'), (2, 'Power'), (3, 'Rigging'), (4, 'Haulage')], null=True)), ('level', models.IntegerField(choices=[(0, 'Technical Assistant'), (1, 'Technician'), (2, 'Supervisor')])), + ('icon', models.CharField(blank=True, max_length=20, null=True)), + ('prerequisite_levels', models.ManyToManyField(blank=True, related_name='prerequisites', to='training.TrainingLevel')), ], bases=(models.Model, RIGS.models.RevisionMixin), ), @@ -50,20 +61,38 @@ class Migration(migrations.Migration): 'indexes': [], 'constraints': [], }, - bases=('RIGS.profile',), + bases=('RIGS.profile', RIGS.models.RevisionMixin), managers=[ ('objects', django.contrib.auth.models.UserManager()), ], ), + migrations.CreateModel( + name='TrainingLevelRequirement', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('depth', models.IntegerField(choices=[(0, 'Training Started'), (1, 'Training Complete'), (2, 'Passed Out')])), + ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='training.trainingitem')), + ('level', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='requirements', to='training.traininglevel')), + ], + options={ + 'unique_together': {('level', 'item')}, + }, + bases=(models.Model, RIGS.models.RevisionMixin), + ), migrations.CreateModel( name='TrainingLevelQualification', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('confirmed_on', models.DateTimeField()), - ('confirmed_by', models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, related_name='confirmer', to='training.trainee')), - ('level', models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, to='training.traininglevel')), - ('trainee', models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, related_name='levels', to='training.trainee')), + ('confirmed_on', models.DateTimeField(null=True)), + ('confirmed_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='confirmer', to='training.trainee')), + ('level', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='training.traininglevel')), + ('trainee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='level_qualifications', to='training.trainee')), ], + options={ + 'ordering': ['-confirmed_on'], + 'unique_together': {('trainee', 'level')}, + }, + bases=(models.Model, RIGS.models.RevisionMixin), ), migrations.CreateModel( name='TrainingItemQualification', @@ -72,9 +101,13 @@ class Migration(migrations.Migration): ('depth', models.IntegerField(choices=[(0, 'Training Started'), (1, 'Training Complete'), (2, 'Passed Out')])), ('date', models.DateField()), ('notes', models.TextField(blank=True)), - ('item', models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, to='training.trainingitem')), - ('supervisor', models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, related_name='qualifications_granted', to='training.trainee')), - ('trainee', models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, related_name='qualifications_obtained', to='training.trainee')), + ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='training.trainingitem')), + ('supervisor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='qualifications_granted', to='training.trainee')), + ('trainee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='qualifications_obtained', to='training.trainee')), ], + options={ + 'order_with_respect_to': 'item', + 'unique_together': {('trainee', 'item', 'depth')}, + }, ), ] diff --git a/training/migrations/0002_auto_20210706_0053.py b/training/migrations/0002_auto_20210706_0053.py deleted file mode 100644 index 24c5a644..00000000 --- a/training/migrations/0002_auto_20210706_0053.py +++ /dev/null @@ -1,42 +0,0 @@ -# Generated by Django 3.1.5 on 2021-07-05 23:53 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('training', '0001_initial'), - ] - - operations = [ - migrations.AlterModelOptions( - name='trainingcategory', - options={'verbose_name_plural': 'Training Categories'}, - ), - migrations.AddField( - model_name='traininglevel', - name='description', - field=models.CharField(blank=True, max_length=120), - ), - migrations.AddField( - model_name='traininglevel', - name='prerequisite_levels', - field=models.ManyToManyField(blank=True, related_name='prerequisites', to='training.TrainingLevel'), - ), - migrations.AlterField( - model_name='traininglevel', - name='department', - field=models.IntegerField(choices=[(0, 'Sound'), (1, 'Lighting'), (2, 'Power'), (3, 'Rigging'), (4, 'Haulage')], null=True), - ), - migrations.CreateModel( - name='TrainingLevelRequirement', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('depth', models.IntegerField(verbose_name=((0, 'Training Started'), (1, 'Training Complete'), (2, 'Passed Out')))), - ('item', models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, to='training.trainingitem')), - ('level', models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, related_name='requirements', to='training.traininglevel')), - ], - ), - ] diff --git a/training/migrations/0003_auto_20210716_0150.py b/training/migrations/0003_auto_20210716_0150.py deleted file mode 100644 index e9c32dab..00000000 --- a/training/migrations/0003_auto_20210716_0150.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 3.1.5 on 2021-07-16 00:50 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('training', '0002_auto_20210706_0053'), - ] - - operations = [ - migrations.AlterField( - model_name='traininglevelqualification', - name='confirmed_by', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.RESTRICT, related_name='confirmer', to='training.trainee'), - ), - migrations.AlterField( - model_name='traininglevelqualification', - name='confirmed_on', - field=models.DateTimeField(null=True), - ), - ] diff --git a/training/migrations/0004_auto_20210819_1808.py b/training/migrations/0004_auto_20210819_1808.py deleted file mode 100644 index e9d21ec1..00000000 --- a/training/migrations/0004_auto_20210819_1808.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 3.1.7 on 2021-08-19 17:08 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('training', '0003_auto_20210716_0150'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='trainingitemqualification', - unique_together={('trainee', 'item', 'depth')}, - ), - migrations.AlterUniqueTogether( - name='traininglevelqualification', - unique_together={('trainee', 'level')}, - ), - ] diff --git a/training/migrations/0005_auto_20210819_1833.py b/training/migrations/0005_auto_20210819_1833.py deleted file mode 100644 index 088c7558..00000000 --- a/training/migrations/0005_auto_20210819_1833.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.1.7 on 2021-08-19 17:33 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('training', '0004_auto_20210819_1808'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='traininglevelrequirement', - unique_together={('level', 'item')}, - ), - ] diff --git a/training/migrations/0006_auto_20210903_2158.py b/training/migrations/0006_auto_20210903_2158.py deleted file mode 100644 index e7e5617f..00000000 --- a/training/migrations/0006_auto_20210903_2158.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.1.7 on 2021-09-03 20:58 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('training', '0005_auto_20210819_1833'), - ] - - operations = [ - migrations.AddField( - model_name='traininglevel', - name='icon', - field=models.CharField(blank=True, max_length=20, null=True), - ), - migrations.AlterField( - model_name='traininglevelrequirement', - name='depth', - field=models.IntegerField(choices=[(0, 'Training Started'), (1, 'Training Complete'), (2, 'Passed Out')]), - ), - ] diff --git a/training/migrations/0007_auto_20210908_2043.py b/training/migrations/0007_auto_20210908_2043.py deleted file mode 100644 index 60b8031b..00000000 --- a/training/migrations/0007_auto_20210908_2043.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 3.1.13 on 2021-09-08 19:43 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('training', '0006_auto_20210903_2158'), - ] - - operations = [ - migrations.AlterModelOptions( - name='trainingitem', - options={'ordering': ['category__reference_number', 'reference_number']}, - ), - migrations.AlterUniqueTogether( - name='trainingitem', - unique_together={('reference_number', 'name', 'category')}, - ), - migrations.AlterOrderWithRespectTo( - name='trainingitemqualification', - order_with_respect_to='item', - ), - ] diff --git a/training/migrations/0008_trainingitem_active.py b/training/migrations/0008_trainingitem_active.py deleted file mode 100644 index f58ad9e7..00000000 --- a/training/migrations/0008_trainingitem_active.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.13 on 2021-10-27 12:37 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('training', '0007_auto_20210908_2043'), - ] - - operations = [ - migrations.AddField( - model_name='trainingitem', - name='active', - field=models.BooleanField(default=True), - ), - ] diff --git a/training/migrations/0009_auto_20211221_1539.py b/training/migrations/0009_auto_20211221_1539.py deleted file mode 100644 index 6b1c9b51..00000000 --- a/training/migrations/0009_auto_20211221_1539.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.1.13 on 2021-12-21 15:39 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('training', '0008_trainingitem_active'), - ] - - operations = [ - migrations.AlterField( - model_name='trainingcategory', - name='reference_number', - field=models.CharField(max_length=3, unique=True), - ), - migrations.AlterUniqueTogether( - name='trainingitem', - unique_together={('reference_number', 'active', 'category')}, - ), - ] diff --git a/training/migrations/0010_auto_20211228_1144.py b/training/migrations/0010_auto_20211228_1144.py deleted file mode 100644 index f1e54e32..00000000 --- a/training/migrations/0010_auto_20211228_1144.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.1.13 on 2021-12-28 11:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('training', '0009_auto_20211221_1539'), - ] - - operations = [ - migrations.AlterField( - model_name='trainingcategory', - name='reference_number', - field=models.IntegerField(unique=True), - ), - migrations.AlterField( - model_name='trainingitem', - name='reference_number', - field=models.IntegerField(), - ), - ] diff --git a/training/migrations/0011_auto_20220102_1106.py b/training/migrations/0011_auto_20220102_1106.py deleted file mode 100644 index c102a99a..00000000 --- a/training/migrations/0011_auto_20220102_1106.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.1.13 on 2022-01-02 11:06 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('training', '0010_auto_20211228_1144'), - ] - - operations = [ - migrations.AlterModelOptions( - name='traininglevelqualification', - options={'ordering': ['-confirmed_on']}, - ), - migrations.AlterField( - model_name='traininglevelqualification', - name='trainee', - field=models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, related_name='level_qualifications', to='training.trainee'), - ), - ] diff --git a/training/migrations/0012_auto_20220102_2051.py b/training/migrations/0012_auto_20220102_2051.py deleted file mode 100644 index bc337d50..00000000 --- a/training/migrations/0012_auto_20220102_2051.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.1.13 on 2022-01-02 20:51 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('training', '0011_auto_20220102_1106'), - ] - - operations = [ - migrations.AlterField( - model_name='traininglevel', - name='department', - field=models.IntegerField(blank=True, choices=[(0, 'Sound'), (1, 'Lighting'), (2, 'Power'), (3, 'Rigging'), (4, 'Haulage')], null=True), - ), - migrations.AlterField( - model_name='traininglevel', - name='description', - field=models.TextField(blank=True), - ), - ] diff --git a/training/migrations/0013_auto_20220104_1940.py b/training/migrations/0013_auto_20220104_1940.py deleted file mode 100644 index 33439a33..00000000 --- a/training/migrations/0013_auto_20220104_1940.py +++ /dev/null @@ -1,59 +0,0 @@ -# Generated by Django 3.2.11 on 2022-01-04 19:40 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('training', '0012_auto_20220102_2051'), - ] - - operations = [ - migrations.AlterField( - model_name='trainingitem', - name='category', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='training.trainingcategory'), - ), - migrations.AlterField( - model_name='trainingitemqualification', - name='item', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='training.trainingitem'), - ), - migrations.AlterField( - model_name='trainingitemqualification', - name='supervisor', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='qualifications_granted', to='training.trainee'), - ), - migrations.AlterField( - model_name='trainingitemqualification', - name='trainee', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='qualifications_obtained', to='training.trainee'), - ), - migrations.AlterField( - model_name='traininglevelqualification', - name='confirmed_by', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='confirmer', to='training.trainee'), - ), - migrations.AlterField( - model_name='traininglevelqualification', - name='level', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='training.traininglevel'), - ), - migrations.AlterField( - model_name='traininglevelqualification', - name='trainee', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='level_qualifications', to='training.trainee'), - ), - migrations.AlterField( - model_name='traininglevelrequirement', - name='item', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='training.trainingitem'), - ), - migrations.AlterField( - model_name='traininglevelrequirement', - name='level', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='requirements', to='training.traininglevel'), - ), - ]