a few minor changes

anatomy/urls.py

@@ -53,6 +53,7 @@ urlpatterns = [
         "exam/<int:exam_pk>/<int:sk>/mark/review", views.mark_review, name="mark_review"
     ),
     path("exam/<int:pk>/markers", views.ExamMarkersUpdate.as_view(), name="exam_markers"),
+    path("exam/<int:pk>/groups", views.ExamGroupsUpdate.as_view(), name="exam_groups_edit"),
     path("exam/<int:pk>/authors", views.ExamAuthorUpdate.as_view(), name="exam_authors"),
     path("exam/create", views.ExamCreate.as_view(), name="exam_create"),
     path("exam/<int:exam_id>/clone", views.ExamClone.as_view(), name="exam_clone"),

atlas/forms.py

@@ -57,7 +57,7 @@ from autocomplete import widgets as htmx_widgets
 
 import logging
 
-from generic.forms import ExamAuthorFormMixin
+from generic.forms import ExamAuthorFormMixin, ExamGroupsFormMixin
 
 from crispy_forms.helper import FormHelper
 
@@ -749,6 +749,9 @@ class SeriesAuthorForm(ExamAuthorFormMixin):
     class Meta(ExamAuthorFormMixin.Meta):
         model = Series
 
+class ExamGroupsForm(ExamGroupsFormMixin):
+    class Meta(ExamGroupsFormMixin.Meta):
+        model = CaseCollection
 
 class AnswerJSONForm(Form):
 

atlas/models.py

@@ -1188,6 +1188,14 @@ class SelfReview(models.Model):
     review_date = models.DateTimeField(auto_now_add=True)
     review_update_date = models.DateTimeField(auto_now=True)
 
+    def __str__(self) -> str:
+        date = self.review_date
+
+        if self.review_update_date is not None:
+            date = self.review_update_date
+
+        return f"Self review: {date:%Y-%m-%d} / {self.user_exam.exam} - {self.case}"
+
     def get_absolute_url(self):
         return self.user_exam.exam.get_case_take_url(self.case)
 

atlas/templates/atlas/collection_case_view_take.html

@@ -168,10 +168,10 @@
                 </div>
 
 
-                <div>
                 {% if collection.self_review %}
+                    <div>
                         <p>
-                            <a href="{% url 'atlas:add_self_review' cid_user_exam.id case.id %}"><button>Add self review</button></a>
+                            <a href="{% url 'atlas:add_self_review' cid_user_exam.id case.id %}"><button type="button">Add self review</button></a>
                         </p>
                         {% if self_review %}
                             <h4>Self Feedback</h4>
@@ -181,12 +181,12 @@
 
                             {% endfor %}
                         {% endif %}
+                    </div>
                 {% else %}
                     <h4>Answer score: {{answer.score}}</h4>
                     Answer feedback: {{answer.feedback|safe}}
                     <br/>
                 {% endif %}
-                </div>
 
                 <details><summary class="opacity-50">View questions</summary>
                     {{form.json.errors}}

atlas/templates/atlas/view.html

@@ -7,7 +7,11 @@
 {% block content %}
 
     <div class="container-fluid">
-        Create <a href='{{request.path}}create'>new</a><br/>
+        Create a new <a href='{{request.path}}create'>collection</a> / <a href="{% url 'atlas:user_collections' %}">Collections to view / take</a>
+
+
+
+        <h2>My Collections</h2>
         <details>
             <summary>
                 <h4>Filter</h4>

atlas/urls.py

@@ -111,6 +111,7 @@ urlpatterns = [
         views.GenericExamViews.exam_users_edit,
         name="exam_users_edit",
     ),
