numerous updates

anatomy/models.py

@@ -383,10 +383,14 @@ class Exam(ExamBase):
         related_name="anatomy_exam_author",
     )
 
-    valid_users = models.ManyToManyField(
+    valid_cid_users = models.ManyToManyField(
         CidUser, blank=True, related_name="anatomy_exams"
     )
 
+    valid_user_users = models.ManyToManyField(
+        settings.AUTH_USER_MODEL, blank=True, related_name="user_anatomy_exams"
+    )
+
     def get_exam_json(self, based=True):
         questions = self.exam_questions.all()
 
@@ -448,6 +452,10 @@ class CidUserAnswer(models.Model):
         help_text="Candidate ID (limitied by BigIntegerField size)",
     )
 
+    #user = models.ForeignKey(
+    #    settings.AUTH_USER_MODEL, on_delete=models.CASCADE, blank=True, null=True#, related_name="user_anatomy_user_answers"
+    #)
+
     # Each user answer is associated with a particular exam
     exam = models.ForeignKey(
         Exam, related_name="cid_user_answers", on_delete=models.CASCADE, null=True