allow completion of sbas / physics exams
This commit is contained in:
+10
-1
@@ -1518,6 +1518,12 @@ class CidUserExam(models.Model):
|
||||
else:
|
||||
return "CID" + str(self.cid_user.cid)
|
||||
|
||||
def complete_exam(self):
|
||||
# TODO add examuserstatus?
|
||||
self.end_time = timezone.now()
|
||||
self.completed = True
|
||||
self.save()
|
||||
|
||||
|
||||
CID_GROUP_EXAMS = (
|
||||
("SBAs", "sba_cid_user_groups"),
|
||||
@@ -1729,7 +1735,10 @@ class ExamCollection(models.Model, AuthorMixin):
|
||||
)
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.name} [{self.date}]"
|
||||
if self.date is not None and self.date is not "":
|
||||
return f"{self.name} [{self.date}]"
|
||||
else:
|
||||
return f"{self.name}"
|
||||
|
||||
def get_absolute_url(self):
|
||||
return reverse("generic:examcollection_detail", kwargs={"pk": self.pk})
|
||||
|
||||
@@ -2,7 +2,12 @@
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>{{ object.name }} [{{object.date}}] </h1>
|
||||
<h1>
|
||||
{{ object.name }}
|
||||
{% if object.date %}
|
||||
[{{object.date}}]
|
||||
{% endif %}
|
||||
</h1>
|
||||
|
||||
<p>
|
||||
<a href="{% url 'generic:examcollection_edit' object.pk %}">Edit</a>
|
||||
@@ -17,55 +22,55 @@
|
||||
|
||||
|
||||
|
||||
{% if object.anatomy_exams.all %}
|
||||
<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>
|
||||
{% endif %}
|
||||
{% if object.anatomy_exams.all %}
|
||||
<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>
|
||||
{% endif %}
|
||||
|
||||
{% if object.longs_exams.all %}
|
||||
<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>
|
||||
{% endif %}
|
||||
{% if object.longs_exams.all %}
|
||||
<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>
|
||||
{% endif %}
|
||||
|
||||
{% if object.rapids_exams.all %}
|
||||
<h2>Rapids Exams:</h2>
|
||||
<ul>
|
||||
{% for exam in object.rapids_exams.all %}
|
||||
<li><a href="{% url 'rapids:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'rapids:exam_update' exam.pk %}">(Edit)</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<a href="{% url 'rapids:exam_list_collection' object.pk %}">View exam list</a>
|
||||
{% endif %}
|
||||
{% if object.rapids_exams.all %}
|
||||
<h2>Rapids Exams:</h2>
|
||||
<ul>
|
||||
{% for exam in object.rapids_exams.all %}
|
||||
<li><a href="{% url 'rapids:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'rapids:exam_update' exam.pk %}">(Edit)</a></li>
|
||||
{% endfor %}
|
||||
</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.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 %}
|
||||
{% 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 %}
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user