Improvements to user management

2022-11-14 14:25:24 +00:00
parent 02eb812122
commit 6e6ba178b5
27 changed files with 515 additions and 20 deletions
@@ -0,0 +1,26 @@
+# Generated by Django 3.2.13 on 2022-11-14 09:44
+
+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),
+        ('generic', '0036_ciduserexam_results_emailed_status'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Supervisor',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('email', models.EmailField(blank=True, max_length=254)),
+                ('name', models.CharField(blank=True, max_length=255)),
+                ('active', models.BooleanField(default=True)),
+                ('user', models.OneToOneField(blank=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
@@ -0,0 +1,21 @@
+# Generated by Django 3.2.13 on 2022-11-14 13:18
+
+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),
+        ('generic', '0037_supervisor'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='supervisor',
+            name='user',
+            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]
@@ -0,0 +1,21 @@
+# Generated by Django 3.2.13 on 2022-11-14 13:19
+
+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),
+        ('generic', '0038_alter_supervisor_user'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='supervisor',
+            name='user',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.13 on 2022-11-14 13:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('generic', '0039_alter_supervisor_user'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='supervisor',
+            name='email',
+            field=models.EmailField(blank=True, max_length=254, unique=True),
+        ),
+    ]
@@ -0,0 +1,54 @@
+# Generated by Django 3.2.13 on 2022-11-14 13:55
+
+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),
+        ('generic', '0040_alter_supervisor_email'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='site',
+            name='initials',
+        ),
+        migrations.RemoveField(
+            model_name='site',
+            name='site',
+        ),
+        migrations.AddField(
+            model_name='site',
+            name='full_name',
+            field=models.CharField(blank=True, help_text='Name of the site', max_length=255),
+        ),
+        migrations.AddField(
+            model_name='site',
+            name='short_code',
+            field=models.CharField(blank=True, help_text='Shortcode/name of the site', max_length=255),
+        ),
+        migrations.AddField(
+            model_name='supervisor',
+            name='site',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='generic.site'),
+        ),
+        migrations.AlterField(
+            model_name='supervisor',
+            name='email',
+            field=models.EmailField(blank=True, help_text='The (nhs.net) email address of the supervisor', max_length=254, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='supervisor',
+            name='name',
+            field=models.CharField(blank=True, help_text='Name of the supervisor', max_length=255),
+        ),
+        migrations.AlterField(
+            model_name='supervisor',
+            name='user',
+            field=models.OneToOneField(blank=True, help_text='If the supervisor has an account on the test system that can be associated here', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]
@@ -0,0 +1,19 @@
+# Generated by Django 3.2.13 on 2022-11-14 14:01
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('generic', '0041_auto_20221114_1355'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userprofile',
+            name='supervisor',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='generic.supervisor'),
+        ),
+    ]
@@ -0,0 +1,19 @@
+# Generated by Django 3.2.13 on 2022-11-14 14:07
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('generic', '0042_userprofile_supervisor'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='supervisor',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='trainee', to='generic.supervisor'),
+        ),
+    ]