.

anatomy/static/css/anatomy.css

@@ -447,6 +447,6 @@ td.user-answer-score-2::after {
     display: block;
 }
 
-.multi-image-block {
+.multi-image-block, .series-block {
    display: inline-flex;
  }

anatomy/static/js/anatomy.js

@@ -365,7 +365,7 @@ function keyDownHandler(e) {
 
 
 function create_popup_window(url, title) {
-    newwindow=window.open(url,title,'height=600,width=500');
+    newwindow=window.open(url,title,'height=800,width=600');
     if (window.focus) {newwindow.focus()}
     return false;
 }

generic/models.py

@@ -1,8 +1,12 @@
 from django.db import models
 
+from django.urls import reverse
+
 import tagulous
 import tagulous.models
 
+from sortedm2m.fields import SortedManyToManyField
+
 
 class Examination(models.Model):
     examination = models.CharField(max_length=200)
@@ -25,3 +29,43 @@ class Condition(tagulous.models.TagModel):
 
 class Sign(tagulous.models.TagModel):
     pass
+
+
+class ExamBase(models.Model):
+    name = models.CharField(max_length=200)
+    #exam_questions = SortedManyToManyField(Long, related_name="exams", blank="true")
+
+    active = models.BooleanField(
+        help_text="If an exam should be available", default=True
+    )
+
+    publish_results = models.BooleanField(
+        help_text="If an exams results should be available", default=True
+    )
+
+    recreate_json = models.BooleanField(
+        help_text="If the json cache needs updating", default=False
+    )
+
+    #time_limit = models.IntegerField(
+    #    help_text="Exam time limit (in seconds). Default is 2100 secondse (35 minutes)",
+    #    default=2100,
+    #)
+
+    class Meta:
+        abstract = True
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return reverse("{}:exam_overview".format(self.app_name), kwargs={"pk": self.pk})
+
+    def get_exam_name(self):
+        return self.name
+
+    def get_json_url(self):
+        return reverse("{}:exam_json".format(self.app_name), args=(self.pk,))
+
+    def get_question_index(self, question):
+        return list(self.exam_questions.all()).index(question)

longs/migrations/0011_auto_20210206_1531.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.1.3 on 2021-02-06 15:31
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('longs', '0010_auto_20210206_0905'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='longseries',
+            name='long',
+            field=models.ForeignKey(blank=True, help_text='The question this series should be associated with', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='series', to='longs.long'),
+        ),
+    ]

longs/migrations/0012_auto_20210206_1541.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.1.3 on 2021-02-06 15:41
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('longs', '0011_auto_20210206_1531'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='longseries',
+            name='author',
+        ),
+        migrations.AddField(
+            model_name='longseries',
+            name='author',
+            field=models.ManyToManyField(blank=True, related_name='long_series', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

longs/migrations/0013_auto_20210206_2147.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.3 on 2021-02-06 21:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('longs', '0012_auto_20210206_1541'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='exam',
+            name='time_limit',
+            field=models.IntegerField(default=4500, help_text='Exam time limit (in seconds). Default is 4500 secondse (75 minutes)'),
+        ),
+    ]

longs/models.py

@@ -21,7 +21,7 @@ import string
 
 from anatomy.models import Modality
 
-from generic.models import Examination, Condition, Sign
+from generic.models import Examination, Condition, Sign, ExamBase
 
 # from generic.models import Examination, Site, Condition, Sign
 
@@ -164,23 +164,26 @@ class LongSeries(models.Model):
         related_name="series",
         on_delete=models.SET_NULL,
         null=True,
+        blank=True,
     )
     description = models.TextField(
         blank=True,
         help_text="Description of stack, for admin organisation, will not be visible when taking",
     )
 
-    author = models.ForeignKey(
+    author = models.ManyToManyField(
         settings.AUTH_USER_MODEL,
         blank=True,
-        null=True,
         related_name="long_series",
-        on_delete=models.CASCADE,
     )
 
     def __str__(self):
+        if self.long:
+            long_id = self.long.pk
+        else:
+            long_id = "None"
         return "{} : {} [{}]".format(
-            self.get_examination(), self.description, self.long.pk
+            self.get_examination(), self.description, long_id
         )
 
     def get_author_objects(self):
@@ -223,9 +226,9 @@ class LongSeries(models.Model):
         img = findMiddle(images).image
         try:
             thumbnailer = get_thumbnailer(img)
+            thumbnail = thumbnailer["exam-list"]
         except InvalidImageFormatError:
-            return format_html('<span title="{}">Invalid image url<span>', image_object)
-        thumbnail = thumbnailer["exam-list"]
+            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):
@@ -290,43 +293,55 @@ class LongCreationDefault(models.Model):
         return reverse("longs:long_create")
 
 
-class Exam(models.Model):
-    name = models.CharField(max_length=200)
+class Exam(ExamBase):
+    app_name = "longs"
+
     exam_questions = SortedManyToManyField(Long, related_name="exams", blank="true")
 
-    active = models.BooleanField(
-        help_text="If an exam should be available", default=True
-    )
-
-    publish_results = models.BooleanField(
-        help_text="If an exams results should be available", default=True
-    )
-
-    recreate_json = models.BooleanField(
-        help_text="If the json cache needs updating", default=False
-    )
-
     time_limit = models.IntegerField(
-        help_text="Exam time limit (in seconds). Default is 2100 secondse (35 minutes)",
-        default=2100,
+        help_text="Exam time limit (in seconds). Default is 4500 secondse (75 minutes)",
+        default=4500,
     )
 
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return reverse("longs:exam_overview", kwargs={"pk": self.pk})
-
-    def get_exam_name(self):
-        return self.name
-
-    def get_json_url(self):
-        return reverse("longs:exam_json", args=(self.pk,))
-
-    def get_question_index(self, question):
-        return list(self.exam_questions.all()).index(question)
 
 
+#class Exam(models.Model):
+#    name = models.CharField(max_length=200)
+#    exam_questions = SortedManyToManyField(Long, related_name="exams", blank="true")
+#
+#    active = models.BooleanField(
+#        help_text="If an exam should be available", default=True
+#    )
+#
+#    publish_results = models.BooleanField(
+#        help_text="If an exams results should be available", default=True
+#    )
+#
+#    recreate_json = models.BooleanField(
+#        help_text="If the json cache needs updating", default=False
+#    )
+#
+#    time_limit = models.IntegerField(
+#        help_text="Exam time limit (in seconds). Default is 2100 secondse (35 minutes)",
+#        default=2100,
+#    )
+#
+#    def __str__(self):
+#        return self.name
+#
+#    def get_absolute_url(self):
+#        return reverse("longs:exam_overview", kwargs={"pk": self.pk})
+#
+#    def get_exam_name(self):
+#        return self.name
+#
+#    def get_json_url(self):
+#        return reverse("longs:exam_json", args=(self.pk,))
+#
+#    def get_question_index(self, question):
+#        return list(self.exam_questions.all()).index(question)
+#
+#
 class CidUserAnswer(models.Model):
     """User answers by candidate"""
 

longs/tables.py

@@ -1,7 +1,7 @@
 import django_tables2 as tables
 from django_tables2.utils import A
 
-from .models import Long
+from .models import Long, LongSeries
 
 from django.utils.html import format_html
 
@@ -67,6 +67,10 @@ class PopupLinkColumn(tables.Column):
 
         return obj.get_thumbnail()[0]
 
+def create_link(test):
+    print(test)
+    return "Hello"
+
 class LongSeriesTable(tables.Table):
     edit = tables.LinkColumn(
         "longs:long_series_update", text="Edit", args=[A("pk")], orderable=False
@@ -74,13 +78,16 @@ class LongSeriesTable(tables.Table):
     view = tables.LinkColumn(
         "longs:long_series_detail", text="View", args=[A("pk")], orderable=False
     )
-    popup = PopupLinkColumn(
-        "View in popup", orderable=False
-    )
+    popup = tables.Column(empty_values=(), orderable=False)
+
     images = LongSeriesImageColumn("Images", orderable=False)
 
     class Meta:
-        model = Long
+        model = LongSeries
         template_name = "django_tables2/bootstrap4.html"
         fields = ("modality", "examination", "long", "description", "author")
-        sequence = ("view", "popup", "images")
+        sequence = ("view", "popup", "images")
+
+    def render_popup(self, value, record):
+        print(self)
+        return format_html("""<a href="#" onclick="return window.create_popup_window('/longs/series/{}', 'Series')" >Popup</a>""", record.pk)

longs/templates/longs/exam_overview.html

@@ -20,18 +20,17 @@
         {% for question in questions.all %}
 
         <li>
-            {% for image in question.GetImages %}
-            <img src="{{ image|thumbnail_url:'exam-list' }}" alt="thumbail" />
+            History: {{ question.history}}
+            <br />
+            {% for series in question.series.all %}
+            <div class="series-block">
+            Series {{forloop.counter }}:<br />
+            {{series.get_block}}
+            </div>
             {% endfor %}
-            {% if not question.normal %}
-            <b>Abnormality:</b> {{ question.get_abnormalities }} <b>Region:</b> {{ question.get_regions }}
-            <br />
-            {{ question.GetPrimaryAnswer }}
-            {% else %}
-            <b>Normal</b>
-            {% endif %}
-            <br />
-            Examination: {{ question.get_examinations }}, <a href="{% url 'longs:exam_question_detail' pk=exam.pk sk=forloop.counter0 %}">View</a>, <a href="{% url 'longs:mark' pk=exam.pk sk=forloop.counter0 %}">Mark</a>
+            <div>
+            Author(s): {{question.get_authors}}
+            </div>
         </li>
         {% endfor %}
     </ol>

longs/templates/longs/long_series_viewer.html

@@ -1,6 +1,12 @@
 
 <div>{{ series.modality}}, {{ series.examination }}</div>
 
+{% if series.long %}
+Associated case: <a href="{% url 'longs:long_detail' pk=series.long.pk %}">{{series.long}}</a>
+{% else %}
+This series is not associated with any cases.
+{% endif %}
+
 <div id="single-dicom-viewer" class="dicom-viewer" data-images="{{ series.get_image_urls }}" data-annotations=''></div>
 
 <div>Author: {{ series.get_author_display }}</div>

longs/templates/longs/view.html

@@ -7,11 +7,11 @@
 {% block content %}
 
 <div id="view-filter-options">
-    <h3>Filter Longs</h3>
-<form action="" method="get">
-    {{ filter.form }}
-    <input class="btn btn-primary btn-sm mt-1 mb-1" type="submit" />
-</form>
+    <h4>Filter</h4>
+    <form action="" method="get">
+        {{ filter.form }}
+        <input class="btn btn-primary btn-sm mt-1 mb-1" type="submit" />
+    </form>
 </div>
 {% render_table table %}
 

longs/views.py

@@ -62,7 +62,7 @@ logger = logging.getLogger(__name__)
 class AuthorOrCheckerRequiredMixin(object):
     def get_object(self, *args, **kwargs):
         obj = super(UpdateView, self).get_object(*args, **kwargs)
-        if self.request.user.groups.filter(name="long_checker").exists():
+        if self.request.user.groups.filter(name="long_checker").exists() or self.request.user.is_superuser:
             return obj
         if self.request.user not in obj.get_author_objects():
             raise PermissionDenied()  # or Http404