+    path("exam/<int:pk>/groups", views.ExamGroupsUpdate.as_view(), name="exam_groups_edit"),
     path(
         "collection/<int:exam_id>/case/<int:case_id>/details",
         views.collection_case_details,

atlas/views.py

@@ -47,6 +47,7 @@ from .forms import (
     CidReportAnswerMarkForm,
     ConditionAutocompleteForm,
     ConditionForm,
+    ExamGroupsForm,
     FindingForm,
     JsonAnswerForm,
     PriorCaseForm,
@@ -144,6 +145,7 @@ from django.forms.models import model_to_dict
 from generic.views import (
     AuthorRequiredMixin,
     ExamCloneMixin,
+    ExamGroupsUpdateBase,
     ExamViews,
     SeriesImagesZipViewBase,
 )
@@ -2713,6 +2715,15 @@ class CaseCollectionAuthorUpdate(RevisionMixin, AuthorRequiredMixin, UpdateView)
         context["collection"] = context["object"]
         return context
 
+class ExamGroupsUpdate(ExamGroupsUpdateBase):
+    model = CaseCollection
+    form_class = ExamGroupsForm
+
+    def get_context_data(self, **kwargs):
+        context = super(ExamGroupsUpdate, self).get_context_data(**kwargs)
+        context["exam"] = context["object"]
+        return context
+
 
 class CaseAuthorUpdate(RevisionMixin, AuthorRequiredMixin, UpdateView):
     model = Case
@@ -2816,8 +2827,12 @@ def collection_reset_answers(request, exam_id: int):
         case_details = collection.casedetail_set.all().prefetch_related()
 
         # Delete all answers
-        cid_answers = case_details.cidreportanswer_set.all()
-        user_answers = case_details.userreportanswer_set.all()
+        for case in case_details:
+            cid_answers = case.cidreportanswer_set.all()
+
+            cid_answers.delete()
+            user_answers = case.userreportanswer_set.all()
+            user_answers.delete()
 
         
         # User statuses
@@ -2825,6 +2840,7 @@ def collection_reset_answers(request, exam_id: int):
 
         # CidUserExams
         collection.cid_users.all().delete()
+        return HttpResponse("Success")
         
 
     else:

generic/models.py

@@ -789,7 +789,7 @@ class ExamOrCollectionGenericBase(models.Model, AuthorMixin):
         raise NotImplementedError
 
     def get_cid_user_exams(
-        self, cid_user: Optional["CidUser"] = None, user_user: User = None
+        self, cid_user: Optional["CidUser"] = None, user_user: User | None = None
     ) -> "CidUserExam":
         content_type = ContentType.objects.get_for_model(self)
         if cid_user is None and user_user is None:
@@ -992,6 +992,12 @@ class ExamBase(ExamOrCollectionGenericBase):
         else:
             return False
 
+    def get_user_users_with_scores(self):
+        user_ids = [i[2:] for i in self.user_scores if i.startswith("u/")]
+
+        return User.objects.filter(pk__in=user_ids)
+
+
     def generate_user_report(self, user):
         exam_text = [f"Candidate {user.first_name} [{user.email}]"]
 

generic/templates/generic/exam_overview_headers.html

@@ -107,6 +107,14 @@ Author(s): {% for author in exam.author.all %}
     {{ author }}{% if not forloop.last %}, {% endif %}
 {% endfor %}<br/>
 
+<details>
+    <summary>Extra</summary>
+                <button title="This will clear all user answers and attempts"
+                        hx-post="{% url exam.get_app_name|add:':order_questions' exam.pk %}"
+                        hx-swap="outerHTML"
+                >Order questions</button>
+</details>
+
 {% block css %}
     <style>
         .answer-management[open] {

generic/templates/generic/exam_report_email_status.html

@@ -1,16 +1,35 @@
 <ul>
+<h3>Email to send</h3>
+
+        <table>
+            <tr>
+                <th>Username</th>
+                <th>Supervisor</th>
+            </tr>
+            {% for user in users %}
+                <tr>
+                    <td>{{user.username}}</td>
+                    <td>{{user.userprofile.supervisor}}</td>
+                </tr>
+            {% endfor %}
+
+            </table>
+            <br/>
+
+
     {% for user, status in status.items %}
         <li class='{% if status.0 %}text-success{% else %}text-warning{% endif %}'>
             {{user.username}} {% if status.0 %}success{% else %}failed [{{status.1}}]{% endif %} ({{status.2}})
             <button hx-get="{% url exam.app_name|add:':exam_user_report_email' exam_id=exam.pk user_id=user.pk %}"
             hx-prompt="Enter any additional emails"
-            hx-confirm="Are you sure you wish to delete your account?"
+            hx-confirm="Are you sure you wish to resend all emails?"
             hx-trigger="click, click from:#resend-all"
             >Resend</button>
 
         </li>
     {% empty %}
-        No emails sent.
+        <p>No emails sent.</p>
+
     {% endfor %}
 </ul>
 <button id="resend-all">Resend all</button>

generic/templates/generic/exam_scores_base.html

@@ -131,7 +131,10 @@
 
         {% block breakdown %}{% endblock breakdown %}
 
-        <details>
+        <details 
+                    hx-get="{% url exam.app_name|add:':exam_report_email_status' exam_id=exam.pk %}"
+                    hx-trigger="revealed"
+                    hx-target="#user-details">
             <summary>Email results</summary>
             User results emailed: {{exam.exam_results_emailed|default:"Never"}}<br/>
             <button id="email-results-button"
@@ -149,7 +152,8 @@
             >Email unsent user results</button>
             <button id="email-results-check-button" title="Check the status of emailed results"
                     hx-get="{% url exam.app_name|add:':exam_report_email_status' exam_id=exam.pk %}"
-                    hx-target="#user-details">Check email status</button>
+                    hx-trigger="click"
+                    hx-target="#user-details">Refresh email status</button>
             <p>Note: currently only works with registered users</p>
             <div id="user-details"></div>
         </details>

generic/templates/generic/exam_users_edit.html

@@ -31,7 +31,7 @@
 </ol>
 
 {% comment %} Hide the toggle button if there are no users (to add or remove) {% endcomment %}
-{% if current_cid_users or available_cid_users %}
+{% if current_user_users or available_user_users %}
     <p><button class="toggle-all-btn">Toggle all</button></p>
 {% endif %}
 

generic/urls.py

@@ -342,6 +342,7 @@ def generic_exam_urls(generic_exam_view: GenericExamViews):
         ),
         path("exam/", generic_exam_view.exam_list, name="exam_list"),
         path("exam/all", generic_exam_view.exam_list_all, name="exam_list_all"),
+        path("exam/<int:exam_id>/order_questions", generic_exam_view.order_questions, name="order_questions"),
         path("exam/<int:exam_id>/cids", generic_exam_view.exam_cids, name="exam_cids"),
         # path("exam/<int:exam_id>/groups", generic_exam_view.exam_groups_edit, name="exam_groups_edit"),
         path(

generic/views.py

@@ -374,7 +374,7 @@ class ExamViews(View, LoginRequiredMixin):
         question_type,
         normalise_score=None,
     ):
-        self.Exam = exam
+        self.Exam: ExamBase = exam
         self.Question = question
         self.Answer = answer
         self.UserAnswer = cid_user_answer
@@ -582,7 +582,7 @@ class ExamViews(View, LoginRequiredMixin):
     @method_decorator(login_required)
     def exam_toggle_results_published(self, request, pk):
         if request.method == "POST":
-            if not self.check_user_edit_access(request.user):
+            if not self.check_user_edit_access(request.user, exam_id=pk):
                 data = {"status": "error, insufficient permission"}
                 return JsonResponse(data, status=400)
 
@@ -606,7 +606,7 @@ class ExamViews(View, LoginRequiredMixin):
     @method_decorator(login_required)
     def exam_toggle_active(self, request, pk):
         if request.method == "POST":
-            if not self.check_user_edit_access(request.user):
+            if not self.check_user_edit_access(request.user, exam_id=pk):
                 data = {"status": "error, insufficient permission"}
                 return JsonResponse(data, status=400)
 
@@ -654,6 +654,16 @@ class ExamViews(View, LoginRequiredMixin):
     def exam_list_all(self, request):
         return self.exam_list(request, all=True)
 
+    def order_questions(self, request, exam_id):
+        if not self.check_user_edit_access(request.user):
+            raise PermissionDenied
+
+        exam = get_object_or_404(self.Exam, pk=exam_id)
+
+        exam.order_questions()
+
+        return HttpResponse("Done")
+
     @method_decorator(login_required)
     def exam_list(self, request, all=False):
         if not self.check_user_access(request.user):
@@ -710,11 +720,11 @@ class ExamViews(View, LoginRequiredMixin):
             if not self.check_user_access(request.user, exam_id):
                 raise PermissionDenied
 
-        users = [i[2:] for i in exam.user_scores if i.startswith("u/")]
+        users = exam.get_user_users_with_scores()
 
         status = {}
-        for u in users:
-            user = User.objects.get(pk=u)
+        for user in users:
+            #user = User.objects.get(pk=u)
             user_exam = exam.get_or_create_cid_user_exam(user_user=user)
             if user_exam.results_emailed_status:
                 status[user] = json.loads(user_exam.results_emailed_status)
@@ -726,6 +736,7 @@ class ExamViews(View, LoginRequiredMixin):
                 "exam": exam,
                 "status": status,
                 "app_name": self.app_name,
+                "users": users,
             },
         )
         return JsonResponse(status)
