From b64c779a588876fb403901be5cd68f69f077452e Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Tue, 23 Jun 2020 23:34:08 +0100 Subject: rename SurvexScansFolders and tidy survex parser --- core/migrations/0001_initial.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'core/migrations/0001_initial.py') diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index cbcb4a7..5e14a6c 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -296,6 +296,17 @@ class Migration(migrations.Migration): 'abstract': False, }, ), + migrations.CreateModel( + name='ScansFolder', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('fpath', models.CharField(max_length=200)), + ('walletname', models.CharField(max_length=200)), + ], + options={ + 'ordering': ('walletname',), + }, + ), migrations.CreateModel( name='SurvexBlock', fields=[ @@ -359,24 +370,13 @@ class Migration(migrations.Migration): ('survexblock', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.SurvexBlock')), ], ), - migrations.CreateModel( - name='SurvexScansFolder', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('fpath', models.CharField(max_length=200)), - ('walletname', models.CharField(max_length=200)), - ], - options={ - 'ordering': ('walletname',), - }, - ), migrations.CreateModel( name='SurvexScanSingle', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('ffile', models.CharField(max_length=200)), ('name', models.CharField(max_length=200)), - ('survexscansfolder', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.SurvexScansFolder')), + ('survexscansfolder', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ScansFolder')), ], options={ 'ordering': ('name',), @@ -412,9 +412,9 @@ class Migration(migrations.Migration): ('bfontcolours', models.BooleanField(default=False)), ('filesize', models.IntegerField(default=0)), ('npaths', models.IntegerField(default=0)), + ('manyscansfolders', models.ManyToManyField(to='core.ScansFolder')), ('survexblocks', models.ManyToManyField(to='core.SurvexBlock')), ('survexscans', models.ManyToManyField(to='core.SurvexScanSingle')), - ('survexscansfolders', models.ManyToManyField(to='core.SurvexScansFolder')), ('survextitles', models.ManyToManyField(to='core.SurvexTitle')), ('tunnelcontains', models.ManyToManyField(to='core.TunnelFile')), ], @@ -435,7 +435,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='survexblock', name='survexscansfolder', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.SurvexScansFolder'), + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ScansFolder'), ), migrations.AddField( model_name='qm', -- cgit v1.2.3