This commit is contained in:
Ross
2021-02-25 22:16:21 +00:00
parent 3b874b489b
commit 6d48afc361
4 changed files with 31 additions and 0 deletions
+21
View File
@@ -285,6 +285,27 @@ class LongSeries(models.Model):
"<div>{}<br/>{}<br/>Images: {}</div>", examination, thumb, image_number
)
def order_by_upload_filename(self):
images = self.images.all()
filenames = []
map = []
for i in images:
filenames.append((i, i.upload_filename))
map[i.upload_filename] = i
filenames = sorted(filenames)
n = 1
for f in filenames:
i = map[f]
i.position = n
i.save()
n = n + 1
def order_by_dicom_location(self):
images = self.images.all()
@@ -14,6 +14,8 @@ This series is not associated with any cases.
<div>Author: {{ series.get_author_display }}</div>
<a href="{% url 'longs:long_series_order_dicom' pk=long.pk %}" title="orders dicom by slice location">Order dicoms</a>
<a href="{% url 'longs:long_series_order_upload_filename' pk=long.pk %}" title="orders dicom by slice location">Order by uploaded filename</a>
{% for image in series.images.all %}
{{image.image.url}}, pos: {{image.position}}, {{image.upload_filename}}</br>
+1
View File
@@ -12,6 +12,7 @@ urlpatterns = [
path("series/", views.LongSeriesView.as_view(), name="long_series_view"),
path("series/<int:pk>", views.long_series_detail, name="long_series_detail"),
path("series/<int:pk>/order_dicom", views.long_series_order_dicom, name="long_series_order_dicom"),
path("series/<int:pk>/order_upload_filename", views.long_series_order_upload_filename, name="long_series_order_upload_filename"),
path("series/<int:pk>/delete", views.LongSeriesDelete.as_view(), name="long_series_delete"),
# path("unchecked/", views.unchecked_list, name="unchecked_list"),
# path("verified/<int:pk>/", views.verified_detail, name="verified_detail"),
+7
View File
@@ -940,4 +940,11 @@ def long_series_order_dicom(request, pk):
return redirect("longs:long_series_detail", pk=pk)
@login_required
def long_series_order_upload_filename(request, pk):
series = get_object_or_404(LongSeries, pk=pk)
series.order_by_upload_filename()
return redirect("longs:long_series_detail", pk=pk)
LongExamViews = ExamViews(Exam, Long, "longs", "long", loadJsonAnswer)