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

.

Browse Source
This commit is contained in:
Ross
2024-12-16 12:14:26 +00:00
parent 69664b7b50
commit 720debc2a5
2 changed files with 58 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generic/templates/generic/examcollection_detail.html
+54 -42
View File
@@ -2,56 +2,68 @@
{% block content %} {% block content %}
<h1>{{ object.name }} [{{object.date}}] </h1> <h1>{{ object.name }} [{{object.date}}] </h1>
<p> <p>
<a href="{% url 'generic:examcollection_edit' object.pk %}">Edit</a> <a href="{% url 'generic:examcollection_edit' object.pk %}">Edit</a>
<a href="{% url 'generic:examcollection_clone' object.pk %}">Clone</a> <a href="{% url 'generic:examcollection_clone' object.pk %}">Clone</a>
<a href="{% url 'generic:examcollection_delete' object.pk %}">Delete</a> <a href="{% url 'generic:examcollection_delete' object.pk %}">Delete</a>
</p> </p>
This collection contains the following exams This collection contains the following exams
<h2>Anatomy Exams:</h2>
<ul>
{% for exam in object.anatomy_exams.all %}
<li><a href="{% url 'anatomy:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'anatomy:exam_update' exam.pk %}">(Edit)</a></li>
{% endfor %}
</ul>
<a href="{% url 'anatomy:exam_list_collection' object.pk %}">View exam list</a>
<h2>Longs Exams:</h2>
<ul>
{% for exam in object.longs_exams.all %}
<li><a href="{% url 'longs:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'longs:exam_update' exam.pk %}">(Edit)</a></li>
{% endfor %}
</ul>
<a href="{% url 'longs:exam_list_collection' object.pk %}">View exam list</a>
<h2>Rapids Exams:</h2> {% if object.anatomy_exams.all %}
<ul> <h2>Anatomy Exams:</h2>
{% for exam in object.rapids_exams.all %} <ul>
<li><a href="{% url 'rapids:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'rapids:exam_update' exam.pk %}">(Edit)</a></li> {% for exam in object.anatomy_exams.all %}
{% endfor %} <li><a href="{% url 'anatomy:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'anatomy:exam_update' exam.pk %}">(Edit)</a></li>
</ul> {% endfor %}
<a href="{% url 'rapids:exam_list_collection' object.pk %}">View exam list</a> </ul>
<a href="{% url 'anatomy:exam_list_collection' object.pk %}">View exam list</a>
{% endif %}
<h2>Physics Exams:</h2> {% if object.longs_exams.all %}
<ul> <h2>Longs Exams:</h2>
{% for exam in object.physics_exams.all %} <ul>
<li><a href="{% url 'physics:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'physics:exam_update' exam.pk %}">(Edit)</a></li> {% for exam in object.longs_exams.all %}
{% endfor %} <li><a href="{% url 'longs:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'longs:exam_update' exam.pk %}">(Edit)</a></li>
</ul> {% endfor %}
<a href="{% url 'physics:exam_list_collection' object.pk %}">View exam list</a> </ul>
<a href="{% url 'longs:exam_list_collection' object.pk %}">View exam list</a>
{% endif %}
<h2>SBAs Exams:</h2> {% if object.rapids_exams.all %}
<ul> <h2>Rapids Exams:</h2>
{% for exam in object.sbas_exams.all %} <ul>
<li><a href="{% url 'sbas:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'sbas:exam_update' exam.pk %}">(Edit)</a></li> {% for exam in object.rapids_exams.all %}
{% endfor %} <li><a href="{% url 'rapids:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'rapids:exam_update' exam.pk %}">(Edit)</a></li>
</ul> {% endfor %}
<a href="{% url 'sbas:exam_list_collection' object.pk %}">View exam list</a> </ul>
<a href="{% url 'rapids:exam_list_collection' object.pk %}">View exam list</a>
{% endif %}
{% if object.physics_exams.all %}
<h2>Physics Exams:</h2>
<ul>
{% for exam in object.physics_exams.all %}
<li><a href="{% url 'physics:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'physics:exam_update' exam.pk %}">(Edit)</a></li>
{% endfor %}
</ul>
<a href="{% url 'physics:exam_list_collection' object.pk %}">View exam list</a>
{% endif %}
{% if object.sbas_exams.all %}
<h2>SBAs Exams:</h2>
<ul>
{% for exam in object.sbas_exams.all %}
<li><a href="{% url 'sbas:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'sbas:exam_update' exam.pk %}">(Edit)</a></li>
{% endfor %}
</ul>
<a href="{% url 'sbas:exam_list_collection' object.pk %}">View exam list</a>
{% endif %}
generic/views.py
+4 -4
View File
@@ -2265,9 +2265,9 @@ class ExamViews(View, LoginRequiredMixin):
case _: case _:
max_score = len(questions) max_score = len(questions)
cid_user_exam = exam.cid_user_exam.filter(user_user=user).first() #cid_user_exam = exam.cid_user_exam.filter(user_user=user).first()
print(user) #print(user)
print(f"{cid_user_exam=}") #print(f"{cid_user_exam=}")
template_context = { template_context = {
"exam": exam, "exam": exam,
@@ -2281,7 +2281,7 @@ class ExamViews(View, LoginRequiredMixin):
"answers_and_marks": answers_and_marks, "answers_and_marks": answers_and_marks,
"view_all_results": view_all_results, "view_all_results": view_all_results,
"supervisor": supervisor, "supervisor": supervisor,
"cid_user_exam": cid_user_exam, #"cid_user_exam": cid_user_exam,
} }
if self.normalise_score is not None: if self.normalise_score is not None: