.

generic/views.py

@@ -2055,7 +2055,7 @@ class CidUserCreate(RevisionMixin, CidManagerRequiredMixin, CreateView):
     form_class = CidUserForm
 
 
-class CidUserUpdate(RevisionMixin, CidManagerRequiredMixin, UpdateView):
+class CidUserUpdate(CidManagerRequiredMixin, UpdateView):
     model = CidUser
     form_class = CidUserForm
 

longs/models.py

@@ -28,7 +28,18 @@ from helpers.images import image_as_base64, pretty_print_dicom
 
 from anatomy.models import Modality
 
-from generic.models import CidUser, CidUserGroup, Examination, Condition, Sign, ExamBase, Plane, Contrast, QuestionNote, UserUserGroup
+from generic.models import (
+    CidUser,
+    CidUserGroup,
+    Examination,
+    Condition,
+    Sign,
+    ExamBase,
+    Plane,
+    Contrast,
+    QuestionNote,
+    UserUserGroup,
+)
 
 # from generic.models import Examination, Site, Condition, Sign
 
@@ -47,14 +58,14 @@ from django.contrib.contenttypes.fields import GenericRelation
 
 image_storage = FileSystemStorage(
     # Physical file location ROOT
-    location=u"{0}longs/".format(settings.MEDIA_ROOT),
+    location="{0}longs/".format(settings.MEDIA_ROOT),
     # Url for file
-    base_url=u"{0}longs/".format(settings.MEDIA_URL),
+    base_url="{0}longs/".format(settings.MEDIA_URL),
 )
 
 
 def image_directory_path(instance, filename):
-    return u"longs/picture/{0}".format(filename)
+    return "longs/picture/{0}".format(filename)
 
 
 def findMiddle(input_list):
@@ -127,8 +138,9 @@ class Long(models.Model):
 
     json_creation_time = models.DateTimeField(blank=True, default=None, null=True)
 
-    question_json_id = models.IntegerField(default=1, help_text="Auto incrementing json creation number")
+    question_json_id = models.IntegerField(
-
+        default=1, help_text="Auto incrementing json creation number"
+    )
 
     series = SortedManyToManyField("LongSeries", related_name="long")
 
@@ -170,9 +182,7 @@ class Long(models.Model):
         return images
 
     def get_image_urls(self):
-        return ",".join(
+        return ",".join([f"{REMOTE_URL}{i.url}" for i in self.get_images()])
-            [f"{REMOTE_URL}{i.url}" for i in self.get_images()]
-        )
 
     def get_image_url_array(self):
         return json.dumps([f"{REMOTE_URL}{i.url}" for i in self.get_images()])
@@ -202,13 +212,11 @@ class Long(models.Model):
 
         return marker_unmarked
 
-
     def get_question_json(self, based=True, feedback=False):
         # self == q?
         # q = get_object_or_404(Long, pk=question_id)
         question_id = self.pk
 
-
         if not based:
             image_titles = []
             images = []
@@ -221,7 +229,12 @@ class Long(models.Model):
                 #    #image_array.append(i.image.url)
 
                 # We are still limited by the size of a series (although this should not be too big or computers will crash...)
-                images.append(["{}/{}".format(settings.REMOTE_URL, i.image.url) for i in series.images.all()])
+                images.append(
+                    [
+                        "{}/{}".format(settings.REMOTE_URL, i.image.url)
+                        for i in series.images.all()
+                    ]
+                )
                 # image_array = [i.image.url for i in series.images.all()]
                 # images.append(url)
                 image_titles.append(series.get_examination())
@@ -237,7 +250,6 @@ class Long(models.Model):
             }
             return question_json
 
-
         # exam_order.append(q.id)
         path = "{0}longs/questions/{1}.json".format(settings.MEDIA_ROOT, question_id)
         url = "{0}longs/questions/{1}.json".format(settings.MEDIA_URL, question_id)
@@ -250,14 +262,16 @@ class Long(models.Model):
 
             print("start writing file")
             # We manually create the json for long questions to reducem memroy usade