@@ -760,13 +771,13 @@ class ExamViews(View, LoginRequiredMixin):
         # We only need to send emails to those who have scores
         # (who should be in exam.user_scores)
         if users is None:
-            users = [i[2:] for i in exam.user_scores if i.startswith("u/")]
+            users = exam.get_user_users_with_scores()
 
         time = timezone.now()
 
         email_results = {}
-        for u in users:
-            user = User.objects.get(pk=u)
+        for user in users:
+            #user = User.objects.get(pk=u)
             user_exam = exam.get_or_create_cid_user_exam(user_user=user)
 
             if unsent_only and user_exam.results_emailed_status:
@@ -1978,6 +1989,8 @@ class ExamViews(View, LoginRequiredMixin):
             raise Http404("Packet not in exam mode")
 
         if not exam.check_cid_user(cid, passcode, request.user):
+            if not self.check_user_access(request.user, pk):
+                #raise PermissionDenied
                 raise Http404("Error accessing exam")
 
         if user is not None:
@@ -2564,6 +2577,7 @@ class ExamCloneMixin():
         object.exam_questions.set(self.exam_questions)
         object.author.set(self.author)
         object.save()
+        object.order_questions()
         return HttpResponseRedirect(object.get_absolute_url())
 
 

longs/templates/longs/exam_scores_user.html

