allow merging of examinations

longs/models.py

@@ -399,6 +399,9 @@ class LongSeries(SeriesBase):
     def get_absolute_url(self):
         return reverse("longs:series_detail", kwargs={"pk": self.pk})
 
+    def get_link(self):
+        return format_html("<a href='{}'>{}</a>", self.get_absolute_url(), self)
+
 
 class LongCreationDefault(models.Model):
     # author = models.OneToOneField(User,

longs/tables.py

@@ -71,7 +71,7 @@ class LongSeriesTable(tables.Table):
         "longs:long_series_update", text="Edit", args=[A("pk")], orderable=False
     )
     view = tables.LinkColumn(
-        "longs:long_series_detail", text="View", args=[A("pk")], orderable=False
+        "longs:series_detail", text="View", args=[A("pk")], orderable=False
     )
     popup = tables.Column(empty_values=(), orderable=False)
 

longs/templates/longs/long_display_block.html

@@ -14,7 +14,7 @@
         <span class="series-block">
             <span>
                 <span class="series-block-series-number">Series {{ forloop.counter }}:</span>
-                <a href="{% url 'longs:long_series_detail' pk=series.pk %}">
+                <a href="{% url 'longs:series_detail' pk=series.pk %}">
                     {{series.get_block}}
                 </a>
 

longs/templates/longs/mark_answer.html

@@ -65,7 +65,7 @@
                 <span class="series-block">
                     <span>
                         Series {{ forloop.counter }}:
-                        <a href="{% url 'longs:long_series_detail' pk=series.pk %}">
+                        <a href="{% url 'longs:series_detail' pk=series.pk %}">
                             {{series.get_block}}
                         </a>
 

longs/urls.py

@@ -11,7 +11,7 @@ urlpatterns = [
     path("author/", views.author_list, name="author_list"),
     path("question/", views.LongView.as_view(), name="long_view"),
     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>", views.series_detail, name="series_detail"),
     path(
         "series/<int:pk>/order_dicom",
         views.long_series_order_dicom,

longs/views.py

@@ -149,7 +149,7 @@ def question_detail(request, pk):
 
 @login_required
 @user_is_author_or_long_series_checker_or_long_marker
-def long_series_detail(request, pk):
+def series_detail(request, pk):
     series = get_object_or_404(LongSeries, pk=pk)
 
     # if request.user not in long.author.all():
@@ -1080,7 +1080,7 @@ def long_series_order_dicom(request, pk):
     except:
         return HttpResponse("<h1>Series does not appear to contain dicoms</h1>")
 
-    return redirect("longs:long_series_detail", pk=pk)
+    return redirect("longs:series_detail", pk=pk)
 
 
 @login_required
@@ -1094,7 +1094,7 @@ def long_series_order_dicom_instance(request, pk):
             "<h1>Series does not appear to contain dicoms (or field InstanceNumber)</h1>"
         )
 
-    return redirect("longs:long_series_detail", pk=pk)
+    return redirect("longs:series_detail", pk=pk)
 
 
 @login_required
@@ -1108,7 +1108,7 @@ def long_series_order_dicom_SeriesInstanceUID(request, pk):
             "<h1>Series does not appear to contain dicoms (or field SeriesInstanceUID)</h1>"
         )
 
-    return redirect("longs:long_series_detail", pk=pk)
+    return redirect("longs:series_detail", pk=pk)
 
 
 @login_required
@@ -1117,7 +1117,7 @@ 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)
+    return redirect("longs:series_detail", pk=pk)
 
 
 GenericExamViews = ExamViews(Exam, Long, None, UserAnswer, "longs", "long")