-            f.write("""{{
+            f.write(
+                """{{
             "title": "{}",
             "type": "long",
             "generated": "{}",
             "question_json_id": "{}",
-            """.format(self.history, timestamp.isoformat(), self.question_json_id)
+            """.format(
+                    self.history, timestamp.isoformat(), self.question_json_id
+                )
             )
-
 
             f.write('"images" : [')
             # images = []
@@ -289,7 +303,7 @@ class Long(models.Model):
                     # f.write(img.image.url)
                     f.write('"')
                     first = False
-                f.write(']')
+                f.write("]")
 
                 # images.append(url)
                 if i != len(question_series) - 1:
@@ -299,7 +313,6 @@ class Long(models.Model):
 
             f.write('"image_titles" : {} }}'.format(json.dumps(image_titles)))
 
-
         self.json_creation_time = timestamp
         self.save()
 
@@ -315,8 +328,6 @@ class Long(models.Model):
 
         return url
 
-
-
     # def GetNonFeedbackQuestionImages(self):
     # return self.get_images()
 
@@ -324,6 +335,7 @@ class Long(models.Model):
 def test_image_validator(file):
     pass
 
+
 class LongSeriesImage(models.Model):
     image = models.FileField(upload_to=image_directory_path)
     position = models.IntegerField(default=0)
@@ -333,14 +345,14 @@ class LongSeriesImage(models.Model):
     )
 
     class Meta:
-        ordering = ['position']
+        ordering = ["position"]
 
     def get_dicom_info(self):
         try:
             info = pretty_print_dicom(pydicom.read_file(self.image))
         except pydicom.errors.InvalidDicomError:
             info = "File is not a dicom."
-        return(info)
+        return info
 
 
 @reversion.register
@@ -392,15 +404,14 @@ class LongSeries(models.Model):
         help_text="If a question should be freely available to browse", default=True
     )
 
-
     def __str__(self):
         if self.long:
             long_id = ", ".format([long.pk for long in self.long.all()])
             # long_id = self.long.pk
         else:
             long_id = "None"
-        return "{}/{} : {} [{}]".format(self.pk,
+        return "{}/{} : {} [{}]".format(
-            self.get_examination(), self.description, long_id
+            self.pk, self.get_examination(), self.description, long_id
         )
 
     def get_author_objects(self):
@@ -440,18 +451,12 @@ class LongSeries(models.Model):
         return reverse("longs:long_series_detail", kwargs={"pk": self.pk})
 
     def get_image_urls(self, feedback=False):
-        images = [
+        images = [f"{REMOTE_URL}{i.image.url}" for i in self.images.all()]
-            f"{REMOTE_URL}{i.image.url}"
-            for i in self.images.all()
-        ]
 
         return ",".join(images)
 
     def get_image_url_array(self, feedback=False):
-        images = [
+        images = [f"{REMOTE_URL}{i.image.url}" for i in self.images.all()]
-            f"{REMOTE_URL}{i.image.url}"
-            for i in self.images.all()
-        ]
 
         return json.dumps(images)
 
@@ -466,7 +471,9 @@ class LongSeries(models.Model):
             thumbnailer = get_thumbnailer(img)
             thumbnail = thumbnailer["exam-list"]
         except InvalidImageFormatError:
-            return format_html('<span title="{}">Invalid image url<span>', img), len(images)
+            return format_html('<span title="{}">Invalid image url<span>', img), len(
+                images
+            )
         return format_html('<img src="/media/{}" />', thumbnail), len(images)
 
     def get_block(self):
@@ -495,8 +502,6 @@ class LongSeries(models.Model):
             i.save()
             n = n + 1
 
-
-
     def order_by_dicom(self, field="SliceLocation"):
         images = self.images.all()
 
@@ -524,7 +529,6 @@ class LongSeries(models.Model):
         # ensure they are in the correct order
         slices = sorted(slices, key=lambda s: s[field].value)
 
-
         # print(slices)
         n = 1
         for f in slices:
@@ -543,6 +547,7 @@ class LongSeries(models.Model):
 
         return size
 
+
 # class LongImage(models.Model):
 #    long = models.ForeignKey(Long,
 #                              related_name="images",
@@ -589,14 +594,20 @@ class Exam(ExamBase):
         default=4500,
     )
 
-    author = models.ManyToManyField(settings.AUTH_USER_MODEL,
+    author = models.ManyToManyField(
+        settings.AUTH_USER_MODEL,
         blank=True,
-                                    help_text='Author of exam',
+        help_text="Author of exam",
-                                    related_name="long_exam_author")
+        related_name="long_exam_author",
+    )
 
-    double_mark = models.BooleanField(default=True, help_text="Defines if an exam is expected to be double marked")
+    double_mark = models.BooleanField(
+        default=True, help_text="Defines if an exam is expected to be double marked"
+    )
 
-    valid_cid_users = models.ManyToManyField(CidUser, blank=True, related_name="longs_exams")
+    valid_cid_users = models.ManyToManyField(
+        CidUser, blank=True, related_name="longs_exams"
+    )
 
     valid_user_users = models.ManyToManyField(
         settings.AUTH_USER_MODEL, blank=True, related_name="user_longs_exams"
@@ -606,15 +617,14 @@ class Exam(ExamBase):
         CidUserGroup,
         blank=True,
         help_text="These groups define which candidates are able to be added to the exams/collection.",
-        related_name="longs_cid_user_groups"
+        related_name="longs_cid_user_groups",
-
     )
 
     user_user_groups = models.ManyToManyField(
         UserUserGroup,
         blank=True,
         help_text="These groups define which candidates are able to be added to the exams/collection.",
-        related_name="longs_user_user_groups"
+        related_name="longs_user_user_groups",
     )
 
     def get_exam_question_json(self, question_id):
