From 3b3f7df0d7601fd456e45443135957ee3f836c93 Mon Sep 17 00:00:00 2001 From: Ross Date: Fri, 17 Dec 2021 18:13:07 +0000 Subject: [PATCH] . --- generic/tables.py | 2 +- physics/templates/physics/exam_scores.html | 12 ++++++------ rad/urls.py | 1 + rad/views.py | 5 +++++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/generic/tables.py b/generic/tables.py index 3a8c5e71..80dd95af 100644 --- a/generic/tables.py +++ b/generic/tables.py @@ -23,7 +23,7 @@ class CidUserTable(tables.Table): # edit = tables.LinkColumn( # "anatomy:anatomy_question_update", text="Edit", args=[A("pk")], orderable=False # ) - cid = tables.LinkColumn("cid_scores", args=[A("cid"), A("passcode")], orderable=False) + cid = tables.LinkColumn("cid_scores", args=[A("cid"), A("passcode")], orderable=True) # image = ImageColumn("image", orderable=False) # clone = tables.LinkColumn('anatomy:anatomy_question_clone', # text='Clone', diff --git a/physics/templates/physics/exam_scores.html b/physics/templates/physics/exam_scores.html index 96c987e9..3d73d595 100644 --- a/physics/templates/physics/exam_scores.html +++ b/physics/templates/physics/exam_scores.html @@ -23,7 +23,7 @@ {% for user, value in user_answers_marks.items %} - {{user}} + {{user}} {{user_scores|get_item:user}} {% endfor %} @@ -33,11 +33,11 @@

Answers as a table

- - - {% for cid in cids %} - - {% endfor %} + + + {% for cid in cids %} + + {% endfor %} {% for question in questions %} diff --git a/rad/urls.py b/rad/urls.py index 47240645..0ab0439b 100644 --- a/rad/urls.py +++ b/rad/urls.py @@ -57,6 +57,7 @@ urlpatterns = [ path("accounts/profile", views.profile, name="profile"), path("", TemplateView.as_view(template_name="index.html"), name="home"), path("cid//", views.cid_scores, name="cid_scores"), + path("cid//", views.cid_scores_admin, name="cid_scores_admin"), path("cid/", views.cid_selector, name="cid_selector"), # Global url that registers RTS compatible exams path("exam/json/", views.active_exams, name="active_exams"), diff --git a/rad/views.py b/rad/views.py index 0767e0dd..9f2caeb2 100644 --- a/rad/views.py +++ b/rad/views.py @@ -75,6 +75,11 @@ def cid_selector(request): "cid_selector.html", ) +@login_required +def cid_scores_admin(request, cid): + cid_user = CidUser.objects.filter(cid=cid).first() + + return cid_scores(cid_user.cid, cid_user.passcode) def cid_scores(request, pk, passcode): # exam = get_object_or_404(Exam, pk=pk)
Candidate{{cid}}
Candidate{{cid}}