diff --git a/generic/views.py b/generic/views.py index 3cccb7cf..0cb0f034 100644 --- a/generic/views.py +++ b/generic/views.py @@ -2661,13 +2661,13 @@ class ExamViews(View, LoginRequiredMixin): pass if cid is not None: - statuses = exam.exam_user_status.filter(cid_user_exam__cid_user__cid=cid) + statuses = exam.exam_user_status.filter(cid_user_exam__cid_user__cid=cid).order_by("datetime") elif user_id is not None: statuses = exam.exam_user_status.filter( cid_user_exam__user_user__id=user_id - ) + ).order_by("datetime") else: - statuses = exam.exam_user_status.all() + statuses = exam.exam_user_status.all().order_by("datetime") return render( request, "exam_user_status.html", {"exam": exam, "statuses": statuses} diff --git a/templates/exam_user_status.html b/templates/exam_user_status.html index 7073ab5a..e04868ef 100644 --- a/templates/exam_user_status.html +++ b/templates/exam_user_status.html @@ -1,23 +1,33 @@ +
+ +
+ {% if statuses %} - + {% else %} - Nil recorded. +
Nil recorded.
{% endif %} + +