diff --git a/anatomy/templates/anatomy/mark.html b/anatomy/templates/anatomy/mark.html index 8562ce48..749161d2 100644 --- a/anatomy/templates/anatomy/mark.html +++ b/anatomy/templates/anatomy/mark.html @@ -5,7 +5,7 @@

Marking question {{question_details.current}} of {{question_details.total}}

View Edit Admin Edit

{{ question.question_type }}

- [{{question.get_primary_answer}}] + Primary answer: {{question.get_primary_answer}}
{% csrf_token %} @@ -62,3 +62,81 @@
{% endblock %} + +{% block js %} + + + +{% endblock %} + +{% block css %} + +{% endblock css %} \ No newline at end of file diff --git a/generic/admin.py b/generic/admin.py index 32d73afc..b444062b 100644 --- a/generic/admin.py +++ b/generic/admin.py @@ -13,6 +13,7 @@ from .models import ( NoteType, CidUser, CidUserExam, + ExamUserStatus, UserGrades, UserProfile, Supervisor, @@ -31,6 +32,7 @@ admin.site.register(QuestionNote) admin.site.register(NoteType) admin.site.register(CidUser) admin.site.register(CidUserExam) +admin.site.register(ExamUserStatus) admin.site.register(CidUserGroup) admin.site.register(UserProfile) admin.site.register(UserGrades) diff --git a/generic/models.py b/generic/models.py index 5ad15a11..898e5f20 100644 --- a/generic/models.py +++ b/generic/models.py @@ -919,11 +919,14 @@ class ExamUserStatus(models.Model): exam = GenericForeignKey("content_type", "object_id") def __str__(self): + self.cid_user: "CidUser" if self.cid_user: user = self.cid_user.cid + email = self.cid_user.email_field + return f"{self.datetime}: {user} () - {self.status} ({self.extra})" else: user = self.user_user.username - return f"{self.datetime}: {user} - {self.status} ({self.extra})" + return f"{self.datetime}: {user} - {self.status} ({self.extra})" class UserAnswerBase(models.Model): diff --git a/rapids/templates/rapids/mark.html b/rapids/templates/rapids/mark.html index 00a67e63..efc178f4 100644 --- a/rapids/templates/rapids/mark.html +++ b/rapids/templates/rapids/mark.html @@ -33,7 +33,7 @@

This question is abnormal

Answers given as normal will be automatically marked.
Region: {{ question.get_regions }}, Abnormalities: {{ question.get_abnormalities }}
- [{{question.get_primary_answer}}] + Primary answer: {{question.get_primary_answer}} {% endif %}
{% csrf_token %} @@ -146,3 +146,12 @@ {% endblock %} + +{% block css %} + +{% endblock css %} \ No newline at end of file