@@ -634,8 +644,6 @@ class Exam(ExamBase):
             images.append(image_array)
             image_titles.append(series.get_examination())
 
-
-
         exam_question = {
             "title": q.history,
             "images": images,
@@ -648,7 +656,6 @@ class Exam(ExamBase):
 
         return exam_question
 
-
     def get_exam_json(self, based=True):
         questions = self.exam_questions.all()
 
@@ -661,7 +668,6 @@ class Exam(ExamBase):
             exam_order.append(q.id)
             if based:
 
-
                 # If it is a new question we need to for a question json refresh
                 if q.json_creation_time is None:
                     q.get_question_json()
@@ -676,11 +682,13 @@ class Exam(ExamBase):
                     # for i in series.images.all():
                     #    image_array.append(image_as_base64(i.image))
                     #    #image_array.append(i.image.url)
-                    image_array = ["{}/{}".format(settings.REMOTE_URL, i.image.url) for i in series.images.all()]
+                    image_array = [
+                        "{}/{}".format(settings.REMOTE_URL, i.image.url)
+                        for i in series.images.all()
+                    ]
                     images.append(image_array)
                     image_titles.append(series.get_examination())
 
-
                 # exam_questions[q.id] = n
 
                 exam_questions[q.id] = {
@@ -695,7 +703,6 @@ class Exam(ExamBase):
                 # if feedback_images:
                 #    exam_questions[q.id]["feedback_image"] = feedback_images
 
-
         exam_json = {
             "eid": "long/{}".format(self.id),
             "cached": False,
@@ -711,12 +718,12 @@ class Exam(ExamBase):
         if based:
             exam_json["question_requests"] = exam_questions
 
-
         if self.time_limit:
             exam_json["exam_time"] = self.time_limit
 
         return exam_json
 
+
 @reversion.register
 class CidUserAnswer(models.Model):
     """User answers by candidate"""
@@ -764,7 +771,11 @@ class CidUserAnswer(models.Model):
         EIGHT = 8, _("8")
 
     score = models.CharField(
-        max_length=3, choices=ScoreOptions.choices, default=ScoreOptions.UNMARKED, blank=True, help_text="The final score for the candidate"
+        max_length=3,
+        choices=ScoreOptions.choices,
+        default=ScoreOptions.UNMARKED,
+        blank=True,
+        help_text="The final score for the candidate",
     )
 
     # mark = models.ManyToManyField(
@@ -778,27 +789,30 @@ class CidUserAnswer(models.Model):
     updated = models.DateTimeField(auto_now=True)
 
     class Meta:
-        ordering = ['cid']
+        ordering = ["cid"]
 
     def __str__(self):
         try:
             exam = self.exam
         except (Exam.DoesNotExist, KeyError) as e:
             exam = "None"
-        return "{}/{}/{} ({})".format(
+        return "{}/{}/{} ({})".format(exam, self.cid, self.created, self.updated)
-            exam, self.cid, self.created, self.updated
-        )
 
     def save(self, *args, **kwargs):
         self.clean()
         return super(CidUserAnswer, self).save(*args, **kwargs)
 
     def clean(self):
-        for ans in (self.answer_observations, self.answer_interpretation, self.answer_principle_diagnosis, self.answer_differential_diagnosis, self.answer_management):
+        for ans in (
+            self.answer_observations,
+            self.answer_interpretation,
+            self.answer_principle_diagnosis,
+            self.answer_differential_diagnosis,
+            self.answer_management,
+        ):
             if ans:
                 ans = ans.strip()
 
-
     def is_marked(self):
         if self.score == "":
             return False
@@ -845,23 +859,28 @@ class CidUserAnswer(models.Model):
         return reverse("longs:user_answer_view", kwargs={"pk": self.pk})
 
 
-
-
-
 @reversion.register
 class AnswerMarks(models.Model):
-    score = models.CharField(
+    score = models.CharField(max_length=3, choices=CidUserAnswer.ScoreOptions.choices)
-        max_length=3, choices=CidUserAnswer.ScoreOptions.choices
+
+    mark_reason = models.TextField(
+        null=True,
+        blank=True,
+        help_text="Reason for the given mark - not visible to candidates",
     )
 
-    mark_reason = models.TextField(null=True, blank=True, help_text="Reason for the given mark - not visible to candidates")
+    candidate_feedback = models.TextField(
-
+        null=True, blank=True, help_text="Feedback for the candidate"
-    candidate_feedback = models.TextField(null=True, blank=True, help_text="Feedback for the candidate")
+    )
 
     marker = models.ForeignKey(
         settings.AUTH_USER_MODEL, related_name="marker", on_delete=models.CASCADE
     )
 
     user_answer = models.ForeignKey(
-        CidUserAnswer, related_name="mark", on_delete=models.SET_NULL, null=True, blank=True
+        CidUserAnswer,
+        related_name="mark",
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
     )