@@ -62,6 +62,12 @@
 .not-answered {
     opacity: 0.5;
 }
+.image-link {
+    cursor: pointer;
+    border: 1px solid purple;
+    padding-left: 4px;
+    padding-right: 4px;
+}
 </style>
 {% endblock css %}
 {% block js %}

longs/urls.py

@@ -62,11 +62,11 @@ urlpatterns = [
     # path("all_questions/", views.all_questions, name="all_questions"),
     path("question/<int:pk>/scrap", views.long_scrap, name="long_scrap"),
     path("question/<int:pk>/delete", views.LongDelete.as_view(), name="long_delete"),
-    path(
-        "exam/<int:pk>/review",
-        views.question_review,
-        name="question_review",
-    ),
+#    path(
+#        "exam/<int:pk>/review",
+#        views.question_review,
+#        name="question_review",
+#    ),
     path(
         "exam/<int:exam_id>/<int:question_number>/<int:answer_id>/mark",
         views.mark_answer,
@@ -157,5 +157,5 @@ urlpatterns = [
 ]
 
 
-#urlpatterns.extend(generic_view_urls(views.GenericViews))
+urlpatterns.extend(generic_view_urls(views.GenericViews))
 urlpatterns.extend(generic_exam_urls(views.GenericExamViews))

longs/views.py

@@ -85,6 +85,7 @@ from generic.views import (
     ExamGroupsUpdateBase,
     ExamUpdateBase,
     ExamViews,
+    GenericViewBase,
     RedirectMixin,
     SeriesImagesZipViewBase,
     UpdateQuestionMixin,
@@ -954,6 +955,7 @@ def long_series_order_upload_filename(request, pk):
 
 
 GenericExamViews = ExamViews(Exam, Long, None, UserAnswer, "longs", "long")
+GenericViews = GenericViewBase("longs", Long, UserAnswer, Exam)
 
 
 class ExamCreate(ExamCreateBase):

physics/migrations/0014_rename_rapid_examquestiondetail_question.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.2 on 2024-08-28 17:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('physics', '0013_alter_exam_markers'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='examquestiondetail',
+            old_name='rapid',
+            new_name='question',
+        ),
+    ]

physics/models.py

@@ -141,7 +141,7 @@ class ExamQuestionDetail(models.Model):
     sort_order = models.IntegerField(default=1000)
 
     exam = models.ForeignKey("Exam", on_delete=models.CASCADE)
-    rapid = models.ForeignKey(Question, on_delete=models.CASCADE)
+    question = models.ForeignKey(Question, on_delete=models.CASCADE)
 
     class Meta:
         ordering = ("sort_order",)

physics/urls.py

@@ -34,6 +34,7 @@ urlpatterns.extend(
             name="exam_take_overview_user",
         ),
         path("exam/<int:pk>/markers", views.ExamMarkersUpdate.as_view(), name="exam_markers"),
+        path("exam/<int:pk>/groups", views.ExamGroupsUpdate.as_view(), name="exam_groups_edit"),
         path(
             "exam/<int:pk>/authors",
             views.ExamAuthorUpdate.as_view(),

rapids/urls.py

@@ -51,6 +51,7 @@ urlpatterns = [
         "exam/<int:exam_pk>/<int:sk>/mark/review", views.mark_review, name="mark_review"
     ),
     path("exam/<int:pk>/markers", views.ExamMarkersUpdate.as_view(), name="exam_markers"),
+    path("exam/<int:pk>/groups", views.ExamGroupsUpdate.as_view(), name="exam_groups_edit"),
     path("exam/<int:pk>/authors", views.ExamAuthorUpdate.as_view(), name="exam_authors"),
     path("exam/create", views.ExamCreate.as_view(), name="exam_create"),
     path("exam/<int:exam_id>/clone", views.ExamClone.as_view(), name="exam_clone"),

rcr/templates/rcr/results.html

@@ -13,6 +13,9 @@
                 <th>Outcome (reason)</th>
                 <th>Outcome (free text)</th>
                 <th>Comments</th>
+                <th>Radiology Category</th>
+                <th>Oncology Category</th>
+                <th>Radiology Condition</th>
             </tr>
         </thead>
         <tbody>
@@ -27,6 +30,25 @@
                     <td>{{item.outcome_reason}}</td>
                     <td>{{item.outcome_free_text}}</td>
                     <td>{{item.comments}}</td>
+                    <td>{% for cat in item.radiology_categories.all %}
+                        {% if forloop.last %}
+                            {{cat}}
+                        {% else %}
+                            {{cat}} |
+
+                        {% endif %}
+                    {% endfor %}
+                    </td>
+                    <td>{{item.oncology_category}}</td>
+                    <td>{% for cat in item.radiology_condition.all %}
+                        {% if forloop.last %}
+                            {{cat}}
+                        {% else %}
+                            {{cat}} |
+
+                        {% endif %}
+                    {% endfor %}
+                    </td>
                 </tr>
             {% endfor %}
         </tbody>

sbas/migrations/0014_rename_rapid_examquestiondetail_question.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.2 on 2024-08-28 17:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sbas', '0013_alter_exam_markers'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='examquestiondetail',
+            old_name='rapid',
+            new_name='question',
+        ),
+    ]

sbas/models.py

@@ -159,7 +159,7 @@ class ExamQuestionDetail(models.Model):
     sort_order = models.IntegerField(default=1000)
 
     exam = models.ForeignKey("Exam", on_delete=models.CASCADE)
-    rapid = models.ForeignKey(Question, on_delete=models.CASCADE)
+    question = models.ForeignKey(Question, on_delete=models.CASCADE)
 
     class Meta:
         ordering = ("sort_order",)

sbas/urls.py

@@ -50,6 +50,7 @@ urlpatterns = [
     ),
 
     path("exam/<int:pk>/markers", views.ExamMarkersUpdate.as_view(), name="exam_markers"),
+    path("exam/<int:pk>/groups", views.ExamGroupsUpdate.as_view(), name="exam_groups_edit"),
     path(
         "exam/<int:pk>/authors", views.ExamAuthorUpdate.as_view(), name="exam_authors"
     ),