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

Start using start dates for exams

Browse Source
This commit is contained in:
Ross
2024-07-08 09:52:01 +01:00
parent 00fa68247d
commit df462efacd
49 changed files with 235 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
anatomy/templates/anatomy/exams.html
+1 -1
View File
@@ -3,7 +3,7 @@
{% block navigation %}
{{block.super}}
<br/>
Exams: {{exam.name}}->
Exams: {{exam}}->
<a href="{% url 'anatomy:exam_overview' pk=exam.pk %}">Overview</a> /
{% if exam.exam_mode %}
<a href="{% url 'anatomy:mark_overview' pk=exam.pk %}">Mark</a> /
anatomy/templates/anatomy/mark_overview.html
+1 -1
View File
@@ -2,7 +2,7 @@
{% block content %}
<div class="anatomy">
<h2>Marking exam: {{ exam.name }}</h2>
<h2>Marking exam: {{ exam }}</h2>
You can start marking from a particular question by clicking on it below.
<div>
anatomy/templates/anatomy/question_detail.html
+1 -1
View File
@@ -45,7 +45,7 @@
</div>
<div>
Exams: {% for exam in question.exams.all %}
<a href="{% url 'anatomy:exam_overview' pk=exam.pk %}">{{ exam.name }}</a>
<a href="{% url 'anatomy:exam_overview' pk=exam.pk %}">{{ exam }}</a>
{% endfor %}
</div>
<div>
anatomy/templates/anatomy/question_link_header.html
+1 -1
View File
@@ -19,7 +19,7 @@
{% if previous > -1 %}
<a href="{% url 'anatomy:exam_question_detail' exam.id previous %}">Previous question</a>
{% endif %}
Viewing question as part of exam: <a href="{% url 'anatomy:exam_overview' exam.id %}">{{exam.name}}</a> [{{pos}}/{{exam_length}}]
Viewing question as part of exam: <a href="{% url 'anatomy:exam_overview' exam.id %}">{{exam}}</a> [{{pos}}/{{exam_length}}]
{% if next %}
<a href="{% url 'anatomy:exam_question_detail' exam.id next %}">Next question</a>
{% endif %}
anatomy/tests/test_anatomy_exams.py
+3 -3
View File
@@ -303,7 +303,7 @@ def test_exams(db, client):
.find("li", attrs={"data-exam-id": exam.pk})
)
assert search_exam
assert exam.name in str(search_exam)
assert str(exam) in str(search_exam)
assert len(search_exam.find("button", {"class": "start-button"})) > 0
# assert "Active" in assigned_exams # check it is active
@@ -319,8 +319,8 @@ def test_exams(db, client):
.find_all("li", attrs={"data-exam-id": exam.pk})
)
assert results_exam
assert exam.name in str(results_exam)
assert exam.name + " test" not in str(results_exam)
assert str(exam) in str(results_exam)
assert str(exam) + " test" not in str(results_exam)
assert "Results Published" not in str(
results_exam
) # It should not be published yet
atlas/models.py
+5
View File
@@ -47,6 +47,7 @@ from generic.models import (
CidUserExam,
CidUserGroup,
ExamOrCollectionGenericBase,
ExamUserStatus,
Examination,
# Condition,
ExamBase,
@@ -775,6 +776,8 @@ class CaseCollection(ExamOrCollectionGenericBase):
help_text="If true allows users self complete and review cases in a self directed way.",
)
exam_user_status = GenericRelation(ExamUserStatus)
feedback_once_collection_complete = models.BooleanField(default=True, help_text="If true feedback is only given once the collection is complete. If false feedback is given after each case.")
class COLLECTION_TYPE_CHOICES(models.TextChoices):
@@ -996,6 +999,8 @@ class CaseDetail(models.Model):
question_schema = models.JSONField(null=True, blank=True)
question_answers = models.JSONField(null=True, blank=True)
# TODO add feedback for questions
#question_feedback = models.JSONField(null=True, blank=True)
sort_order = models.IntegerField(default=1000)
atlas/templates/atlas/collection_case_view_take.html
+1 -1
View File
@@ -177,7 +177,7 @@
{% endif %}
</div>
<details><summary>View questions</summary>
<details><summary class="opacity-50">View questions</summary>
{{form.json.errors}}
<div class="form-contents">
<fieldset {% if question_completed %}disabled="disabled"{% endif %}>
atlas/templates/atlas/collection_review_start.html
+1 -1
View File
@@ -1,7 +1,7 @@
{% extends 'atlas/base.html' %}
{% block content %}
<h2>Collection: {{exam.name}}</h2>
<h2>Collection: {{exam}}</h2>
{% comment %} <ul>
{% for case in collection.cases.all %}
atlas/templates/atlas/index.html
+1 -1
View File
@@ -9,6 +9,6 @@
<h3>My cases / collections</h3>
View my <a href='{% url "atlas:case_view" %}?author={{request.user.id}}'>cases</a>.<br/>
<a href="{% url 'atlas:user_uploads' %}"><button><i class="bi bi-cloud-arrow-up"></i> Uploads awaiting import</button></a>
<a href="{% url 'atlas:user_uploads' %}"><i class="bi bi-cloud-arrow-up"></i> Uploads awaiting import</a>
{% endblock %}
atlas/views.py
+10
View File
@@ -1914,6 +1914,16 @@ def collection_take_overview(
cid_user_exam.completed = True
cid_user_exam.save()
if cid is not None:
c = CidUser.objects.get(cid=cid)
collection.exam_user_status.create(
cid_user=c, user_user=None, status="submitted", extra="manual submission"
)
else:
collection.exam_user_status.create(
cid_user=None, user_user=request.user, status="submitted", extra="manual submission"
)
return HttpResponse("True")
else:
raise Http404()
generic/models.py
+8 -3
View File
@@ -869,6 +869,14 @@ class ExamBase(ExamOrCollectionGenericBase):
class Meta:
abstract = True
def __str__(self):
print("TESTING")
if self.start_date and self.start_date is not None:
print(f"Start date: {self.start_date:%d %B %Y}")
return f"{self.name} ({self.start_date:%d %B %Y})"
else:
return self.name
def save(self, *args, recreate_json=True, **kwargs):
self.recreate_json = recreate_json
@@ -903,9 +911,6 @@ class ExamBase(ExamOrCollectionGenericBase):
"""
return text
def __str__(self):
return self.name
def get_absolute_url(self):
return reverse("{}:exam_overview".format(self.app_name), kwargs={"pk": self.pk})
generic/templates/generic/exam_index.html
+1 -1
View File
@@ -20,7 +20,7 @@
{% else %}
Packet:
{% endif %}
{{ exam.name }} </a></h1>
{{ exam }} </a></h1>
<span class="authors">Authors: {{exam.get_authors}}</span>
{% if exam.exam_mode %}
{% if app_name in "rapids longs anatomy" %}
generic/templates/generic/exam_overview_headers.html
+1 -1
View File
@@ -1,5 +1,5 @@
{% include "generic/exam_link_headers.html" %}
<h1>Exam: {{ exam.name }}</h1>
<h1>Exam: {{ exam }}</h1>
{% include 'exam_notes.html' %}
generic/templates/generic/exam_scores_base.html
+1 -1
View File
@@ -2,7 +2,7 @@
{% block content %}
<div class="">
<h2>{{ exam.name }}</h2>
<h2>{{ exam }}</h2>
{% if cached_scores %}
User answer scores are cached, if you update or change an answer you will need to <a href="{% url exam.app_name|add:':exam_scores_refresh' exam.pk %}">refresh the scores</a>.
{% endif %}
generic/views.py
+3 -7
View File
@@ -556,7 +556,7 @@ class ExamViews(View, LoginRequiredMixin):
data = {
"status": "success",
"archive": exam.archive,
"name": exam.name,
"name": exam,
"id": exam.id,
}
return JsonResponse(data, status=200)
@@ -580,7 +580,7 @@ class ExamViews(View, LoginRequiredMixin):
data = {
"status": "success",
"publish_results": exam.publish_results,
"name": exam.name,
"name": exam,
"id": exam.id,
}
return JsonResponse(data, status=200)
@@ -602,7 +602,7 @@ class ExamViews(View, LoginRequiredMixin):
data = {
"status": "success",
"active": exam.active,
"name": exam.name,
"name": exam,
"id": exam.id,
}
return JsonResponse(data, status=200)
@@ -1483,13 +1483,9 @@ class ExamViews(View, LoginRequiredMixin):
exam: ExamBase
for exam in exams:
if exam.active or self.check_user_access(request.user, exam.pk):
print(
f"{exam.app_name=}, {exam.name=}, {cid=}, {passcode=}, {request.user=}"
)
if exam.exam_mode and not exam.check_cid_user(
cid, passcode, user=request.user, user_id=request.user.pk
):
print(exam.name, "fail")
continue
if exam.json_creation_time:
longs/templates/longs/exam_scores.html
-74
View File
@@ -19,77 +19,3 @@
{% endblock table_answers %}
{% comment %} {% extends 'longs/exams.html' %}
{% block content %}
<div class="longs">
<h2>{{ exam.name }}</h2>
{% if unmarked %}
<div class="alert alert-warning" role="alert">
The following questions need marking
{% for exam_index in unmarked %}
<a href="{% url 'longs:mark' exam.pk exam_index %}">{{ exam_index|add:1 }}</a>
{% endfor %}
</div>
{% endif %}
</div>
<div id="stats-block">
<h3>Stats</h3>
Candidates: {{cids|length}}<br />
Available marks: {{max_score}}<br />
Mean: {{mean}}, Median {{median}}, Mode {{mode}}
<div id="stats-plot">{{plot|safe}}</div>
</div>
<div class="col-sm-4">
<table class="table table-dark table-striped table-hover table-sm">
<tr>
<th>Candidate ID</th>
<th>Score</th>
<th>Normalised score</th>
</tr>
{% for user, value in user_answers_marks.items %}
<tr>
<td><a href="{% url 'cid_scores_admin' user %}">{{user}}</a></td>
<td>{{user_scores|get_item:user}}</td>
<td>{{user_scores_normalised|get_item:user}}</td>
</tr>
{% endfor %}
</table>
</div>
<div class="col">
<h3>Results as a table</h3>
<table class="longs table table-dark table-striped table-hover table-sm">
<thead class="thead-dark">
<tr>
<th>Candidate</th>
{% for cid in cids %}
<th><a href="{% url 'longs:exam_scores_cid_user' exam.pk cid 'None' %}">{{cid}}</a></th>
{% endfor %}
</tr>
</thead>
{% for question in questions %}
<tr>
<td><a href="{% url 'longs:mark' exam_id=exam.pk sk=forloop.counter0 %}">Question
{{forloop.counter}}</a></td>
{% for ans, score in by_question|get_item:question %}
<td class="user-answer-score-{{score}}" title="answer score: {{score}}">{{score}}</td>
{% endfor %}
</tr>
{% endfor %}
<tr>
<td>Score:</td>
{% for score in user_scores_list %}
<td>{{score}}</td>
{% endfor %}
<tr>
</table>
</div>
{% endblock %} {% endcomment %}
longs/templates/longs/exams.html
+1 -1
View File
@@ -3,7 +3,7 @@
{% block navigation %}
{{block.super}}
<br/>
Exams: {{exam.name}}->
Exams: {{exam}}->
<a href="{% url 'longs:exam_overview' pk=exam.pk %}">Overview</a> /
<a href="{% url 'longs:mark_overview' pk=exam.pk %}">Mark</a> /
<a href="{% url 'longs:exam_scores_all' pk=exam.pk %}">Scores</a> /
longs/templates/longs/long_display_block.html
+1 -1
View File
@@ -70,7 +70,7 @@
</p>
<div>
Exam(s): {% for exam in question.exams.all %}
<a href="{% url 'longs:exam_overview' pk=exam.pk %}">{{ exam.name }}</a>,
<a href="{% url 'longs:exam_overview' pk=exam.pk %}">{{ exam }}</a>,
{% endfor %}
</div>
<div>
longs/templates/longs/mark_overview.html
+1 -1
View File
@@ -2,7 +2,7 @@
{% block content %}
<div class="longs">
<h2>Marking exam: {{ exam.name }}</h2>
<h2>Marking exam: {{ exam }}</h2>
You can start marking from a particular question by clicking on it below.
<div>
longs/templates/longs/question_detail.html
+1 -1
View File
@@ -18,7 +18,7 @@
{% if previous > -1 %}
<a href="{% url 'longs:exam_question_detail' exam.id previous %}">Previous question</a>
{% endif %}
Viewing question as part of exam: <a href="{% url 'longs:exam_overview' exam.id %}">{{exam.name}}</a> [{{pos}}/{{exam_length}}]
Viewing question as part of exam: <a href="{% url 'longs:exam_overview' exam.id %}">{{exam}}</a> [{{pos}}/{{exam_length}}]
{% if next %}
<a href="{% url 'longs:exam_question_detail' exam.id next %}">Next question</a>
{% endif %}
longs/tests/test_longs_exams.py
+3 -3
View File
@@ -445,7 +445,7 @@ def test_exams(db, client):
.find("li", attrs={"data-exam-id": exam.pk})
)
assert search_exam
assert exam.name in str(search_exam)
assert str(exam) in str(search_exam)
assert len(search_exam.find("button", {"class": "start-button"})) > 0
# assert "Active" in assigned_exams # check it is active
@@ -461,8 +461,8 @@ def test_exams(db, client):
.find_all("li", attrs={"data-exam-id": exam.pk})
)
assert results_exam
assert exam.name in str(results_exam)
assert exam.name + " test" not in str(results_exam)
assert str(exam) in str(results_exam)
assert str(exam) + " test" not in str(results_exam)
assert "Results Published" not in str(
results_exam
) # It should not be published yet
physics/templates/physics/available_exam_list.html
+1 -1
View File
@@ -8,7 +8,7 @@
{% for exam in exams %}
{% if exam.active %}
<li>
<a href="{% url 'physics:exam_start' pk=exam.pk %}">{{exam.name}}</a>
<a href="{% url 'physics:exam_start' pk=exam.pk %}">{{exam}}</a>
</li>
{% endif %}
{% endfor %}
physics/templates/physics/exam_start.html
+1 -1
View File
@@ -2,7 +2,7 @@
{% block content %}
<h2>Start exam: {{exam.name}}</h2>
<h2>Start exam: {{exam}}</h2>
{% if exam.time_limit %}
This exam has a time limit of {{ exam.get_time_limit }}. The time will start when you click the Start Exam button below.<br/>
physics/templates/physics/exam_take.html
+1 -1
View File
@@ -10,7 +10,7 @@
</span>
{% include "exam_clock.html" %}
<div class="no-select">
<h2>{{exam.name}}: Question [<span id="question-number">{{pos|add:1}}</span>/<span id="exam-length">{{exam_length}}</span>]</h2>
<h2>{{exam}}: Question [<span id="question-number">{{pos|add:1}}</span>/<span id="exam-length">{{exam_length}}</span>]</h2>
{% if exam.publish_results %}
<div class="alert alert-primary review-mode-alert" role="alert">
Exam is in review mode. Add question feedback <a href="#" onclick="return window.create_popup_window('{% url 'feedback_create' question_type='physics' pk=question.pk %}')">here</a>.
physics/templates/physics/exam_take_old.html
+1 -1
View File
@@ -3,7 +3,7 @@
{% block content %}
<div class="physics">
<h1>Exam: {{ exam.name }}</h1>
<h1>Exam: {{ exam }}</h1>
<div class="alert alert-info" role="alert">
<details>
physics/templates/physics/exam_take_overview.html
+1 -1
View File
@@ -10,7 +10,7 @@
</span>
{% include "exam_clock.html" %}
<h2>Exam: {{exam.name}}</h2>
<h2>Exam: {{exam}}</h2>
{% if exam.publish_results %}
<div class="alert alert-primary review-mode-alert" role="alert">
physics/templates/physics/exams.html
+1 -1
View File
@@ -3,7 +3,7 @@
{% block navigation %}
{{block.super}}
<br/>
Exams: {{exam.name}}-> <a href="{% url 'physics:exam_overview' pk=exam.pk %}">Overview</a> /
Exams: {{exam}}-> <a href="{% url 'physics:exam_overview' pk=exam.pk %}">Overview</a> /
<a href="{% url 'physics:exam_scores_all' pk=exam.pk %}">Scores</a> /
<a href="{% url 'physics:exam_cids' exam_id=exam.pk %}">Candidates</a> /
<a href="{% url 'physics:exam_stats' exam_id=exam.pk %}">Stats</a> /
physics/templates/physics/question_detail.html
+1 -1
View File
@@ -21,7 +21,7 @@
{% endautoescape %}
<div>
Examinations: {% for exam in question.exams.all %}
<a href="{% url 'physics:exam_overview' pk=exam.pk %}">{{ exam.name }}</a>
<a href="{% url 'physics:exam_overview' pk=exam.pk %}">{{ exam }}</a>
{% endfor %}
</div>
<div>
rad/tests/test_helpers.py
+3 -3
View File
@@ -342,7 +342,7 @@ class ExamTester:
.find("li", attrs={"data-exam-id": self.exam.pk})
)
assert search_exam
assert self.exam.name in str(search_exam)
assert str(self.exam) in str(search_exam)
assert len(search_exam.find("button", {"class": "start-button"})) > 0
# assert "Active" in assigned_exams # check it is active
@@ -358,8 +358,8 @@ class ExamTester:
.find_all("li", attrs={"data-exam-id": self.exam.pk})
)
assert results_exam
assert self.exam.name in str(results_exam)
assert self.exam.name + " test" not in str(results_exam)
assert str(self.exam) in str(results_exam)
assert str(self.exam) + " test" not in str(results_exam)
assert "Results Published" not in str(
results_exam
) # It should not be published yet
rapids/templates/rapids/exams.html
+1 -1
View File
@@ -3,7 +3,7 @@
{% block navigation %}
{{block.super}}
<br/>
Exams: {{exam.name}}->
Exams: {{exam}}->
<a href="{% url 'rapids:exam_overview' pk=exam.pk %}">Overview</a> /
{% if exam.exam_mode %}
<a href="{% url 'rapids:mark_overview' pk=exam.pk %}">Mark</a> /
rapids/templates/rapids/mark_overview.html
+1 -1
View File
@@ -2,7 +2,7 @@
{% block content %}
<div class="rapids">
<h2>Marking exam: {{ exam.name }}</h2>
<h2>Marking exam: {{ exam }}</h2>
You can start marking from a particular question by clicking on it below.
<div>
rapids/templates/rapids/question_display_block.html
+1 -1
View File
@@ -30,7 +30,7 @@
</div>
<div>
Exam(s): {% for exam in question.exams.all %}
<a href="{% url 'rapids:exam_overview' pk=exam.pk %}">{{ exam.name }}</a>,
<a href="{% url 'rapids:exam_overview' pk=exam.pk %}">{{ exam }}</a>,
{% endfor %}
{% comment %} <button id="add-to-exam" data-exam_json_edit_url="{% url 'generic:generic_exam_json_edit' %}"
rapids/templates/rapids/question_link_header.html
+1 -1
View File
@@ -16,7 +16,7 @@
{% if previous > -1 %}
<a href="{% url 'rapids:exam_question_detail' exam.id previous %}">Previous question</a>
{% endif %}
Viewing question as part of exam: <a href="{% url 'rapids:exam_overview' exam.id %}">{{exam.name}}</a> [{{pos}}/{{exam_length}}]
Viewing question as part of exam: <a href="{% url 'rapids:exam_overview' exam.id %}">{{exam}}</a> [{{pos}}/{{exam_length}}]
{% if next %}
<a href="{% url 'rapids:exam_question_detail' exam.id next %}">Next question</a>
{% endif %}
rapids/tests/test_rapids_exams.py
+3 -3
View File
@@ -340,7 +340,7 @@ def test_exams(db, client):
.find("li", attrs={"data-exam-id": exam.pk})
)
assert search_exam
assert exam.name in str(search_exam)
assert str(exam) in str(search_exam)
assert len(search_exam.find("button", {"class": "start-button"})) > 0
# assert "Active" in assigned_exams # check it is active
@@ -356,8 +356,8 @@ def test_exams(db, client):
.find_all("li", attrs={"data-exam-id": exam.pk})
)
assert results_exam
assert exam.name in str(results_exam)
assert exam.name + " test" not in str(results_exam)
assert str(exam) in str(results_exam)
assert str(exam) + " test" not in str(results_exam)
assert "Results Published" not in str(
results_exam
) # It should not be published yet
sbas/templates/sbas/available_exam_list.html
+1 -1
View File
@@ -8,7 +8,7 @@
{% for exam in exams %}
{% if exam.active %}
<li>
<a href="{% url 'sbas:exam_start' pk=exam.pk %}">{{exam.name}}</a>
<a href="{% url 'sbas:exam_start' pk=exam.pk %}">{{exam}}</a>
</li>
{% endif %}
{% endfor %}
sbas/templates/sbas/exam_start.html
+1 -1
View File
@@ -2,7 +2,7 @@
{% block content %}
<h2>Start exam: {{exam.name}}</h2>
<h2>Start exam: {{exam}}</h2>
{% if exam.time_limit %}
This exam has a time limit of {{ exam.get_time_limit }}. The time will start when you click the Start Exam button below.<br/>
sbas/templates/sbas/exam_take.html
+1 -1
View File
@@ -10,7 +10,7 @@
</span>
{% include "exam_clock.html" %}
<div class="no-select">
<h2>{{exam.name}}: Question [<span id="question-number">{{pos|add:1}}</span>/<span id="exam-length">{{exam_length}}</span>]</h2>
<h2>{{exam}}: Question [<span id="question-number">{{pos|add:1}}</span>/<span id="exam-length">{{exam_length}}</span>]</h2>
{% if exam.publish_results %}
<div class="alert alert-primary review-mode-alert" role="alert">
Exam is in review mode. Add question feedback <a href="#" onclick="return window.create_popup_window('{% url 'feedback_create' question_type='sbas' pk=question.pk %}')">here</a>.
sbas/templates/sbas/exam_take_overview.html
+1 -1
View File
@@ -10,7 +10,7 @@
</span>
{% include "exam_clock.html" %}
<h2>Exam: {{exam.name}}</h2>
<h2>Exam: {{exam}}</h2>
{% if exam.publish_results %}
<div class="alert alert-primary review-mode-alert" role="alert">
sbas/templates/sbas/exams.html
+1 -1
View File
@@ -3,7 +3,7 @@
{% block navigation %}
{{block.super}}
<br/>
Exams: {{exam.name}}->
Exams: {{exam}}->
<a href="{% url 'sbas:exam_overview' pk=exam.pk %}">Overview</a> /
<a href="{% url 'sbas:exam_scores_all' pk=exam.pk %}">Scores</a> /
<a href="{% url 'sbas:exam_cids' exam_id=exam.pk %}">Candidates</a> /
sbas/templates/sbas/question_detail.html
+1 -1
View File
@@ -26,7 +26,7 @@
{% endautoescape %}
<div>
Examinations: {% for exam in question.exams.all %}
<a href="{% url 'sbas:exam_overview' pk=exam.pk %}">{{ exam.name }}</a>
<a href="{% url 'sbas:exam_overview' pk=exam.pk %}">{{ exam }}</a>
{% endfor %}
</div>
<div>
templates/cid_scores.html
+2 -2
View File
@@ -20,7 +20,7 @@
<h4>{{exam_type|title}}</h4>
<ul class='{{exam_type|lower}}'>
{% for exam in exams %}
<li class="exam" data-exam-id="{{exam.pk}}">{{exam.name}}
<li class="exam" data-exam-id="{{exam.pk}}">{{exam}}
{% if exam.active %}
<a href="{{exam.get_take_url}}?cid={{cid}}&passcode={{passcode}}" target="_blank" title="Click to take exam">
<button class="small-url-button start-button">Start</button>
@@ -47,7 +47,7 @@
<h4>{{exam_type|title}}</h4>
<ul class='{{exam_type|lower}}'>
{% for exam in exams %}
<li class="exam" data-exam-id="{{exam.pk}}"><a href="{% url exam_type|add:':exam_scores_cid_user' pk=exam.pk cid=cid passcode=passcode %}">{{exam.name}}</a> {% if exam.active %}[Active]{% endif %} {% if exam.publish_results %}[Results Published]{% endif %}</li>
<li class="exam" data-exam-id="{{exam.pk}}"><a href="{% url exam_type|add:':exam_scores_cid_user' pk=exam.pk cid=cid passcode=passcode %}">{{exam}}</a> {% if exam.active %}[Active]{% endif %} {% if exam.publish_results %}[Results Published]{% endif %}</li>
{% endfor %}
</ul>
{% endif %}
templates/exam_cids.html
+1 -1
View File
@@ -4,7 +4,7 @@
{% load thumbnail %}
<div class="{{app_name}}">
<h1>Exam: {{ exam.name }}</h1>
<h1>Exam: {{ exam }}</h1>
{% include "generic/exam_cids.html" %}
templates/exam_cids_edit.html
+1 -1
View File
@@ -3,7 +3,7 @@
{% block content %}
<div class="{{app_name}}">
<h1>Exam: {{ exam.name }}</h1>
<h1>Exam: {{ exam }}</h1>
{% include "generic/exam_cids_edit.html" %}
templates/exam_inactive.html
+1 -1
View File
@@ -2,7 +2,7 @@
{% block content %}
<div class="">
<h2>{{exam.name}}</h2>
<h2>{{exam}}</h2>
Exam is currently inactive.
</div>
{% endblock %}
templates/exam_list.html
+2 -2
View File
@@ -8,7 +8,7 @@
{% for exam in exams %}
{% if exam.active %}
<li class="exam-item">
<a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="flex-col-2 exam-name">{{exam.name}}</a>
<a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="flex-col-2 exam-name">{{exam}}</a>
{% if marking %}<a href="{% url app_name|add:':mark_overview' pk=exam.pk %}" class="flex-col-half">Mark</a>{% endif %}
<span class="flex-col">
<a href="{% url app_name|add:':exam_cids' exam_id=exam.pk %}">Candidates</a> <span class="candidate-counts">[<span title="Number of active CID users">
@@ -35,7 +35,7 @@
{% for exam in exams %}
{% if not exam.active %}
<li class="exam-item">
<a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="flex-col-2 exam-name">{{exam.name}}</a>
<a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="flex-col-2 exam-name">{{exam}}</a>
{% if marking %}<a href="{% url app_name|add:':mark_overview' pk=exam.pk %}" class="flex-col-half">Mark</a>{% endif %}
<span class="flex-col">
<a href="{% url app_name|add:':exam_cids' exam_id=exam.pk %}">Candidates</a>
templates/exam_stats.html
+1 -1
View File
@@ -1,7 +1,7 @@
{% extends 'base.html' %}
{% block content %}
<h2>{{exam.name}}: Stats</h2>
<h2>{{exam}}: Stats</h2>
{% if exam.stats_candidates < 4 %}
Not enough data points...
{% else %}
templates/exam_users_edit.html
+1 -1
View File
@@ -3,7 +3,7 @@
{% block content %}
<div class="{{app_name}}">
<h1>Exam: {{ exam.name }}</h1>
<h1>Exam: {{ exam }}</h1>
{% include "generic/exam_users_edit.html" %}
templates/user_score_header.html
+1 -1
View File
@@ -24,6 +24,6 @@
<div class="alert alert-info" role="alert">Results are not currently published. You can see your own answers below.</a></div>
{% endif %}
{% endif %}
<h2>Exam: {{ exam.name }}</h2>
<h2>Exam: {{ exam }}</h2>
<h3>Candidate: {{ cid|default_if_none:request.user.username }}</h3>
Answers:
templates/user_scores.html
+2 -2
View File
@@ -20,7 +20,7 @@
<h4>{{exam_type|title}}</h4>
<ul class='{{exam_type|lower}}'>
{% for exam in exams %}
<li class="exam" data-exam-id="{{exam.pk}}">{{exam.name}}
<li class="exam" data-exam-id="{{exam.pk}}">{{exam}}
{% if exam.active %}
<a href="{{exam.get_take_url}}" target="_blank" title="Click to take exam">
<button class="small-url-button start-button">Start</button>
@@ -55,7 +55,7 @@
<a href= "{% url exam_type|add:':exam_scores_user' pk=exam.pk %}" title="Click to view results">
{% endif %}
{{exam.name}}</a> {% if exam.active %}[Active]{% endif %} {% if exam.publish_results %}[Results Published]{% endif %}</li>
{{exam}}</a> {% if exam.active %}[Active]{% endif %} {% if exam.publish_results %}[Results Published]{% endif %}</li>
{% endfor %}
</ul>
{% endif %}