From d2c33011d9d4bc8cedcb918946edf3330ae58d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Fri, 8 Apr 2022 21:50:30 +0200 Subject: [PATCH] Squash migrations --- dcc/consist/migrations/0001_initial.py | 12 ++--- ...ddress_consist_consist_address_and_more.py | 23 --------- .../0003_alter_consistitem_consist.py | 19 -------- dcc/driver/migrations/0001_initial.py | 2 +- dcc/metadata/migrations/0001_initial.py | 37 ++++++++++++-- ...002_scale_manufacturer_website_and_more.py | 32 ------------- ...ny_options_alter_scale_options_and_more.py | 26 ---------- .../0004_company_freelance_decoder_sound.py | 23 --------- ...r_company_freelance_alter_decoder_sound.py | 23 --------- .../migrations/0006_manufacturer_category.py | 19 -------- .../0007_alter_manufacturer_category.py | 18 ------- ...rty_alter_manufacturer_options_and_more.py | 33 ------------- dcc/roster/admin.py | 15 ++++-- dcc/roster/migrations/0001_initial.py | 47 +++++++++++++++--- ...ass_alter_rollingclass_options_and_more.py | 48 ------------------- .../0003_rollingstockimage_description.py | 18 ------- ..._rollingstockimage_description_and_more.py | 22 --------- ..._builder_rollingclass_wheel_arrangement.py | 23 --------- ...06_remove_rollingclass_builder_and_more.py | 29 ----------- ...07_alter_rollingclass_wheel_arrangement.py | 18 ------- .../migrations/0008_rollingclassproperty.py | 24 ---------- ...9_remove_rollingclass_wheel_arrangement.py | 17 ------- .../migrations/0010_rollingstockproperty.py | 24 ---------- 23 files changed, 92 insertions(+), 460 deletions(-) delete mode 100644 dcc/consist/migrations/0002_rename_address_consist_consist_address_and_more.py delete mode 100644 dcc/consist/migrations/0003_alter_consistitem_consist.py delete mode 100644 dcc/metadata/migrations/0002_scale_manufacturer_website_and_more.py delete mode 100644 dcc/metadata/migrations/0003_alter_company_options_alter_scale_options_and_more.py delete mode 100644 dcc/metadata/migrations/0004_company_freelance_decoder_sound.py delete mode 100644 dcc/metadata/migrations/0005_alter_company_freelance_alter_decoder_sound.py delete mode 100644 dcc/metadata/migrations/0006_manufacturer_category.py delete mode 100644 dcc/metadata/migrations/0007_alter_manufacturer_category.py delete mode 100644 dcc/metadata/migrations/0008_property_alter_manufacturer_options_and_more.py delete mode 100644 dcc/roster/migrations/0002_rename_class_rollingclass_alter_rollingclass_options_and_more.py delete mode 100644 dcc/roster/migrations/0003_rollingstockimage_description.py delete mode 100644 dcc/roster/migrations/0004_remove_rollingstockimage_description_and_more.py delete mode 100644 dcc/roster/migrations/0005_rollingclass_builder_rollingclass_wheel_arrangement.py delete mode 100644 dcc/roster/migrations/0006_remove_rollingclass_builder_and_more.py delete mode 100644 dcc/roster/migrations/0007_alter_rollingclass_wheel_arrangement.py delete mode 100644 dcc/roster/migrations/0008_rollingclassproperty.py delete mode 100644 dcc/roster/migrations/0009_remove_rollingclass_wheel_arrangement.py delete mode 100644 dcc/roster/migrations/0010_rollingstockproperty.py diff --git a/dcc/consist/migrations/0001_initial.py b/dcc/consist/migrations/0001_initial.py index df46d20..9ded3fe 100644 --- a/dcc/consist/migrations/0001_initial.py +++ b/dcc/consist/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.0.2 on 2022-04-02 14:25 +# Generated by Django 4.0.3 on 2022-04-07 09:25 from django.db import migrations, models import django.db.models.deletion @@ -10,8 +10,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('roster', '0001_initial'), ('metadata', '0001_initial'), + ('roster', '0001_initial'), ] operations = [ @@ -20,13 +20,13 @@ class Migration(migrations.Migration): fields=[ ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), ('identifier', models.CharField(max_length=128)), - ('address', models.SmallIntegerField(blank=True, default=None, null=True)), - ('epoch', models.CharField(blank=True, max_length=32)), + ('consist_address', models.SmallIntegerField(blank=True, default=None, null=True)), + ('era', models.CharField(blank=True, max_length=32)), ('notes', models.TextField(blank=True)), ('creation_time', models.DateTimeField(auto_now_add=True)), ('updated_time', models.DateTimeField(auto_now=True)), ('company', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.company')), - ('tags', models.ManyToManyField(blank=True, related_name='consist', to='metadata.Tag')), + ('tags', models.ManyToManyField(blank=True, related_name='consist', to='metadata.tag')), ], ), migrations.CreateModel( @@ -34,7 +34,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('order', models.PositiveIntegerField(default=0)), - ('consist', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='consist.consist')), + ('consist', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='consist_item', to='consist.consist')), ('rolling_stock', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='roster.rollingstock')), ], options={ diff --git a/dcc/consist/migrations/0002_rename_address_consist_consist_address_and_more.py b/dcc/consist/migrations/0002_rename_address_consist_consist_address_and_more.py deleted file mode 100644 index db729ca..0000000 --- a/dcc/consist/migrations/0002_rename_address_consist_consist_address_and_more.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.0.2 on 2022-04-02 16:18 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('consist', '0001_initial'), - ] - - operations = [ - migrations.RenameField( - model_name='consist', - old_name='address', - new_name='consist_address', - ), - migrations.RenameField( - model_name='consist', - old_name='epoch', - new_name='era', - ), - ] diff --git a/dcc/consist/migrations/0003_alter_consistitem_consist.py b/dcc/consist/migrations/0003_alter_consistitem_consist.py deleted file mode 100644 index 6a2420f..0000000 --- a/dcc/consist/migrations/0003_alter_consistitem_consist.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.0.3 on 2022-04-02 21:32 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('consist', '0002_rename_address_consist_consist_address_and_more'), - ] - - operations = [ - migrations.AlterField( - model_name='consistitem', - name='consist', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='consist_item', to='consist.consist'), - ), - ] diff --git a/dcc/driver/migrations/0001_initial.py b/dcc/driver/migrations/0001_initial.py index ca9c7bf..d05aaff 100644 --- a/dcc/driver/migrations/0001_initial.py +++ b/dcc/driver/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.0.2 on 2022-04-01 20:25 +# Generated by Django 4.0.3 on 2022-04-07 09:25 from django.db import migrations, models diff --git a/dcc/metadata/migrations/0001_initial.py b/dcc/metadata/migrations/0001_initial.py index 09ced5a..450e6d9 100644 --- a/dcc/metadata/migrations/0001_initial.py +++ b/dcc/metadata/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.0.2 on 2022-04-02 14:25 +# Generated by Django 4.0.3 on 2022-04-07 09:25 from django.db import migrations, models import django.db.models.deletion @@ -18,12 +18,14 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=64, unique=True)), - ('extended_name', models.CharField(max_length=128, unique=True)), + ('extended_name', models.CharField(blank=True, max_length=128)), ('country', django_countries.fields.CountryField(max_length=2)), + ('freelance', models.BooleanField(default=False)), ('logo', models.ImageField(blank=True, null=True, upload_to='images/')), ], options={ 'verbose_name_plural': 'Companies', + 'ordering': ['name'], }, ), migrations.CreateModel( @@ -31,8 +33,36 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=128, unique=True)), + ('category', models.CharField(choices=[('model', 'Model'), ('real', 'Real')], max_length=64)), + ('website', models.URLField(blank=True)), ('logo', models.ImageField(blank=True, null=True, upload_to='images/')), ], + options={ + 'ordering': ['category', 'name'], + }, + ), + migrations.CreateModel( + name='Property', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=128, unique=True)), + ], + options={ + 'verbose_name_plural': 'Properties', + 'ordering': ['name'], + }, + ), + migrations.CreateModel( + name='Scale', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('scale', models.CharField(max_length=32, unique=True)), + ('ratio', models.CharField(blank=True, max_length=16)), + ('gauge', models.CharField(blank=True, max_length=16)), + ], + options={ + 'ordering': ['scale'], + }, ), migrations.CreateModel( name='Tag', @@ -47,7 +77,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('type', models.CharField(max_length=64)), - ('category', models.CharField(choices=[('engine', 'Engine'), ('car', 'Car'), ('equipment', 'Equipment'), ('other', 'Other')], max_length=64)), + ('category', models.CharField(choices=[('engine', 'Engine'), ('car', 'Car'), ('railcar', 'Railcar'), ('equipment', 'Equipment'), ('other', 'Other')], max_length=64)), ], options={ 'unique_together': {('category', 'type')}, @@ -60,6 +90,7 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=128, unique=True)), ('version', models.CharField(blank=True, max_length=64)), ('interface', models.PositiveSmallIntegerField(blank=True, choices=[(1, 'NEM651'), (2, 'NEM652'), (3, 'PluX'), (4, '21MTC'), (5, 'Next18/Next18S')], null=True)), + ('sound', models.BooleanField(default=False)), ('image', models.ImageField(blank=True, null=True, upload_to='images/')), ('manufacturer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='metadata.manufacturer')), ], diff --git a/dcc/metadata/migrations/0002_scale_manufacturer_website_and_more.py b/dcc/metadata/migrations/0002_scale_manufacturer_website_and_more.py deleted file mode 100644 index 8e289ad..0000000 --- a/dcc/metadata/migrations/0002_scale_manufacturer_website_and_more.py +++ /dev/null @@ -1,32 +0,0 @@ -# Generated by Django 4.0.2 on 2022-04-02 16:18 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('metadata', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Scale', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('scale', models.CharField(max_length=32, unique=True)), - ('ratio', models.CharField(blank=True, max_length=16)), - ('gauge', models.CharField(blank=True, max_length=16)), - ], - ), - migrations.AddField( - model_name='manufacturer', - name='website', - field=models.URLField(blank=True), - ), - migrations.AlterField( - model_name='company', - name='extended_name', - field=models.CharField(blank=True, max_length=128), - ), - ] diff --git a/dcc/metadata/migrations/0003_alter_company_options_alter_scale_options_and_more.py b/dcc/metadata/migrations/0003_alter_company_options_alter_scale_options_and_more.py deleted file mode 100644 index 9bd9674..0000000 --- a/dcc/metadata/migrations/0003_alter_company_options_alter_scale_options_and_more.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 4.0.2 on 2022-04-02 17:16 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('metadata', '0002_scale_manufacturer_website_and_more'), - ] - - operations = [ - migrations.AlterModelOptions( - name='company', - options={'ordering': ['name'], 'verbose_name_plural': 'Companies'}, - ), - migrations.AlterModelOptions( - name='scale', - options={'ordering': ['scale']}, - ), - migrations.AlterField( - model_name='rollingstocktype', - name='category', - field=models.CharField(choices=[('engine', 'Engine'), ('car', 'Car'), ('railcar', 'Railcar'), ('equipment', 'Equipment'), ('other', 'Other')], max_length=64), - ), - ] diff --git a/dcc/metadata/migrations/0004_company_freelance_decoder_sound.py b/dcc/metadata/migrations/0004_company_freelance_decoder_sound.py deleted file mode 100644 index 2d32053..0000000 --- a/dcc/metadata/migrations/0004_company_freelance_decoder_sound.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.0.2 on 2022-04-02 17:45 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('metadata', '0003_alter_company_options_alter_scale_options_and_more'), - ] - - operations = [ - migrations.AddField( - model_name='company', - name='freelance', - field=models.BooleanField(blank=True, default=False, null=True), - ), - migrations.AddField( - model_name='decoder', - name='sound', - field=models.BooleanField(blank=True, default=False, null=True), - ), - ] diff --git a/dcc/metadata/migrations/0005_alter_company_freelance_alter_decoder_sound.py b/dcc/metadata/migrations/0005_alter_company_freelance_alter_decoder_sound.py deleted file mode 100644 index 215e18d..0000000 --- a/dcc/metadata/migrations/0005_alter_company_freelance_alter_decoder_sound.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.0.2 on 2022-04-02 17:46 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('metadata', '0004_company_freelance_decoder_sound'), - ] - - operations = [ - migrations.AlterField( - model_name='company', - name='freelance', - field=models.BooleanField(default=False), - ), - migrations.AlterField( - model_name='decoder', - name='sound', - field=models.BooleanField(default=False), - ), - ] diff --git a/dcc/metadata/migrations/0006_manufacturer_category.py b/dcc/metadata/migrations/0006_manufacturer_category.py deleted file mode 100644 index 72f5710..0000000 --- a/dcc/metadata/migrations/0006_manufacturer_category.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.0.3 on 2022-04-04 19:14 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('metadata', '0005_alter_company_freelance_alter_decoder_sound'), - ] - - operations = [ - migrations.AddField( - model_name='manufacturer', - name='category', - field=models.CharField(choices=[('model', 'Model train'), ('real', 'Real train')], default='model', max_length=64), - preserve_default=False, - ), - ] diff --git a/dcc/metadata/migrations/0007_alter_manufacturer_category.py b/dcc/metadata/migrations/0007_alter_manufacturer_category.py deleted file mode 100644 index efd06ad..0000000 --- a/dcc/metadata/migrations/0007_alter_manufacturer_category.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0.3 on 2022-04-04 19:16 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('metadata', '0006_manufacturer_category'), - ] - - operations = [ - migrations.AlterField( - model_name='manufacturer', - name='category', - field=models.CharField(choices=[('model', 'Model train manufacturer'), ('real', 'Real train manufacturer')], max_length=64), - ), - ] diff --git a/dcc/metadata/migrations/0008_property_alter_manufacturer_options_and_more.py b/dcc/metadata/migrations/0008_property_alter_manufacturer_options_and_more.py deleted file mode 100644 index ff3e943..0000000 --- a/dcc/metadata/migrations/0008_property_alter_manufacturer_options_and_more.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 4.0.3 on 2022-04-07 09:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('metadata', '0007_alter_manufacturer_category'), - ] - - operations = [ - migrations.CreateModel( - name='Property', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=128, unique=True)), - ], - options={ - 'verbose_name_plural': 'Properties', - 'ordering': ['name'], - }, - ), - migrations.AlterModelOptions( - name='manufacturer', - options={'ordering': ['category', 'name']}, - ), - migrations.AlterField( - model_name='manufacturer', - name='category', - field=models.CharField(choices=[('model', 'Model'), ('real', 'Real')], max_length=64), - ), - ] diff --git a/dcc/roster/admin.py b/dcc/roster/admin.py index db58c87..cb58ec8 100644 --- a/dcc/roster/admin.py +++ b/dcc/roster/admin.py @@ -45,9 +45,9 @@ class RollingStockPropertyInline(admin.TabularInline): @admin.register(RollingStock) class RollingStockAdmin(admin.ModelAdmin): inlines = ( + RollingStockPropertyInline, RollingStockImageInline, RollingStockDocInline, - RollingStockPropertyInline ) readonly_fields = ("creation_time", "updated_time") list_display = ( @@ -74,11 +74,9 @@ class RollingStockAdmin(admin.ModelAdmin): "fields": ( "rolling_class", "road_number", - "manufacturer", "scale", + "manufacturer", "sku", - "decoder", - "address", "era", "production_year", "purchase_date", @@ -87,6 +85,15 @@ class RollingStockAdmin(admin.ModelAdmin): ) }, ), + ( + "DCC", + { + "fields": ( + "decoder", + "address", + ) + }, + ), ( "Audit", { diff --git a/dcc/roster/migrations/0001_initial.py b/dcc/roster/migrations/0001_initial.py index 9ad5c6e..9bcbb1e 100644 --- a/dcc/roster/migrations/0001_initial.py +++ b/dcc/roster/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.0.2 on 2022-04-02 14:25 +# Generated by Django 4.0.3 on 2022-04-07 09:25 from django.db import migrations, models import django.db.models.deletion @@ -15,34 +15,67 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name='Class', + name='RollingClass', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('identifier', models.CharField(max_length=128)), + ('description', models.CharField(blank=True, max_length=256)), ('company', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.company')), + ('manufacturer', models.ForeignKey(blank=True, limit_choices_to={'category': 'real'}, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.manufacturer')), ('type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.rollingstocktype')), ], + options={ + 'verbose_name': 'Class', + 'verbose_name_plural': 'Classes', + 'ordering': ['company', 'identifier'], + }, ), migrations.CreateModel( name='RollingStock', fields=[ ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), ('road_number', models.CharField(max_length=128)), - ('address', models.SmallIntegerField(blank=True, default=None, null=True)), ('sku', models.CharField(blank=True, max_length=32)), - ('epoch', models.CharField(blank=True, max_length=32)), + ('address', models.SmallIntegerField(blank=True, default=None, null=True)), + ('era', models.CharField(blank=True, max_length=32)), ('production_year', models.SmallIntegerField(blank=True, null=True)), ('purchase_date', models.DateField(blank=True, null=True)), ('notes', models.TextField(blank=True)), ('creation_time', models.DateTimeField(auto_now_add=True)), ('updated_time', models.DateTimeField(auto_now=True)), - ('_class', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='roster.class')), ('decoder', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.decoder')), - ('manufacturer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.manufacturer')), - ('tags', models.ManyToManyField(blank=True, related_name='rolling_stock', to='metadata.Tag')), + ('manufacturer', models.ForeignKey(blank=True, limit_choices_to={'category': 'model'}, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.manufacturer')), + ('rolling_class', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='roster.rollingclass', verbose_name='Class')), + ('scale', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='metadata.scale')), + ('tags', models.ManyToManyField(blank=True, related_name='rolling_stock', to='metadata.tag')), ], options={ 'verbose_name_plural': 'Rolling stock', + 'ordering': ['rolling_class', 'road_number'], + }, + ), + migrations.CreateModel( + name='RollingStockProperty', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('value', models.CharField(max_length=256)), + ('property', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='metadata.property')), + ('rolling_stock', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='roster.rollingstock')), + ], + options={ + 'verbose_name_plural': 'Properties', + }, + ), + migrations.CreateModel( + name='RollingClassProperty', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('value', models.CharField(max_length=256)), + ('property', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='metadata.property')), + ('rolling_class', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='roster.rollingclass', verbose_name='Class')), + ], + options={ + 'verbose_name_plural': 'Properties', }, ), migrations.CreateModel( diff --git a/dcc/roster/migrations/0002_rename_class_rollingclass_alter_rollingclass_options_and_more.py b/dcc/roster/migrations/0002_rename_class_rollingclass_alter_rollingclass_options_and_more.py deleted file mode 100644 index f1cbb85..0000000 --- a/dcc/roster/migrations/0002_rename_class_rollingclass_alter_rollingclass_options_and_more.py +++ /dev/null @@ -1,48 +0,0 @@ -# Generated by Django 4.0.2 on 2022-04-02 16:18 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('metadata', '0002_scale_manufacturer_website_and_more'), - ('roster', '0001_initial'), - ] - - operations = [ - migrations.RenameModel( - old_name='Class', - new_name='RollingClass', - ), - migrations.AlterModelOptions( - name='rollingclass', - options={'ordering': ['company', 'identifier'], 'verbose_name': 'Class', 'verbose_name_plural': 'Classes'}, - ), - migrations.AlterModelOptions( - name='rollingstock', - options={'ordering': ['rolling_class', 'road_number'], 'verbose_name_plural': 'Rolling stock'}, - ), - migrations.RenameField( - model_name='rollingstock', - old_name='epoch', - new_name='era', - ), - migrations.RemoveField( - model_name='rollingstock', - name='_class', - ), - migrations.AddField( - model_name='rollingstock', - name='rolling_class', - field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to='roster.rollingclass', verbose_name='Class'), - preserve_default=False, - ), - migrations.AddField( - model_name='rollingstock', - name='scale', - field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to='metadata.scale'), - preserve_default=False, - ), - ] diff --git a/dcc/roster/migrations/0003_rollingstockimage_description.py b/dcc/roster/migrations/0003_rollingstockimage_description.py deleted file mode 100644 index 7d991e1..0000000 --- a/dcc/roster/migrations/0003_rollingstockimage_description.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0.2 on 2022-04-02 17:16 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('roster', '0002_rename_class_rollingclass_alter_rollingclass_options_and_more'), - ] - - operations = [ - migrations.AddField( - model_name='rollingstockimage', - name='description', - field=models.CharField(blank=True, max_length=256), - ), - ] diff --git a/dcc/roster/migrations/0004_remove_rollingstockimage_description_and_more.py b/dcc/roster/migrations/0004_remove_rollingstockimage_description_and_more.py deleted file mode 100644 index ca7dd75..0000000 --- a/dcc/roster/migrations/0004_remove_rollingstockimage_description_and_more.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 4.0.2 on 2022-04-02 17:17 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('roster', '0003_rollingstockimage_description'), - ] - - operations = [ - migrations.RemoveField( - model_name='rollingstockimage', - name='description', - ), - migrations.AddField( - model_name='rollingclass', - name='description', - field=models.CharField(blank=True, max_length=256), - ), - ] diff --git a/dcc/roster/migrations/0005_rollingclass_builder_rollingclass_wheel_arrangement.py b/dcc/roster/migrations/0005_rollingclass_builder_rollingclass_wheel_arrangement.py deleted file mode 100644 index 369cd5a..0000000 --- a/dcc/roster/migrations/0005_rollingclass_builder_rollingclass_wheel_arrangement.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.0.3 on 2022-04-04 18:56 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('roster', '0004_remove_rollingstockimage_description_and_more'), - ] - - operations = [ - migrations.AddField( - model_name='rollingclass', - name='builder', - field=models.CharField(blank=True, max_length=128), - ), - migrations.AddField( - model_name='rollingclass', - name='wheel_arrangement', - field=models.CharField(blank=True, max_length=8), - ), - ] diff --git a/dcc/roster/migrations/0006_remove_rollingclass_builder_and_more.py b/dcc/roster/migrations/0006_remove_rollingclass_builder_and_more.py deleted file mode 100644 index c1db1ac..0000000 --- a/dcc/roster/migrations/0006_remove_rollingclass_builder_and_more.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 4.0.3 on 2022-04-04 19:14 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('metadata', '0006_manufacturer_category'), - ('roster', '0005_rollingclass_builder_rollingclass_wheel_arrangement'), - ] - - operations = [ - migrations.RemoveField( - model_name='rollingclass', - name='builder', - ), - migrations.AddField( - model_name='rollingclass', - name='manufacturer', - field=models.ForeignKey(blank=True, limit_choices_to={'category': 'real'}, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.manufacturer'), - ), - migrations.AlterField( - model_name='rollingstock', - name='manufacturer', - field=models.ForeignKey(blank=True, limit_choices_to={'category': 'model'}, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.manufacturer'), - ), - ] diff --git a/dcc/roster/migrations/0007_alter_rollingclass_wheel_arrangement.py b/dcc/roster/migrations/0007_alter_rollingclass_wheel_arrangement.py deleted file mode 100644 index b10faca..0000000 --- a/dcc/roster/migrations/0007_alter_rollingclass_wheel_arrangement.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0.3 on 2022-04-04 19:16 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('roster', '0006_remove_rollingclass_builder_and_more'), - ] - - operations = [ - migrations.AlterField( - model_name='rollingclass', - name='wheel_arrangement', - field=models.CharField(blank=True, max_length=64), - ), - ] diff --git a/dcc/roster/migrations/0008_rollingclassproperty.py b/dcc/roster/migrations/0008_rollingclassproperty.py deleted file mode 100644 index ce99163..0000000 --- a/dcc/roster/migrations/0008_rollingclassproperty.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 4.0.3 on 2022-04-07 09:03 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('metadata', '0008_property_alter_manufacturer_options_and_more'), - ('roster', '0007_alter_rollingclass_wheel_arrangement'), - ] - - operations = [ - migrations.CreateModel( - name='RollingClassProperty', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('value', models.CharField(max_length=256)), - ('property', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='metadata.property')), - ('rolling_class', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='roster.rollingclass', verbose_name='Class')), - ], - ), - ] diff --git a/dcc/roster/migrations/0009_remove_rollingclass_wheel_arrangement.py b/dcc/roster/migrations/0009_remove_rollingclass_wheel_arrangement.py deleted file mode 100644 index 4da2cdc..0000000 --- a/dcc/roster/migrations/0009_remove_rollingclass_wheel_arrangement.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.0.3 on 2022-04-07 09:05 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('roster', '0008_rollingclassproperty'), - ] - - operations = [ - migrations.RemoveField( - model_name='rollingclass', - name='wheel_arrangement', - ), - ] diff --git a/dcc/roster/migrations/0010_rollingstockproperty.py b/dcc/roster/migrations/0010_rollingstockproperty.py deleted file mode 100644 index eb99607..0000000 --- a/dcc/roster/migrations/0010_rollingstockproperty.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 4.0.3 on 2022-04-07 09:19 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('metadata', '0008_property_alter_manufacturer_options_and_more'), - ('roster', '0009_remove_rollingclass_wheel_arrangement'), - ] - - operations = [ - migrations.CreateModel( - name='RollingStockProperty', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('value', models.CharField(max_length=256)), - ('property', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='metadata.property')), - ('rolling_stock', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='roster.rollingstock')), - ], - ), - ]