From 6dd1657076d27fd56f8417e50fa7101a0e621367 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Tue, 14 Dec 2021 17:45:27 +0000
Subject: [PATCH] .

---
 atlas/migrations/0022_auto_20211214_1745.py   | 35 ++++++++++++++
 atlas/models.py                               | 17 +++++--
 generic/migrations/0018_auto_20211214_1745.py | 46 +++++++++++++++++++
 generic/models.py                             | 12 +++++
 4 files changed, 107 insertions(+), 3 deletions(-)
 create mode 100644 atlas/migrations/0022_auto_20211214_1745.py
 create mode 100644 generic/migrations/0018_auto_20211214_1745.py

diff --git a/atlas/migrations/0022_auto_20211214_1745.py b/atlas/migrations/0022_auto_20211214_1745.py
new file mode 100644
index 00000000..3cbeb13d
--- /dev/null
+++ b/atlas/migrations/0022_auto_20211214_1745.py
@@ -0,0 +1,35 @@
+# Generated by Django 3.2.8 on 2021-12-14 17:45
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('atlas', '0021_rename_pathalogicalprocess_pathologicalprocess'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='case',
+            name='editor',
+            field=models.ManyToManyField(blank=True, related_name='atlas_edited_cases', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='case',
+            name='report',
+            field=models.TextField(blank=True, help_text='A model (sample) report for the case.', null=True),
+        ),
+        migrations.AlterField(
+            model_name='case',
+            name='author',
+            field=models.ManyToManyField(blank=True, help_text='Author of the case', related_name='atlas_authored_cases', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='case',
+            name='history',
+            field=models.TextField(blank=True, help_text='A (brief) summary of the relevant history', null=True),
+        ),
+    ]
diff --git a/atlas/models.py b/atlas/models.py
index 4adf92a2..b83584f9 100644
--- a/atlas/models.py
+++ b/atlas/models.py
@@ -218,8 +218,13 @@ class Case(models.Model):
         help_text="Description of the case",
     )
 
-    history = models.TextField(null=True, blank=True)
+    history = models.TextField(
+        null=True, blank=True, help_text="A (brief) summary of the relevant history"
+    )
     discussion = models.TextField(null=True, blank=True)
+    report = models.TextField(
+        null=True, blank=True, help_text="A model (sample) report for the case."
+    )
 
     # findings = models.TextField(null=True, blank=True)
 
@@ -242,8 +247,14 @@ class Case(models.Model):
     author = models.ManyToManyField(
         settings.AUTH_USER_MODEL,
         blank=True,
-        help_text="Author of question",
-        related_name="atlas_authored_questions",
+        help_text="Author of the case",
+        related_name="atlas_authored_cases",
+    )
+
+    editor = models.ManyToManyField(
+        settings.AUTH_USER_MODEL,
+        blank=True,
+        related_name="atlas_edited_cases",
     )
 
     scrapped = models.BooleanField(
diff --git a/generic/migrations/0018_auto_20211214_1745.py b/generic/migrations/0018_auto_20211214_1745.py
new file mode 100644
index 00000000..66c01283
--- /dev/null
+++ b/generic/migrations/0018_auto_20211214_1745.py
@@ -0,0 +1,46 @@
+# Generated by Django 3.2.8 on 2021-12-14 17:45
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('generic', '0017_alter_ciduser_cid'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CidUserGroup',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(blank=True, max_length=50)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='ciduser',
+            name='email',
+            field=models.EmailField(blank=True, max_length=254),
+        ),
+        migrations.AddField(
+            model_name='ciduser',
+            name='internal_candidate',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='ciduser',
+            name='name',
+            field=models.CharField(blank=True, max_length=255),
+        ),
+        migrations.AddField(
+            model_name='ciduserexam',
+            name='manual_submission',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='ciduser',
+            name='group',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='generic.cidusergroup'),
+        ),
+    ]
diff --git a/generic/models.py b/generic/models.py
index f0b80d24..69137f3c 100644
--- a/generic/models.py
+++ b/generic/models.py
@@ -203,6 +203,11 @@ class CidUser(models.Model):
     cid = models.IntegerField(blank=True, null=True, unique=True)
     passcode = models.CharField(blank=True, max_length=50)
     active = models.BooleanField(default=True)
+    internal_candidate = models.BooleanField(default=False)
+    name = models.CharField(blank=True, max_length=255)
+    email = models.EmailField(blank=True)
+
+    group = models.ForeignKey("CidUserGroup", on_delete=models.SET_NULL, null=True)
 
     def __str__(self) -> str:
         return str(self.cid)
@@ -222,3 +227,10 @@ class CidUserExam(models.Model):
 
     manual_submission = models.BooleanField(default=False)
 
+
+class CidUserGroup(models.Model):
+    name = models.CharField(blank=True, max_length=50)
+
+    def __str__(self) -> str:
+        return str(self.name)
+    
\ No newline at end of file