Previous
diff --git a/longs/views.py b/longs/views.py
index a536ac31..28e8f524 100755
--- a/longs/views.py
+++ b/longs/views.py
@@ -679,7 +679,6 @@ def mark_answer(request, exam_id, question_number, answer_id, override=False):
)
answer_list.sort()
- print(answer_list)
previous_answer_id = False
next_answer_id = False
@@ -690,7 +689,6 @@ def mark_answer(request, exam_id, question_number, answer_id, override=False):
elif answer_list[-1] == answer_id:
previous_answer_id = answer_list[-2]
else:
- print(answer_list.index(answer_id))
next_answer_id = answer_list[answer_list.index(answer_id) + 1]
previous_answer_id = answer_list[answer_list.index(answer_id) - 1]
diff --git a/rad/static/css/anatomy.css b/rad/static/css/anatomy.css
index c846e2af..4bb99a47 100644
--- a/rad/static/css/anatomy.css
+++ b/rad/static/css/anatomy.css
@@ -1327,4 +1327,14 @@ a, a:link {
span#user-id {
opacity: 50%;
float: right;
+}
+
+.marking-link {
+ color: #8600789e;
+ text-decoration: none;
+ text-transform: uppercase;
+}
+.marking-link:hover {
+ color: #3282b8;
+ text-decoration: underline;
}
\ No newline at end of file
diff --git a/rad/views.py b/rad/views.py
index f8b889f1..34e3e3a0 100644
--- a/rad/views.py
+++ b/rad/views.py
@@ -7,7 +7,12 @@ from atlas.models import CaseCollection, CidReportAnswer, Case as AtlasCase
from generic.decorators import user_is_cid_user_manager
from generic.filters import UserUserFilter
from generic.tables import UserUserTable
-from generic.views import CidManagerRequiredMixin, RedirectMixin, get_question_and_content_type, get_user_exams
+from generic.views import (
+ CidManagerRequiredMixin,
+ RedirectMixin,
+ get_question_and_content_type,
+ get_user_exams,
+)
from django.core.exceptions import PermissionDenied, ObjectDoesNotExist
from django.shortcuts import render, get_object_or_404, redirect
from django.views.decorators.csrf import csrf_exempt
@@ -63,10 +68,19 @@ from sbas.models import Exam as SbasExam
from anatomy.views import GenericExamViews as AnatomyExamViews
from rapids.views import GenericExamViews as RapidsExamsViews
-from longs.views import GenericExamViews as LongsExamViews
+from shorts.views import GenericExamViews as ShortsExamsViews
+from longs.views import GenericExamViews as LongsExamsViews
from generic.forms import QuestionNoteForm
-from generic.models import CidUser, CimarCase, ExamCollection, QuestionNote, Supervisor, UserGrades, UserProfile
+from generic.models import (
+ CidUser,
+ CimarCase,
+ ExamCollection,
+ QuestionNote,
+ Supervisor,
+ UserGrades,
+ UserProfile,
+)
from django_filters.views import FilterView
@@ -82,31 +96,44 @@ from loguru import logger
import psutil
+
def feedback_checker(user):
return user.groups.filter(name="feedback_checker").exists()
+
@user_passes_test(lambda u: u.is_superuser)
def server(request):
-
return render(request, "server.html")
+
@user_is_cid_user_manager
def people(request):
return render(request, "people.html", {})
+
@login_required
def profile(request):
user = request.user
return render(request, "profile.html", {"user": user})
+
def index(request):
collections = []
if request.user.is_authenticated:
collections = ExamCollection.objects.filter(archive=False, author=request.user)
-
- rcr_assessor = request.user.groups.filter(Q(name="rcr_radiology_assessor") | Q(name="rcr_oncology_assessor")| Q(name="rcr_assessor")).exists()
- return render(request, "index.html", {"rcr_assessor": rcr_assessor, "collections": collections})
+
+ rcr_assessor = request.user.groups.filter(
+ Q(name="rcr_radiology_assessor")
+ | Q(name="rcr_oncology_assessor")
+ | Q(name="rcr_assessor")
+ ).exists()
+ return render(
+ request,
+ "index.html",
+ {"rcr_assessor": rcr_assessor, "collections": collections},
+ )
+
@user_is_cid_user_manager
def account_profile(request, slug):
@@ -151,6 +178,7 @@ def cid_results(request, cid):
},
)
+
@user_passes_test(lambda u: u.is_superuser)
def user_scores_admin(request, user_id):
try:
@@ -283,11 +311,15 @@ def active_exams(request, cid=None, passcode=None, based=True):
rapid_exams = RapidsExamsViews.active_exams(
request, False, cid=cid, passcode=passcode
)
- long_exams = LongsExamViews.active_exams(request, False, cid=cid, passcode=passcode)
+ short_exams = ShortsExamsViews.active_exams(
+ request, False, cid=cid, passcode=passcode
+ )
+ long_exams = LongsExamsViews.active_exams(request, False, cid=cid, passcode=passcode)
exams = []
exams.extend(anatomy_exams)
exams.extend(rapid_exams)
+ exams.extend(short_exams)
exams.extend(long_exams)
active_exams["exams"] = exams
@@ -318,7 +350,10 @@ def exam_submit(request):
elif exam_type == "rapid":
return RapidsExamsViews.post_exam_answers(request)
elif exam_type == "long":
- return LongsExamViews.post_exam_answers(request)
+ return LongsExamsViews.post_exam_answers(request)
+ elif exam_type == "short":
+ return ShortsExamsViews.post_exam_answers(request)
+
return JsonResponse({"success": False, "error": "Invalid exam type"})
except ObjectDoesNotExist:
return JsonResponse({"success": False, "error": "Invalid data"})
@@ -512,12 +547,14 @@ def view_feedback(request):
def privacy_view(request):
return render(request, "privacy.html")
+
def cimar(request):
if "link_id" in request.GET:
link_id = request.GET["link_id"]
return render(request, "cimar.html", {"link_id": link_id})
return render(request, "cimar.html")
+
def about_view(request):
return render(request, "about.html")
@@ -528,12 +565,17 @@ def stats(request):
anatomy_exam_count = AnatomyExam.objects.filter(archive=False).count()
anatomy_question_count = AnatomyQuestion.objects.filter().count()
- return render(request, "stats.html"
- , {"collection_count": collection_count,
- "case_count": case_count,
- "anatomy_exam_count": anatomy_exam_count,
- "anatomy_question_count": anatomy_question_count
- })
+ return render(
+ request,
+ "stats.html",
+ {
+ "collection_count": collection_count,
+ "case_count": case_count,
+ "anatomy_exam_count": anatomy_exam_count,
+ "anatomy_question_count": anatomy_question_count,
+ },
+ )
+
# HTTP Error 400
def page_not_found(request, exception):
@@ -545,7 +587,6 @@ def page_not_found(request, exception):
def page_forbidden(request, exception):
-
response = render(request, "403.html", context={"exception": exception})
response.status_code = 403
@@ -575,11 +616,11 @@ class UserListTableView(CidManagerRequiredMixin, SingleTableMixin, FilterView):
filterset_class = UserUserFilter
- #table_pagination = {"per_page": 5}
+ # table_pagination = {"per_page": 5}
def get_paginate_by(self, table_data) -> int | None:
return 100
- #return super().get_paginate_by(table_data)
+ # return super().get_paginate_by(table_data)
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
@@ -620,7 +661,12 @@ class DeleteUserView(CidManagerRequiredMixin, DeleteView):
class UpdateUserView(CidManagerRequiredMixin, UpdateView):
model = User
- fields = ["first_name", "last_name", "email", "is_active"] # Keep listing whatever fields
+ fields = [
+ "first_name",
+ "last_name",
+ "email",
+ "is_active",
+ ] # Keep listing whatever fields
# the combined UserProfile and User exposes.
template_name = "user_update.html"
slug_field = "username"
@@ -649,21 +695,31 @@ class UpdateUserProfileAdminView(CidManagerRequiredMixin, UpdateView):
# No need for reverse_lazy here, because it's called inside the method
return reverse(view_name, kwargs={"slug": self.object.username})
+
class UpdateUserProfileView(UpdateView):
model = UserProfile
fields = [
"supervisor",
"grade",
"registration_number",
- #"peninsula_trainee",
+ # "peninsula_trainee",
] # Keep listing whatever fields
template_name = "user_update_profile.html"
slug_field = "user__username"
slug_url_kwarg = "slug"
def dispatch(self, request, *args, **kwargs):
- if request.user.is_superuser or request.user.groups.filter(name="cid_user_manager").exists():
- self.fields = ["supervisor", "grade", "registration_number", "site", "peninsula_trainee"]
+ if (
+ request.user.is_superuser
+ or request.user.groups.filter(name="cid_user_manager").exists()
+ ):
+ self.fields = [
+ "supervisor",
+ "grade",
+ "registration_number",
+ "site",
+ "peninsula_trainee",
+ ]
# Check permissions for the request.user here
elif request.user != self.get_object().user:
raise Http404
@@ -680,18 +736,22 @@ class UpdateUserProfileView(UpdateView):
form = context["form"]
if "supervisor" in form.fields:
- #form.fields["supervisor"].queryset = Supervisor.objects.all()
+ # form.fields["supervisor"].queryset = Supervisor.objects.all()
form.fields["supervisor"] = forms.ModelChoiceField(
- Supervisor.objects.all().order_by("name"), required=False, widget=autocomplete.ModelSelect2(url='generic:supervisor-autocomplete')
- )
+ Supervisor.objects.all().order_by("name"),
+ required=False,
+ widget=autocomplete.ModelSelect2(url="generic:supervisor-autocomplete"),
+ )
return context
-
def get_success_url(self):
if "redirect" in self.request.GET:
return self.request.GET["redirect"]
- if self.request.user.is_superuser or self.request.user.groups.filter(name="cid_user_manager").exists():
+ if (
+ self.request.user.is_superuser
+ or self.request.user.groups.filter(name="cid_user_manager").exists()
+ ):
view_name = "account_profile"
# No need for reverse_lazy here, because it's called inside the method
return reverse(view_name, kwargs={"slug": self.object.username})
@@ -699,7 +759,6 @@ class UpdateUserProfileView(UpdateView):
return reverse("profile")
-
# class UpdateUser(TemplateView):
#
# user_form_class = UserForm
@@ -747,12 +806,12 @@ def accounts_check_users(request):
return
+
@user_is_cid_user_manager
def accounts_bulk_create_check(request):
if not request.method == "POST":
return HttpResponse("Invalid request")
-
user = {}
user["email"] = request.POST.get("email")
@@ -791,10 +850,12 @@ def accounts_bulk_create_check(request):
errors.append("Supervisor name does not match")
if errors:
- return HttpResponse(format_html("{}", "
".join(errors)))
+ return HttpResponse(
+ format_html("{}", "
".join(errors))
+ )
return HttpResponse(format_html("{}", "
".join(info)))
-
+
@user_is_cid_user_manager
def accounts_bulk_create(request):
@@ -864,7 +925,7 @@ def accounts_bulk_create(request):
except Exception as error:
error_text = (
error_text
- + f"Error creating user: { user['email'] }
{error}
"
+ + f"Error creating user: {user['email']}
{error}
"
)
# No need to try and create a profile if we can't create a user
continue
@@ -899,7 +960,7 @@ def accounts_bulk_create(request):
new_user.delete()
error_text = (
error_text
- + f"Error creating user profile: { user['email'] }
{error} (user not created)
"
+ + f"Error creating user profile: {user['email']}
{error} (user not created)
"
)
except Exception as error:
@@ -939,34 +1000,42 @@ def request_cid_details(request):
def cimar_study_dicom_json(request, uuid="c9417b53-87aa-4c40-aca0-3fa34c225536"):
with CimarAPI(request.user.userprofile.cimar_sid) as api:
print(api.sid)
- #studies = api.list_studies()
- #test_study = studies["studies"][0]
+ # studies = api.list_studies()
+ # test_study = studies["studies"][0]
- #schema = api.get_study_schema(test_study)
+ # schema = api.get_study_schema(test_study)
schema = api.get_study_schema_by_uuid("c9417b53-87aa-4c40-aca0-3fa34c225536")
return JsonResponse(api.get_study_dicom_json(schema))
-def cimar_study_viewer(request, uuid="c9417b53-87aa-4c40-aca0-3fa34c225536"):
- case = get_object_or_404(CimarCase, uuid=uuid)
-
- viewer_link = case.viewer_link + f"?sid={request.user.userprofile.cimar_sid}"
- return render(request, "cimar_embed.html", {"viewer_link": viewer_link})
+def cimar_study_viewer(request, uuid="c9417b53-87aa-4c40-aca0-3fa34c225536"):
+ case = get_object_or_404(CimarCase, uuid=uuid)
+
+ viewer_link = case.viewer_link + f"?sid={request.user.userprofile.cimar_sid}"
+ return render(request, "cimar_embed.html", {"viewer_link": viewer_link})
+
def cimar_study_viewer_embed(request, uuid="c9417b53-87aa-4c40-aca0-3fa34c225536"):
+ case = get_object_or_404(CimarCase, uuid=uuid)
+
+ viewer_link = case.viewer_link + f"?sid={request.user.userprofile.cimar_sid}"
+ return render(request, "cimar_embed.html#embed", {"viewer_link": viewer_link})
- case = get_object_or_404(CimarCase, uuid=uuid)
-
- viewer_link = case.viewer_link + f"?sid={request.user.userprofile.cimar_sid}"
- return render(request, "cimar_embed.html#embed", {"viewer_link": viewer_link})
def cimar_study_series_block(request, uuid):
+ case = get_object_or_404(CimarCase, uuid=uuid)
+
+ return render(
+ request,
+ "cimar_series.html",
+ {
+ "series_data": case.series_data["series"],
+ "cimar_sid": request.user.userprofile.cimar_sid,
+ },
+ )
- case = get_object_or_404(CimarCase, uuid=uuid)
-
- return render(request, "cimar_series.html", {"series_data": case.series_data["series"], "cimar_sid": request.user.userprofile.cimar_sid})
def cimar_status(request):
login_status = CimarAPI(request.user.userprofile.cimar_sid).check_login_status()
@@ -974,20 +1043,26 @@ def cimar_status(request):
if login_status:
return HttpResponse("")
else:
- return render(request, "cimar_login.html#login-block", {"login_status": login_status, "cimar_sid": request.user.userprofile.cimar_sid})
+ return render(
+ request,
+ "cimar_login.html#login-block",
+ {
+ "login_status": login_status,
+ "cimar_sid": request.user.userprofile.cimar_sid,
+ },
+ )
+
def cimar_logout(request):
CimarAPI(request.user.userprofile.cimar_sid).logout()
return HttpResponse("Logged out")
-def cimar_login(request):
+def cimar_login(request):
if request.htmx:
username = request.POST.get("username")
password = request.POST.get("password")
-
-
if not username and not password:
return HttpResponse("Please fill in login details")
@@ -999,12 +1074,20 @@ def cimar_login(request):
except InvalidCredentials:
return HttpResponse("Invalid login details")
-
return HttpResponse("Logged in")
else:
try:
- login_status = CimarAPI(request.user.userprofile.cimar_sid).check_login_status()
+ login_status = CimarAPI(
+ request.user.userprofile.cimar_sid
+ ).check_login_status()
except NoSession:
login_status = False
- return render(request, "cimar_login.html", {"login_status": login_status, "cimar_sid": request.user.userprofile.cimar_sid})
\ No newline at end of file
+ return render(
+ request,
+ "cimar_login.html",
+ {
+ "login_status": login_status,
+ "cimar_sid": request.user.userprofile.cimar_sid,
+ },
+ )
diff --git a/shorts/forms.py b/shorts/forms.py
index 34173e6e..75f7ea05 100644
--- a/shorts/forms.py
+++ b/shorts/forms.py
@@ -11,6 +11,7 @@ from generic.forms import ExamAuthorFormMixin, ExamFormMixin, ExamGroupsFormMixi
from shorts.models import (
Abnormality,
+ AnswerMarks,
Examination,
Question,
QuestionFinding,
@@ -255,4 +256,18 @@ class QuestionFindingForm(ModelForm):
super(QuestionFindingForm, self).__init__(*args, **kwargs)
- ModelForm.__init__(self, *args, **kwargs)
\ No newline at end of file
+ ModelForm.__init__(self, *args, **kwargs)
+
+class MarkQuestionSingleForm(ModelForm):
+ class Meta:
+ model = UserAnswer
+ fields = ["score", "candidate_feedback"]
+
+ widgets = {
+ "candidate_feedback": Textarea(attrs={"rows": 3}),
+ }
+
+class MarkQuestionDoubleForm(ModelForm):
+ class Meta:
+ model = AnswerMarks
+ fields = ["score", "mark_reason"]
\ No newline at end of file
diff --git a/shorts/migrations/0006_alter_useranswer_score.py b/shorts/migrations/0006_alter_useranswer_score.py
new file mode 100644
index 00000000..61d66d8e
--- /dev/null
+++ b/shorts/migrations/0006_alter_useranswer_score.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.1.4 on 2025-04-14 12:55
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('shorts', '0005_remove_question_abnormality_and_more'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='useranswer',
+ name='score',
+ field=models.IntegerField(blank=True, default=0, null=True, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5)]),
+ ),
+ ]
diff --git a/shorts/migrations/0007_exam_double_mark.py b/shorts/migrations/0007_exam_double_mark.py
new file mode 100644
index 00000000..7a3c4a4e
--- /dev/null
+++ b/shorts/migrations/0007_exam_double_mark.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.4 on 2025-04-28 08:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('shorts', '0006_alter_useranswer_score'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='exam',
+ name='double_mark',
+ field=models.BooleanField(default=False, help_text='Defines if an exam is expected to be double marked'),
+ ),
+ ]
diff --git a/shorts/migrations/0008_useranswer_candidate_feedback_answermarks.py b/shorts/migrations/0008_useranswer_candidate_feedback_answermarks.py
new file mode 100644
index 00000000..5fa07043
--- /dev/null
+++ b/shorts/migrations/0008_useranswer_candidate_feedback_answermarks.py
@@ -0,0 +1,32 @@
+# Generated by Django 5.1.4 on 2025-04-28 08:55
+
+import django.core.validators
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('shorts', '0007_exam_double_mark'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='useranswer',
+ name='candidate_feedback',
+ field=models.TextField(blank=True, help_text='Feedback for the candidate', null=True),
+ ),
+ migrations.CreateModel(
+ name='AnswerMarks',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('score', models.IntegerField(blank=True, default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5)])),
+ ('mark_reason', models.TextField(blank=True, help_text='Reason for the given mark - not visible to candidates', null=True)),
+ ('marker', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='shorts_answers', to=settings.AUTH_USER_MODEL)),
+ ('user_answer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='mark', to='shorts.useranswer')),
+ ],
+ ),
+ ]
diff --git a/shorts/models.py b/shorts/models.py
index a2f68996..1ec2abdd 100644
--- a/shorts/models.py
+++ b/shorts/models.py
@@ -30,6 +30,7 @@ from django.utils.html import mark_safe
from rapids.models import Abnormality, Examination, Region
from helpers.images import get_image_hash, image_as_base64
+from django.utils.html import format_html
def image_directory_path(instance, filename):
@@ -63,6 +64,12 @@ class Question(QuestionBase):
related_name="shorts_authored_questions",
)
+ def __str__(self):
+ return "{}: {}".format(
+ self.id,
+ self.history,
+ )
+
def get_app_name(self):
return "shorts"
@@ -116,6 +123,52 @@ class Question(QuestionBase):
def get_best_sample_answer(self):
return self.sample_answers.filter(score__gt=0).order_by("-score").first()
+ def get_exams(self):
+ e = self.exams.all().values_list("name", flat=True)
+ exams = ", ".join(e)
+ return exams
+
+ def get_unmarked_user_answer_string(self, exam_pk: int = None):
+ unmarked_answers = self.get_unmarked_user_answers(exam_pk)
+
+ if not unmarked_answers:
+ return "No answers to mark"
+ return format_html(
+ "{} answer unmarked: {}".format(
+ len(unmarked_answers), ", ".join(unmarked_answers)
+ )
+ )
+
+ def get_unmarked_user_answers(self, exam_pk: int | None = None, marker=None):
+ if exam_pk is None:
+ user_answer_queryset = self.cid_user_answers.all()
+ else:
+ user_answer_queryset = self.cid_user_answers.filter(exam__id=exam_pk)
+
+ unmarked_answers = user_answer_queryset.filter(score__isnull=True)
+
+
+ return unmarked_answers
+
+
+ def get_unmarked_user_answer_count(self, exam_pk=None, marker=None):
+ if exam_pk is None:
+ return self.cid_user_answers.all().count()
+
+ return len(self.get_unmarked_user_answers(exam_pk, marker=marker))
+
+ def get_user_answers(self, exam_pk=None, include_normal=True):
+ if exam_pk is None:
+ queryset = self.cid_user_answers.all()
+ else:
+ queryset = self.cid_user_answers.filter(exam__id=exam_pk)
+
+ if not include_normal:
+ queryset = queryset.filter(normal=False)
+
+ user_answers = set([i.answer for i in queryset])
+
+ return user_answers
class QuestionImage(models.Model):
@@ -230,6 +283,10 @@ class Exam(ExamBase):
related_name="shorts_exam_markers",
)
+ double_mark = models.BooleanField(
+ default=False, help_text="Defines if an exam is expected to be double marked"
+ )
+
valid_cid_users = models.ManyToManyField(
CidUser, blank=True, related_name="shorts_exams"
)
@@ -271,20 +328,16 @@ class Exam(ExamBase):
return "shorts"
def get_exam_json(self, based=True):
- # TODO
-
- return {}
questions = self.get_questions()
exam_questions = defaultdict(dict)
exam_order = []
- q: Rapid
+ q: Question
for q in questions:
exam_order.append(q.id)
- # Loop through rapidimage associations
images = []
feedback_images = []
image_titles = []
@@ -311,7 +364,7 @@ class Exam(ExamBase):
"images": images,
# "feedback_image": [],
# "annotations": [str(q.image_annotations)],
- "type": "rapid",
+ "type": "short",
}
if not self.exam_mode:
@@ -331,9 +384,9 @@ class Exam(ExamBase):
# exam_questions[q.id]["feedback_image"] = feedback_images
exam_json = {
- "eid": "rapid/{}".format(self.id),
+ "eid": "short/{}".format(self.id),
"cached": False,
- "exam_type": "rapid",
+ "exam_type": "short",
"exam_name": self.name,
"exam_mode": self.exam_mode,
"exam_order": exam_order,
@@ -343,6 +396,7 @@ class Exam(ExamBase):
if self.time_limit:
exam_json["exam_time"] = self.time_limit
+ print(exam_json)
return exam_json
def get_absolute_url(self):
@@ -373,8 +427,13 @@ class UserAnswer(UserAnswerBase):
Exam, related_name="cid_user_answers", on_delete=models.CASCADE, null=True
)
+ # If score is null then the answer is unmarked
score = models.IntegerField(
- default=0, blank=True, validators=[MinValueValidator(0), MaxValueValidator(5)]
+ default=0, blank=True, validators=[MinValueValidator(0), MaxValueValidator(5)], null=True
+ )
+
+ candidate_feedback = models.TextField(
+ null=True, blank=True, help_text="Feedback for the candidate"
)
class CallStateOptions(models.TextChoices):
@@ -426,6 +485,15 @@ class UserAnswer(UserAnswerBase):
def get_answer_score(self, cached=True):
return self.score
+ def get_answer_string(self):
+ return self.answer
+
+ def is_marked(self):
+ if self.score is None:
+ return False
+ else:
+ return True
+
class QuestionFinding(FindingBase):
question = models.ForeignKey(
@@ -439,3 +507,27 @@ class QuestionFinding(FindingBase):
def __str__(self) -> str:
findings = self.findings.all().values_list("name")
return f"Findings: {self.question.id}/{findings}/{self.description}"
+
+class AnswerMarks(models.Model):
+ # Same as in UserAnswer except null is not allowed
+ score = models.IntegerField(
+ default=0, blank=True, validators=[MinValueValidator(0), MaxValueValidator(5)]
+ )
+
+ mark_reason = models.TextField(
+ null=True,
+ blank=True,
+ help_text="Reason for the given mark - not visible to candidates",
+ )
+
+ marker = models.ForeignKey(
+ settings.AUTH_USER_MODEL, related_name="shorts_answers", on_delete=models.CASCADE
+ )
+
+ user_answer = models.ForeignKey(
+ UserAnswer,
+ related_name="mark",
+ on_delete=models.SET_NULL,
+ null=True,
+ blank=True,
+ )
diff --git a/shorts/templates/shorts/exam_scores.html b/shorts/templates/shorts/exam_scores.html
new file mode 100644
index 00000000..76c90e41
--- /dev/null
+++ b/shorts/templates/shorts/exam_scores.html
@@ -0,0 +1,19 @@
+{% extends 'generic/exam_scores_base.html' %}
+
+{% block table_answers %}
+ {% for question in questions %}
+
+ | Question {{forloop.counter}}
+ |
+ {% comment %} {% for cid in cids %}
+ {{ans_by_question|get_item:question|get_item:cid}} |
+ {% endfor %} {% endcomment %}
+ {% for cid in cids %}
+ {% with by_question|get_item:question|get_item:cid as ans_score %}
+ {{ans_score.1|default_if_none:"Unmarked"}} |
+ {% endwith %}
+ {% endfor %}
+
+ {% endfor %}
+{% endblock table_answers %}
+
diff --git a/shorts/templates/shorts/mark_answer.html b/shorts/templates/shorts/mark_answer.html
new file mode 100644
index 00000000..4c68ac7d
--- /dev/null
+++ b/shorts/templates/shorts/mark_answer.html
@@ -0,0 +1,118 @@
+{% extends 'shorts/exams.html' %}
+{% load crispy_forms_tags %}
+
+{% block content %}
+
+ {% endif %}
+
+
+ Question Details
+ History: {{ question.history }}
+ Region: {{ question.get_regions }}
+ Examination: {{ question.get_examinations }}
+ Abnormality: {{ question.get_abnormalities }}
+ Images:
+ {% for image in question.images.all %}
+
+ Image {{ forloop.counter }}{% if image.description %} ({{image.description}}){% endif %}{% if image.feedback_image %} [feedback image]{% endif %}:
+
+
+ {% endfor %}
+
+ Feedback: {{ question.feedback }}
+
+
+
+ {% if not unmarked_count %}
+
All answers completely marked.
+ {% else %}
+
{{unmarked_count}} answer(s) incompletely marked.
+ You have {{marker_unmarked_count}} / {{user_answers.count}} answers left to mark.
+
+ {% endif %}
+ Answers:
+
+ {% for answer in user_answers %}
+ -
+ {{answer.cid}}:
+ Score {{answer.get_answer_score}} [Markers: {{answer.get_markers}}] [Scores: {{answer.get_mark_scores}}]
+ {% if answer.discrepant_answers %}
+ This answer has discrepant scores.
+ {% endif %}
+
+
+ {% endfor %}
+
+
+ {% if question_details.current > 1 %}
+
Previous
+ {% endif %}
+ {% if question_details.current >= question_details.total %}
+ {% else %}
+
Next
+ {% endif %}
+
+
+
+ {% if not unmarked_count %}
+
No answers to mark.
+ {% else %}
+
{{unmarked_count}} answer(s) to mark.
+
+ {% endif %}
+ Answers:
+
+ {% for answer in user_answers %}
+ -
+ {{answer.get_candidate_masked}}:
+ {% if answer.is_marked %}
+ Score {{answer.get_answer_score}}
+ {% else %}
+ Unmarked
+ {% endif %}
+
+
+ {% endfor %}
+
+
+ {% if question_details.current > 1 %}
+
Previous
+ {% endif %}
+ {% if question_details.current >= question_details.total %}
+ {% else %}
+
Next
+ {% endif %}
+
+