ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

start allowing user candidates in longs

Browse Source
This commit is contained in:
Ross
2023-05-15 10:54:09 +01:00
parent cd5cbdd1a5
commit 525373f393
7 changed files with 62 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
longs/models.py
+12
View File
@@ -885,6 +885,18 @@ class CidUserAnswer(models.Model):
def get_absolute_url(self):
return reverse("longs:user_answer_view", kwargs={"pk": self.pk})
def get_candidate_name(self) -> str:
if self.cid is not None:
return str(self.cid)
else:
return self.user.username
def get_candidate_masked(self) -> str:
if self.cid is not None:
return str(self.cid)
else:
return str(self.user.id)
@reversion.register
class AnswerMarks(models.Model):
longs/templates/longs/mark_answer.html
+10 -10
View File
@@ -38,22 +38,22 @@
{% if not next_unmarked_id and not unmarked %}
<div class="alert alert-info sticky-alert" role="alert">Success! Marking question complete. <br />
<a href="{% url 'longs:mark_answer_override' exam_id=exam.pk question_number=question_details.current|add:'-1' cid=cid %}">Set final score</a><br/>
<a href="{% url 'longs:mark_answer_override' exam_id=exam.pk question_number=question_details.current|add:'-1' answer_id=answer.id %}">Set final score</a><br/>
Return to <a href="{% url 'longs:mark_question_overview' exam.id question_details.current|add:'-1' %}">question
overview</a>, <a href="{% url 'longs:mark_overview' pk=exam.pk %}">marking
overview</a><br />
{% if previous_cid %}
<a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' cid=previous_cid %}">Previous
{% if previous_answer_id %}
<a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' answer_id=previous_answer_id %}">Previous
candidate</a>
{% endif %}
{% if next_cid %}
<a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' cid=next_cid %}">Next
{% if next_answer_id %}
<a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' answer_id=next_answer_id %}">Next
candidate</a>
{% endif %}
</div>
{% endif %}
<span>Marking CID: {{answer.cid}} ({{unmarked|length}} answer(s) left to mark)</span>
<span>Marking Candidate: {{answer.get_candidate_masked}} ({{unmarked|length}} answer(s) left to mark)</span>
<details closed>
<summary title="click to view/hide the question details">Question Details</summary>
<p class="pre-whitespace"><b>Description:</b> {{ question.description }}</p>
@@ -125,11 +125,11 @@
{% endif %}
</form>
</div>
{% if previous_cid %}
<a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' cid=previous_cid %}">Previous
{% if previous_answer_id %}
<a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' answer_id=previous_answer_id %}">Previous
candidate</a>
{% endif %}
{% if next_cid %}
<a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' cid=next_cid %}">Next candidate</a>
{% if next_answer_id %}
<a href="{% url 'longs:mark_answer' exam_id=exam.pk question_number=question_details.current|add:'-1' answer_id=next_answer_id %}">Next candidate</a>
{% endif %}
{% endblock %}
longs/templates/longs/mark_question_double_overview.html
+1 -1
View File
@@ -20,7 +20,7 @@
<ul>
{% for answer in user_answers %}
<li>
<a href="{% url 'longs:mark_answer' exam.id question_details.current|add:'-1' answer.cid %}"
<a href="{% url 'longs:mark_answer' exam.id question_details.current|add:'-1' answer.id %}"
title="Click to mark"> {{answer.cid}}</a>:
Score {{answer.get_answer_score}} [Markers: {{answer.get_markers}}] [Scores: {{answer.get_mark_scores}}]
{% if answer.discrepant_answers %}
longs/templates/longs/mark_question_single_overview.html
+2 -2
View File
@@ -19,8 +19,8 @@
<ul>
{% for answer in user_answers %}
<li>
<a href="{% url 'longs:mark_answer' exam.id question_details.current|add:'-1' answer.cid %}"
title="Click to mark"> {{answer.cid}}</a>:
<a href="{% url 'longs:mark_answer' exam.id question_details.current|add:'-1' answer.id %}"
title="Click to mark"> {{answer.get_candidate_masked}}</a>:
{% if answer.is_marked %}
Score {{answer.get_answer_score}}
{% else %}
longs/urls.py
+2 -2
View File
@@ -68,12 +68,12 @@ urlpatterns = [
name="question_review",
),
path(
"exam/<int:exam_id>/<int:question_number>/<int:cid>/mark",
"exam/<int:exam_id>/<int:question_number>/<int:answer_id>/mark",
views.mark_answer,
name="mark_answer",
),
path(
"exam/<int:exam_id>/<int:question_number>/<int:cid>/mark_override",
"exam/<int:exam_id>/<int:question_number>/<int:answer_id>/mark_override",
views.mark_answer_override,
name="mark_answer_override",
),
longs/views.py
+27 -23
View File
@@ -625,7 +625,7 @@ def mark_answer_override(request, exam_id, question_number, cid):
@user_is_long_marker
@reversion.create_revision()
def mark_answer(request, exam_id, question_number, cid, override=False):
def mark_answer(request, exam_id, question_number, answer_id, override=False):
exam = get_object_or_404(Exam, pk=exam_id)
questions = exam.exam_questions.all()
@@ -643,25 +643,29 @@ def mark_answer(request, exam_id, question_number, cid, override=False):
raise Http404("Exam question does not exist")
try:
answer = question.cid_user_answers.get(cid=cid, exam__id=exam_id)
answer = question.cid_user_answers.get(pk=answer_id)
except ObjectDoesNotExist:
raise Http404("User answer does not exist")
cid_list = list(
question.cid_user_answers.filter(exam__id=exam_id).values_list("cid", flat=True)
answer_list = list(
question.cid_user_answers.filter(exam__id=exam_id).values_list("id", flat=True)
)
previous_cid = False
next_cid = False
answer_list.sort()
print(answer_list)
if len(cid_list) > 1:
if cid_list[0] == cid:
next_cid = cid_list[1]
elif cid_list[-1] == cid:
previous_cid = cid_list[-2]
previous_answer_id = False
next_answer_id = False
if len(answer_list) > 1:
if answer_list[0] == answer_id:
next_answer_id = answer_list[1]
elif answer_list[-1] == answer_id:
previous_answer_id = answer_list[-2]
else:
next_cid = cid_list[cid_list.index(cid) + 1]
previous_cid = cid_list[cid_list.index(cid) - 1]
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]
try:
if exam.double_mark:
@@ -670,9 +674,9 @@ def mark_answer(request, exam_id, question_number, cid, override=False):
)
else:
unmarked = question.get_unmarked_user_answers(exam_pk=exam.id)
next_unmarked_id = unmarked[0].cid
if next_unmarked_id == cid:
next_unmarked_id = unmarked[1].cid
next_unmarked_id = unmarked[0].id
if next_unmarked_id == answer_id:
next_unmarked_id = unmarked[1].id
except IndexError:
next_unmarked_id = False
@@ -699,14 +703,14 @@ def mark_answer(request, exam_id, question_number, cid, override=False):
"longs:mark_answer",
exam_id=exam_id,
question_number=question_number,
cid=next_unmarked_id,
answer_id=next_unmarked_id,
)
if "save" in request.POST:
return redirect(
"longs:mark_answer",
exam_id=exam_id,
question_number=question_number,
cid=cid,
answer_id=answer_id,
)
# elif "previous" in request.POST:
# return redirect("longs:mark_question_overview", pk=exam_id, sk=n - 1)
@@ -749,14 +753,14 @@ def mark_answer(request, exam_id, question_number, cid, override=False):
"longs:mark_answer",
exam_id=exam_id,
question_number=question_number,
cid=next_unmarked_id,
answer_id=next_unmarked_id,
)
if "save" in request.POST:
return redirect(
"longs:mark_answer",
exam_id=exam_id,
question_number=question_number,
cid=cid,
answer_id=answer_id,
)
# elif "previous" in request.POST:
# return redirect("longs:mark_question_overview", pk=exam_id, sk=n - 1)
@@ -797,9 +801,9 @@ def mark_answer(request, exam_id, question_number, cid, override=False):
"question_details": question_details,
"next_unmarked_id": next_unmarked_id,
"unmarked": unmarked,
"previous_cid": previous_cid,
"next_cid": next_cid,
"cid": cid,
"previous_answer_id": previous_answer_id,
"next_answer_id": next_answer_id,
"answer_id": answer_id,
},
)