diff options
34 files changed, 225 insertions, 900 deletions
diff --git a/config/settings/base.py b/config/settings/base.py index 83317ca..12973a6 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -70,7 +70,7 @@ THIRD_PARTY_APPS = [ "crispy_forms", "allauth", "allauth.account", - "allauth.socialaccount", +# "allauth.socialaccount", "rest_framework", ] diff --git a/ctrack/caf/migrations/0001_initial.py b/ctrack/caf/migrations/0001_initial.py index 8e0b11a..bc6cc5a 100644 --- a/ctrack/caf/migrations/0001_initial.py +++ b/ctrack/caf/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.9 on 2020-01-25 16:56 +# Generated by Django 2.2.9 on 2020-02-18 16:05 from django.db import migrations, models import django.db.models.deletion @@ -9,18 +9,26 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('organisations', '0014_auto_20200125_1459'), ] operations = [ migrations.CreateModel( + name='CAF', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('essential_system', models.CharField(blank=True, max_length=255)), + ], + options={ + 'verbose_name': 'CAF', + }, + ), + migrations.CreateModel( name='CAFFileStore', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('descriptor', models.CharField(max_length=100)), ('virtual_location', models.CharField(help_text='USB, Rosa, email, etc', max_length=100)), ('physical_location', models.CharField(blank=True, help_text='Cupboard, room, building, etc', max_length=100)), - ('physical_location_organisation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.Organisation')), ], options={ 'verbose_name': 'CAF File Store', @@ -43,17 +51,4 @@ class Migration(migrations.Migration): ('file_store_location', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='caf.CAFFileStore')), ], ), - migrations.CreateModel( - name='CAF', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('essential_system', models.CharField(blank=True, max_length=255)), - ('file', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='caf.DocumentFile')), - ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.Organisation')), - ('triage_ranking', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='caf.Ranking')), - ], - options={ - 'verbose_name': 'CAF', - }, - ), ] diff --git a/ctrack/caf/migrations/0002_auto_20200207_1622.py b/ctrack/caf/migrations/0002_auto_20200207_1622.py deleted file mode 100644 index 2d4575b..0000000 --- a/ctrack/caf/migrations/0002_auto_20200207_1622.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-07 16:22 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('caf', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='caf', - name='file', - field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='caf.DocumentFile'), - ), - ] diff --git a/ctrack/caf/migrations/0002_auto_20200218_1605.py b/ctrack/caf/migrations/0002_auto_20200218_1605.py new file mode 100644 index 0000000..bd43d8e --- /dev/null +++ b/ctrack/caf/migrations/0002_auto_20200218_1605.py @@ -0,0 +1,37 @@ +# Generated by Django 2.2.9 on 2020-02-18 16:05 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('caf', '0001_initial'), + ('organisations', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='caffilestore', + name='physical_location_organisation', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.Organisation'), + ), + migrations.AddField( + model_name='caf', + name='file', + field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='caf.DocumentFile'), + ), + migrations.AddField( + model_name='caf', + name='owner', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.Organisation'), + ), + migrations.AddField( + model_name='caf', + name='triage_ranking', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='caf.Ranking'), + ), + ] diff --git a/ctrack/contrib/sites/migrations/0001_initial.py b/ctrack/contrib/sites/migrations/0001_initial.py index 304cd6d..fddaae2 100644 --- a/ctrack/contrib/sites/migrations/0001_initial.py +++ b/ctrack/contrib/sites/migrations/0001_initial.py @@ -1,42 +1,32 @@ +# Generated by Django 2.2.9 on 2020-02-18 16:05 + import django.contrib.sites.models -from django.contrib.sites.models import _simple_domain_name_validator from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [] + initial = True + + dependencies = [ + ] operations = [ migrations.CreateModel( - name="Site", + name='Site', fields=[ - ( - "id", - models.AutoField( - verbose_name="ID", - serialize=False, - auto_created=True, - primary_key=True, - ), - ), - ( - "domain", - models.CharField( - max_length=100, - verbose_name="domain name", - validators=[_simple_domain_name_validator], - ), - ), - ("name", models.CharField(max_length=50, verbose_name="display name")), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('domain', models.CharField(max_length=100, unique=True, validators=[django.contrib.sites.models._simple_domain_name_validator], verbose_name='domain name')), + ('name', models.CharField(max_length=50, verbose_name='display name')), ], options={ - "ordering": ("domain",), - "db_table": "django_site", - "verbose_name": "site", - "verbose_name_plural": "sites", + 'verbose_name': 'site', + 'verbose_name_plural': 'sites', + 'db_table': 'django_site', + 'ordering': ('domain',), }, - bases=(models.Model,), - managers=[("objects", django.contrib.sites.models.SiteManager())], - ) + managers=[ + ('objects', django.contrib.sites.models.SiteManager()), + ], + ), ] diff --git a/ctrack/contrib/sites/migrations/0002_alter_domain_unique.py b/ctrack/contrib/sites/migrations/0002_alter_domain_unique.py deleted file mode 100644 index 2c8d6da..0000000 --- a/ctrack/contrib/sites/migrations/0002_alter_domain_unique.py +++ /dev/null @@ -1,20 +0,0 @@ -import django.contrib.sites.models -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [("sites", "0001_initial")] - - operations = [ - migrations.AlterField( - model_name="site", - name="domain", - field=models.CharField( - max_length=100, - unique=True, - validators=[django.contrib.sites.models._simple_domain_name_validator], - verbose_name="domain name", - ), - ) - ] diff --git a/ctrack/contrib/sites/migrations/0003_set_site_domain_and_name.py b/ctrack/contrib/sites/migrations/0003_set_site_domain_and_name.py deleted file mode 100644 index e81e91e..0000000 --- a/ctrack/contrib/sites/migrations/0003_set_site_domain_and_name.py +++ /dev/null @@ -1,34 +0,0 @@ -""" -To understand why this file is here, please read: - -http://cookiecutter-django.readthedocs.io/en/latest/faq.html#why-is-there-a-django-contrib-sites-directory-in-cookiecutter-django -""" -from django.conf import settings -from django.db import migrations - - -def update_site_forward(apps, schema_editor): - """Set site domain and name.""" - Site = apps.get_model("sites", "Site") - Site.objects.update_or_create( - id=settings.SITE_ID, - defaults={ - "domain": "ctrackdft.net", - "name": "ctrack", - }, - ) - - -def update_site_backward(apps, schema_editor): - """Revert site domain and name to default.""" - Site = apps.get_model("sites", "Site") - Site.objects.update_or_create( - id=settings.SITE_ID, defaults={"domain": "example.com", "name": "example.com"} - ) - - -class Migration(migrations.Migration): - - dependencies = [("sites", "0002_alter_domain_unique")] - - operations = [migrations.RunPython(update_site_forward, update_site_backward)] diff --git a/ctrack/organisations/migrations/0001_initial.py b/ctrack/organisations/migrations/0001_initial.py index 6171bb8..0d8c2c4 100644 --- a/ctrack/organisations/migrations/0001_initial.py +++ b/ctrack/organisations/migrations/0001_initial.py @@ -1,6 +1,8 @@ -# Generated by Django 2.2.9 on 2020-01-20 16:12 +# Generated by Django 2.2.9 on 2020-02-18 16:05 from django.db import migrations, models +import django.db.models.deletion +import django_extensions.db.fields class Migration(migrations.Migration): @@ -12,10 +14,95 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( + name='Address', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('line1', models.CharField(max_length=255)), + ('line2', models.CharField(blank=True, max_length=255)), + ('line3', models.CharField(blank=True, max_length=255)), + ('city', models.CharField(max_length=100)), + ('county', models.CharField(blank=True, max_length=100)), + ('postcode', models.CharField(max_length=10)), + ('country', models.CharField(max_length=100)), + ('other_details', models.CharField(blank=True, max_length=255)), + ], + options={ + 'verbose_name_plural': 'Addresses', + }, + ), + migrations.CreateModel( + name='AddressType', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('descriptor', models.CharField(max_length=50)), + ], + ), + migrations.CreateModel( + name='Mode', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('descriptor', models.CharField(max_length=100)), + ], + ), + migrations.CreateModel( name='Organisation', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=255)), + ('slug', django_extensions.db.fields.AutoSlugField(blank=True, editable=False, populate_from=['name'])), + ('designation_type', models.IntegerField(choices=[(1, 'Automatic'), (2, 'Reserve Power')], default=1)), + ('registered_company_name', models.CharField(blank=True, max_length=255)), + ('registered_company_number', models.CharField(blank=True, max_length=100)), + ('date_updated', models.DateField(auto_now=True)), + ('comments', models.TextField(max_length=500)), + ('active', models.BooleanField(default=True)), + ], + ), + migrations.CreateModel( + name='Role', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=100)), + ], + ), + migrations.CreateModel( + name='Submode', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('descriptor', models.CharField(max_length=100)), + ('mode', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.Mode')), + ], + ), + migrations.CreateModel( + name='Person', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('primary_nis_contact', models.BooleanField(default=False, verbose_name='Primary NIS contact')), + ('voluntary_point_of_contact', models.BooleanField(default=False)), + ('has_egress', models.BooleanField(default=False, verbose_name='Has Egress')), + ('title', models.IntegerField(choices=[(1, 'Mr'), (2, 'Mrs'), (3, 'Miss'), (4, 'Ms'), (5, 'Dr.'), (6, 'Professor'), (7, 'The Rt Hon.'), (8, 'Lord'), (9, 'Lady')], default=1)), + ('job_title', models.CharField(max_length=100)), + ('first_name', models.CharField(max_length=50)), + ('last_name', models.CharField(max_length=50)), + ('email', models.EmailField(max_length=254)), + ('secondary_email', models.EmailField(blank=True, max_length=254)), + ('mobile', models.CharField(blank=True, max_length=20)), + ('landline', models.CharField(blank=True, max_length=20)), + ('date_updated', models.DateField(auto_now=True)), + ('clearance', models.IntegerField(choices=[(1, 'NA'), (2, 'BPSS'), (3, 'CTC'), (4, 'SC'), (5, 'DV'), (6, 'Other')], default=1)), + ('clearance_sponsor', models.CharField(blank=True, max_length=100)), + ('clearance_start_date', models.DateField(blank=True)), + ('clearance_last_checked', models.DateField(blank=True)), + ('clearance_expiry', models.DateField(blank=True)), + ('active', models.BooleanField(default=True)), + ('date_ended', models.DateField(blank=True)), + ('comments', models.TextField(max_length=1000)), + ('organisation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.Organisation')), + ('predecessor', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='previous_person', to='organisations.Person')), + ('role', models.ManyToManyField(to='organisations.Role')), ], + options={ + 'verbose_name_plural': 'People', + }, ), ] diff --git a/ctrack/organisations/migrations/0002_address.py b/ctrack/organisations/migrations/0002_address.py deleted file mode 100644 index 59227d4..0000000 --- a/ctrack/organisations/migrations/0002_address.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-20 20:39 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Address', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('line1', models.CharField(max_length=255)), - ('line2', models.CharField(max_length=255)), - ('line3', models.CharField(max_length=255)), - ('city', models.CharField(max_length=100)), - ('county', models.CharField(max_length=100)), - ('postcode', models.CharField(max_length=10)), - ('country', models.CharField(max_length=100)), - ('other_details', models.CharField(max_length=255)), - ], - ), - ] diff --git a/ctrack/organisations/migrations/0002_auto_20200218_1605.py b/ctrack/organisations/migrations/0002_auto_20200218_1605.py new file mode 100644 index 0000000..14359dd --- /dev/null +++ b/ctrack/organisations/migrations/0002_auto_20200218_1605.py @@ -0,0 +1,43 @@ +# Generated by Django 2.2.9 on 2020-02-18 16:05 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('organisations', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name='person', + name='updated_by', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + migrations.AddField( + model_name='organisation', + name='submode', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organisations.Submode'), + ), + migrations.AddField( + model_name='organisation', + name='updated_by', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + migrations.AddField( + model_name='address', + name='organisation', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='addresses', to='organisations.Organisation'), + ), + migrations.AddField( + model_name='address', + name='type', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.AddressType', verbose_name='Address Type'), + ), + ] diff --git a/ctrack/organisations/migrations/0003_organisation_address.py b/ctrack/organisations/migrations/0003_organisation_address.py deleted file mode 100644 index 6437d29..0000000 --- a/ctrack/organisations/migrations/0003_organisation_address.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-21 10:06 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0002_address'), - ] - - operations = [ - migrations.AddField( - model_name='organisation', - name='address', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organisations.Address'), - ), - ] diff --git a/ctrack/organisations/migrations/0004_auto_20200121_1027.py b/ctrack/organisations/migrations/0004_auto_20200121_1027.py deleted file mode 100644 index a2e8dd1..0000000 --- a/ctrack/organisations/migrations/0004_auto_20200121_1027.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-21 10:27 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0003_organisation_address'), - ] - - operations = [ - migrations.CreateModel( - name='AddressType', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('descriptor', models.CharField(max_length=50)), - ], - ), - migrations.AddField( - model_name='address', - name='type', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='organisations.AddressType'), - ), - ] diff --git a/ctrack/organisations/migrations/0005_auto_20200121_1028.py b/ctrack/organisations/migrations/0005_auto_20200121_1028.py deleted file mode 100644 index 9ee8833..0000000 --- a/ctrack/organisations/migrations/0005_auto_20200121_1028.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-21 10:28 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0004_auto_20200121_1027'), - ] - - operations = [ - migrations.AlterField( - model_name='address', - name='type', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='organisations.AddressType'), - ), - ] diff --git a/ctrack/organisations/migrations/0006_auto_20200121_1732.py b/ctrack/organisations/migrations/0006_auto_20200121_1732.py deleted file mode 100644 index 48a0636..0000000 --- a/ctrack/organisations/migrations/0006_auto_20200121_1732.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-21 17:32 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0005_auto_20200121_1028'), - ] - - operations = [ - migrations.RemoveField( - model_name='organisation', - name='address', - ), - migrations.AddField( - model_name='address', - name='organisation', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='organisations.Organisation'), - preserve_default=False, - ), - ] diff --git a/ctrack/organisations/migrations/0007_auto_20200121_1806.py b/ctrack/organisations/migrations/0007_auto_20200121_1806.py deleted file mode 100644 index 331bba9..0000000 --- a/ctrack/organisations/migrations/0007_auto_20200121_1806.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-21 18:06 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0006_auto_20200121_1732'), - ] - - operations = [ - migrations.AlterField( - model_name='address', - name='organisation', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='addresses', to='organisations.Organisation'), - ), - migrations.AlterField( - model_name='address', - name='type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.AddressType'), - ), - ] diff --git a/ctrack/organisations/migrations/0008_auto_20200123_1657.py b/ctrack/organisations/migrations/0008_auto_20200123_1657.py deleted file mode 100644 index 1b9f833..0000000 --- a/ctrack/organisations/migrations/0008_auto_20200123_1657.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-23 16:57 - -from django.db import migrations, models -import django.db.models.deletion -import django_extensions.db.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0007_auto_20200121_1806'), - ] - - operations = [ - migrations.AlterModelOptions( - name='address', - options={'verbose_name_plural': 'Addresses'}, - ), - migrations.AddField( - model_name='organisation', - name='slug', - field=django_extensions.db.fields.AutoSlugField(blank=True, editable=False, populate_from=['name']), - ), - migrations.AlterField( - model_name='address', - name='type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.AddressType', verbose_name='Address Type'), - ), - ] diff --git a/ctrack/organisations/migrations/0009_auto_20200124_1623.py b/ctrack/organisations/migrations/0009_auto_20200124_1623.py deleted file mode 100644 index 0b90de4..0000000 --- a/ctrack/organisations/migrations/0009_auto_20200124_1623.py +++ /dev/null @@ -1,53 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-24 16:23 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0008_auto_20200123_1657'), - ] - - operations = [ - migrations.CreateModel( - name='Role', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ], - ), - migrations.AlterField( - model_name='address', - name='county', - field=models.CharField(blank=True, max_length=100), - ), - migrations.AlterField( - model_name='address', - name='line2', - field=models.CharField(blank=True, max_length=255), - ), - migrations.AlterField( - model_name='address', - name='line3', - field=models.CharField(blank=True, max_length=255), - ), - migrations.AlterField( - model_name='address', - name='other_details', - field=models.CharField(blank=True, max_length=255), - ), - migrations.CreateModel( - name='Person', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255)), - ('email', models.EmailField(max_length=254)), - ('mobile', models.CharField(max_length=20)), - ('landline', models.CharField(max_length=20)), - ('organisation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.Organisation')), - ('role', models.ManyToManyField(to='organisations.Role')), - ], - ), - ] diff --git a/ctrack/organisations/migrations/0010_auto_20200124_1629.py b/ctrack/organisations/migrations/0010_auto_20200124_1629.py deleted file mode 100644 index de2b751..0000000 --- a/ctrack/organisations/migrations/0010_auto_20200124_1629.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-24 16:29 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0009_auto_20200124_1623'), - ] - - operations = [ - migrations.AlterField( - model_name='person', - name='landline', - field=models.CharField(blank=True, max_length=20), - ), - migrations.AlterField( - model_name='person', - name='mobile', - field=models.CharField(blank=True, max_length=20), - ), - ] diff --git a/ctrack/organisations/migrations/0011_mode_submode.py b/ctrack/organisations/migrations/0011_mode_submode.py deleted file mode 100644 index de7ce5c..0000000 --- a/ctrack/organisations/migrations/0011_mode_submode.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-25 14:44 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0010_auto_20200124_1629'), - ] - - operations = [ - migrations.CreateModel( - name='Mode', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('descriptor', models.CharField(max_length=100)), - ], - ), - migrations.CreateModel( - name='Submode', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('descriptor', models.CharField(max_length=100)), - ('mode', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='organisations.Mode')), - ], - ), - ] diff --git a/ctrack/organisations/migrations/0012_organisation_submode.py b/ctrack/organisations/migrations/0012_organisation_submode.py deleted file mode 100644 index 50d2610..0000000 --- a/ctrack/organisations/migrations/0012_organisation_submode.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-25 14:49 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0011_mode_submode'), - ] - - operations = [ - migrations.AddField( - model_name='organisation', - name='submode', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='organisations.Submode'), - preserve_default=False, - ), - ] diff --git a/ctrack/organisations/migrations/0013_auto_20200125_1457.py b/ctrack/organisations/migrations/0013_auto_20200125_1457.py deleted file mode 100644 index e39aaed..0000000 --- a/ctrack/organisations/migrations/0013_auto_20200125_1457.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-25 14:57 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0012_organisation_submode'), - ] - - operations = [ - migrations.AlterField( - model_name='organisation', - name='submode', - field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='organisations.Submode'), - ), - ] diff --git a/ctrack/organisations/migrations/0014_auto_20200125_1459.py b/ctrack/organisations/migrations/0014_auto_20200125_1459.py deleted file mode 100644 index b9cb1db..0000000 --- a/ctrack/organisations/migrations/0014_auto_20200125_1459.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-25 14:59 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0013_auto_20200125_1457'), - ] - - operations = [ - migrations.AlterField( - model_name='organisation', - name='submode', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='organisations.Submode'), - ), - ] diff --git a/ctrack/organisations/migrations/0015_organisation_designation_type.py b/ctrack/organisations/migrations/0015_organisation_designation_type.py deleted file mode 100644 index 50ec8d8..0000000 --- a/ctrack/organisations/migrations/0015_organisation_designation_type.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-17 16:49 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0014_auto_20200125_1459'), - ] - - operations = [ - migrations.AddField( - model_name='organisation', - name='designation_type', - field=models.IntegerField(choices=[(1, 'Automatic'), (2, 'Reserve Power')], default=1), - ), - ] diff --git a/ctrack/organisations/migrations/0016_auto_20200217_1712.py b/ctrack/organisations/migrations/0016_auto_20200217_1712.py deleted file mode 100644 index 2676b56..0000000 --- a/ctrack/organisations/migrations/0016_auto_20200217_1712.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-17 17:12 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0015_organisation_designation_type'), - ] - - operations = [ - migrations.AddField( - model_name='organisation', - name='registered_company_name', - field=models.CharField(blank=True, max_length=255), - ), - migrations.AddField( - model_name='organisation', - name='registered_company_number', - field=models.CharField(blank=True, max_length=100), - ), - ] diff --git a/ctrack/organisations/migrations/0017_auto_20200217_2050.py b/ctrack/organisations/migrations/0017_auto_20200217_2050.py deleted file mode 100644 index 7fe2de2..0000000 --- a/ctrack/organisations/migrations/0017_auto_20200217_2050.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-17 20:50 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('organisations', '0016_auto_20200217_1712'), - ] - - operations = [ - migrations.AlterModelOptions( - name='person', - options={'verbose_name_plural': 'People'}, - ), - migrations.AddField( - model_name='organisation', - name='date_updated', - field=models.DateField(auto_now=True), - ), - migrations.AddField( - model_name='organisation', - name='updated_by', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - preserve_default=False, - ), - ] diff --git a/ctrack/organisations/migrations/0018_organisation_comments.py b/ctrack/organisations/migrations/0018_organisation_comments.py deleted file mode 100644 index f4a29ff..0000000 --- a/ctrack/organisations/migrations/0018_organisation_comments.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-17 20:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0017_auto_20200217_2050'), - ] - - operations = [ - migrations.AddField( - model_name='organisation', - name='comments', - field=models.TextField(default='NA', max_length=500), - preserve_default=False, - ), - ] diff --git a/ctrack/organisations/migrations/0019_organisation_active.py b/ctrack/organisations/migrations/0019_organisation_active.py deleted file mode 100644 index affb7b8..0000000 --- a/ctrack/organisations/migrations/0019_organisation_active.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-17 20:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0018_organisation_comments'), - ] - - operations = [ - migrations.AddField( - model_name='organisation', - name='active', - field=models.BooleanField(default=True), - ), - ] diff --git a/ctrack/organisations/migrations/0020_auto_20200217_2124.py b/ctrack/organisations/migrations/0020_auto_20200217_2124.py deleted file mode 100644 index 918efdb..0000000 --- a/ctrack/organisations/migrations/0020_auto_20200217_2124.py +++ /dev/null @@ -1,127 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-17 21:24 - -import datetime -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('organisations', '0019_organisation_active'), - ] - - operations = [ - migrations.RemoveField( - model_name='person', - name='name', - ), - migrations.AddField( - model_name='person', - name='active', - field=models.BooleanField(default=True), - ), - migrations.AddField( - model_name='person', - name='clearance', - field=models.IntegerField(choices=[(1, 'NA'), (2, 'BPSS'), (3, 'CTC'), (4, 'SC'), (5, 'DV'), (6, 'Other')], default=1), - ), - migrations.AddField( - model_name='person', - name='clearance_expiry', - field=models.DateField(blank=True, default=datetime.datetime(2020, 2, 17, 21, 22, 59, 545682)), - preserve_default=False, - ), - migrations.AddField( - model_name='person', - name='clearance_last_checked', - field=models.DateField(blank=True, default=datetime.datetime(2020, 2, 17, 21, 23, 6, 797385)), - preserve_default=False, - ), - migrations.AddField( - model_name='person', - name='clearance_sponsor', - field=models.ForeignKey(blank=True, default=1, on_delete=django.db.models.deletion.CASCADE, to='organisations.Person'), - preserve_default=False, - ), - migrations.AddField( - model_name='person', - name='clearance_start_date', - field=models.DateField(blank=True, default=datetime.datetime(2020, 2, 17, 21, 23, 40, 808513)), - preserve_default=False, - ), - migrations.AddField( - model_name='person', - name='comments', - field=models.TextField(default='NA', max_length=1000), - preserve_default=False, - ), - migrations.AddField( - model_name='person', - name='date_ended', - field=models.DateField(blank=True, default=datetime.datetime(2020, 2, 17, 21, 23, 53, 114873)), - preserve_default=False, - ), - migrations.AddField( - model_name='person', - name='date_updated', - field=models.DateField(auto_now=True), - ), - migrations.AddField( - model_name='person', - name='first_name', - field=models.CharField(default='Malcolm', max_length=50), - preserve_default=False, - ), - migrations.AddField( - model_name='person', - name='has_egress', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='person', - name='job_title', - field=models.CharField(default='Firestarter', max_length=100), - preserve_default=False, - ), - migrations.AddField( - model_name='person', - name='last_name', - field=models.CharField(default='Holis-Grander', max_length=50), - preserve_default=False, - ), - migrations.AddField( - model_name='person', - name='predecessor', - field=models.ForeignKey(blank=True, default=1, on_delete=django.db.models.deletion.CASCADE, related_name='previous_person', to='organisations.Person'), - preserve_default=False, - ), - migrations.AddField( - model_name='person', - name='primary_nis_contact', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='person', - name='secondary_email', - field=models.EmailField(blank=True, max_length=254), - ), - migrations.AddField( - model_name='person', - name='title', - field=models.IntegerField(choices=[(1, 'Mr'), (2, 'Mrs'), (3, 'Miss'), (4, 'Ms'), (5, 'Dr.'), (6, 'Professor'), (7, 'The Rt Hon.'), (8, 'Lord'), (9, 'Lady')], default=1), - ), - migrations.AddField( - model_name='person', - name='updated_by', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - preserve_default=False, - ), - migrations.AddField( - model_name='person', - name='voluntary_point_of_contact', - field=models.BooleanField(default=False), - ), - ] diff --git a/ctrack/organisations/migrations/0021_auto_20200217_2127.py b/ctrack/organisations/migrations/0021_auto_20200217_2127.py deleted file mode 100644 index 4620a68..0000000 --- a/ctrack/organisations/migrations/0021_auto_20200217_2127.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.2.9 on 2020-02-17 21:27 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('organisations', '0020_auto_20200217_2124'), - ] - - operations = [ - migrations.AlterField( - model_name='person', - name='clearance_sponsor', - field=models.CharField(blank=True, max_length=100), - ), - migrations.AlterField( - model_name='person', - name='has_egress', - field=models.BooleanField(default=False, verbose_name='Has Egress'), - ), - migrations.AlterField( - model_name='person', - name='primary_nis_contact', - field=models.BooleanField(default=False, verbose_name='Primary NIS contact'), - ), - ] diff --git a/ctrack/users/migrations/0001_initial.py b/ctrack/users/migrations/0001_initial.py index c9d8905..1532380 100644 --- a/ctrack/users/migrations/0001_initial.py +++ b/ctrack/users/migrations/0001_initial.py @@ -1,3 +1,5 @@ +# Generated by Django 2.2.9 on 2020-02-18 16:05 + import django.contrib.auth.models import django.contrib.auth.validators from django.db import migrations, models @@ -8,125 +10,36 @@ class Migration(migrations.Migration): initial = True - dependencies = [("auth", "0008_alter_user_username_max_length")] + dependencies = [ + ('auth', '0011_update_proxy_permissions'), + ] operations = [ migrations.CreateModel( - name="User", + name='User', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("password", models.CharField(max_length=128, verbose_name="password")), - ( - "last_login", - models.DateTimeField( - blank=True, null=True, verbose_name="last login" - ), - ), - ( - "is_superuser", - models.BooleanField( - default=False, - help_text="Designates that this user has all permissions without explicitly assigning them.", - verbose_name="superuser status", - ), - ), - ( - "username", - models.CharField( - error_messages={ - "unique": "A user with that username already exists." - }, - help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.", - max_length=150, - unique=True, - validators=[ - django.contrib.auth.validators.UnicodeUsernameValidator() - ], - verbose_name="username", - ), - ), - ( - "first_name", - models.CharField( - blank=True, max_length=30, verbose_name="first name" - ), - ), - ( - "last_name", - models.CharField( - blank=True, max_length=150, verbose_name="last name" - ), - ), - ( - "email", - models.EmailField( - blank=True, max_length=254, verbose_name="email address" - ), - ), - ( - "is_staff", - models.BooleanField( - default=False, - help_text="Designates whether the user can log into this admin site.", - verbose_name="staff status", - ), - ), - ( - "is_active", - models.BooleanField( - default=True, - help_text="Designates whether this user should be treated as active. Unselect this instead of deleting accounts.", - verbose_name="active", - ), - ), - ( - "date_joined", - models.DateTimeField( - default=django.utils.timezone.now, verbose_name="date joined" - ), - ), - ( - "name", - models.CharField( - blank=True, max_length=255, verbose_name="Name of User" - ), - ), - ( - "groups", - models.ManyToManyField( - blank=True, - help_text="The groups this user belongs to. A user will get all permissions granted to each of their groups.", - related_name="user_set", - related_query_name="user", - to="auth.Group", - verbose_name="groups", - ), - ), - ( - "user_permissions", - models.ManyToManyField( - blank=True, - help_text="Specific permissions for this user.", - related_name="user_set", - related_query_name="user", - to="auth.Permission", - verbose_name="user permissions", - ), - ), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), + ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')), + ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), + ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), + ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('name', models.CharField(blank=True, max_length=255, verbose_name='Name of User')), + ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), ], options={ - "verbose_name_plural": "users", - "verbose_name": "user", - "abstract": False, + 'verbose_name': 'user', + 'verbose_name_plural': 'users', + 'abstract': False, }, - managers=[("objects", django.contrib.auth.models.UserManager())], - ) + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), ] diff --git a/ctrack/users/migrations/0002_auto_20200120_1012.py b/ctrack/users/migrations/0002_auto_20200120_1012.py deleted file mode 100644 index 838720f..0000000 --- a/ctrack/users/migrations/0002_auto_20200120_1012.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-20 10:12 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='email', - field=models.EmailField(max_length=254, unique=True), - ), - ] diff --git a/ctrack/users/migrations/0003_auto_20200120_1026.py b/ctrack/users/migrations/0003_auto_20200120_1026.py deleted file mode 100644 index 3374e9b..0000000 --- a/ctrack/users/migrations/0003_auto_20200120_1026.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-20 10:26 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0002_auto_20200120_1012'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='email', - field=models.EmailField(blank=True, max_length=254, verbose_name='email address'), - ), - ] diff --git a/ctrack/users/migrations/0004_auto_20200120_1026.py b/ctrack/users/migrations/0004_auto_20200120_1026.py deleted file mode 100644 index 00f6f2d..0000000 --- a/ctrack/users/migrations/0004_auto_20200120_1026.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-20 10:26 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0003_auto_20200120_1026'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='email', - field=models.EmailField(max_length=254, unique=True, verbose_name='Email address'), - ), - ] diff --git a/ctrack/users/migrations/0005_auto_20200120_1051.py b/ctrack/users/migrations/0005_auto_20200120_1051.py deleted file mode 100644 index d00df8f..0000000 --- a/ctrack/users/migrations/0005_auto_20200120_1051.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 2.2.9 on 2020-01-20 10:51 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0004_auto_20200120_1026'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='email', - field=models.EmailField(blank=True, max_length=254, verbose_name='email address'), - ), - ] |