fix a few things

atlas/models.py

@@ -502,54 +502,6 @@ class CaseCollection(ExamCollectionGenericBase):
     def __str__(self) -> str:
         return self.name
 
-    def get_author_objects(self):
-        """Returns a comma seperated text list of authors"""
-        authors = [i for i in self.author.all()]
-        return authors
-
-    def check_cid_user(self, cid, passcode, request=None):
-        if request is not None and request.user.is_superuser:
-            return True
-
-        if self.valid_cid_users.exists():
-            user = self.valid_cid_users.filter(cid=cid).first()
-
-            if not user or user.passcode != passcode:
-                return False
-
-        return True
-
-    def get_or_create_cid_user_exam(self, cid_user, start_time=None):
-        content_type = ContentType.objects.get_for_model(self)
-        c = CidUserExam.objects.filter(
-            content_type=content_type, object_id=self.pk, cid_user=cid_user
-        ).first()
-        if c:
-            return c
-
-        if start_time is None:
-            start_time = timezone.now()
-        new = CidUserExam(
-            content_type=content_type,
-            object_id=self.pk,
-            cid_user=cid_user,
-            start_time=start_time,
-        )
-        new.save()
-        return new
-
-    def get_cid_user_exams(self, cid_user=None):
-        content_type = ContentType.objects.get_for_model(self)
-        if cid_user is None:
-            return CidUserExam.objects.filter(
-                content_type=content_type,
-                object_id=self.pk,
-            )
-        else:
-            return CidUserExam.objects.filter(
-                content_type=content_type, object_id=self.pk, cid_user=cid_user
-            )
-
 
 class CaseDetail(models.Model):
     case = models.ForeignKey(Case, on_delete=models.CASCADE)

atlas/templates/atlas/case_display_block.html

@@ -28,13 +28,15 @@
         {% for series in case.series.all %}
             <span class="series-block">
                 <span>
-                    <span class="series-block-series-number">Series {{ forloop.counter }}:</span>
+                    <span class="series-block-series-number">Series {{ forloop.counter }}:</span><br>
                     <a href="{% url 'atlas:series_detail' pk=series.pk %}">
                         {{series.get_block}}
                     </a>
-
+                    <br>
+                    <span class="series-block-popup-link">
                     <a href="#"
                         onclick="return window.create_popup_window('/atlas/series/{{series.pk}}', 'Series')">Popup</a>
+                    </span>
                 </span>
             </span>
         {% endfor %}

atlas/templates/atlas/series_viewer.html

@@ -39,7 +39,7 @@
     {% for finding in series.findings.all %}
         <div class="finding-box">
             <button class="view-finding-button" data-annotationjson={{finding.annotation_json}}
-                data-viewportjson={{finding.viewport_json}} data-findingid={{finding.id}}>Click to view</button>
+                    data-viewportjson={{finding.viewport_json}} data-findingid={{finding.id}}>Click to view</button>
             <span class="view-finding-details">
                 Finding(s): {% for f in finding.findings.all %}{{f.get_link}}{% endfor %}<br />
                 Structure(s): {% for s in finding.structures.all %}{{s.get_link}}{% endfor %}<br />
@@ -58,18 +58,24 @@
     <summary>Image info</summary>
     <div>
         <a href="{% url 'atlas:series_anonymise_dicom' pk=series.pk %}"
-            title="Anonymise dicom images">Anonymise dicoms</a><br />
+           title="Anonymise dicom images">Anonymise dicoms</a><br />
         <a href="{% url 'atlas:series_order_dicom' pk=series.pk %}" title="orders dicom by slice location">Order dicoms
             by slice location</a>
         <a href="{% url 'atlas:series_order_dicom_instance' pk=series.pk %}"
-            title="orders dicom by instance number">Order dicoms by instance number</a>
+           title="orders dicom by instance number">Order dicoms by instance number</a>
         <a href="{% url 'atlas:series_order_dicom_SeriesInstanceUID' pk=series.pk %}"
-            title="orders dicom by instance number">Order dicoms by SeriesInstanceUID</a>
+           title="orders dicom by instance number">Order dicoms by SeriesInstanceUID</a>
         <a href="{% url 'atlas:series_order_upload_filename' pk=series.pk %}"
-            title="orders dicom by uploaded filename">Order by uploaded filename</a>
+           title="orders dicom by uploaded filename">Order by uploaded filename</a>
     </div>
     {% for image in series.images.all %}
-        {{image.image.url}}, pos: {{image.position}}, {{image.upload_filename}} [{{image.image.size|filesizeformat}}]<br />
+        {{image.image.url}}, pos: {{image.position}}, {{image.upload_filename}}
+
+
+        {% if image.image %}
+            [{{image.image.size|filesizeformat}}]
+        {% endif %}
+        <br />
         {% comment %} {{image.get_dicom_info|safe}}<br /> {% endcomment %}
 
     {% endfor %}
@@ -159,13 +165,13 @@
                 viewport_json: JSON.stringify(c.viewport),
                 findings: JSON.stringify($('#finding-form select[name="findings"]').find(":selected")
                         .map((i, el) => {
-                        return $(el).val()
-                    }).toArray()),
+                            return $(el).val()
+                        }).toArray()),
                 structures: JSON.stringify($('#finding-form select[name="structures"]').find(
                     ":selected")
                         .map((i, el) => {
-                        return $(el).val()
-                    }).toArray()),
+                            return $(el).val()
+                        }).toArray()),
                 csrfmiddlewaretoken: $('input[name=csrfmiddlewaretoken]').val(),
                 action: 'post'
             },