diff --git a/generic/templates/generic/answer_history.html b/generic/templates/generic/answer_history.html index f0153e35..78463943 100644 --- a/generic/templates/generic/answer_history.html +++ b/generic/templates/generic/answer_history.html @@ -2,101 +2,109 @@ {% load help_tags %} {% block content %} -
-
-
-
-
-

Answer Revision History

- {{ history|length }} version{{ history|pluralize }} -
-
-
-
- App/Model: {{ app_name }}.{{ model_name }}
- Answer ID: {{ answer.pk }} -
-
- {% if exam %} - Exam: {{ exam }} - {% elif collection %} - Case Collection: {{ collection }} - {% endif %} -
+
+
+
+
+
+

Answer Revision History

+ {{ history|length }} version{{ history|pluralize }}
- -
- - - - - - - - - - - - - {% for rev in history %} - - - - - - - - - {% endfor %} - -
Rev IDDate / TimeEditorAnswer ValueScoreComment
#{{ rev.revision_id }}{{ rev.date }} - {% if rev.user %} - {{ rev.user.username }} - {% else %} - System / Anon - {% endif %} - - 
{{ rev.answer_text }}
- 		- {% if rev.score is not None and rev.score != "" %} - {{ rev.score }} - {% else %} - - - {% endif %} - {{ rev.comment|default:"-" }}
-
- - {% if request.user.is_superuser or request.user.is_staff %} - -
-
- Compact History Settings -
-
-

- Compacting history deletes all older versions and their associated revision logs, retaining only the final answer database state. This is permanent and cannot be undone. -

-
- {% if exam or collection %} -
- {% csrf_token %} - - -
+
+
+
+ App/Model: {{ app_name }}.{{ model_name }}
+ Answer ID: {{ answer.pk }} +
+
+ {% if exam %} + Exam: {{ exam }} + {% elif collection %} + Case Collection: {{ collection }} {% endif %}
-
- {% endif %} - -
- + +
+ + + + + + + + + + + + + + {% for rev in history %} + + + + + + + + + {% endfor %} + +
Rev IDDate / TimeEditorAnswer ValueScoreCommentTime answered
#{{ rev.revision_id }}{{ rev.date }} + {% if rev.user %} + {{ rev.user.username }} + {% else %} + System / Anon + {% endif %} + + 
{{ rev.answer_text }}
+ 		+ {% if rev.score is not None and rev.score != "" %} + {{ rev.score }} + {% else %} + - + {% endif %} + {{ rev.comment|default:"-" }} + {% if rev.time_answered %} + {{ rev.time_answered }} + {% else %} + - + {% endif %} +
+
+ + {% if request.user.is_superuser or request.user.is_staff %} + +
+
+ Compact History Settings +
+
+

+ Compacting history deletes all older versions and their associated revision logs, retaining only the final answer database state. This is permanent and cannot be undone. +

+
+ {% if exam or collection %} +
+ {% csrf_token %} + + +
+ {% endif %} +
+
+
+ {% endif %} + +
+ +
-
{% endblock %} diff --git a/generic/views.py b/generic/views.py index 29c95f66..0584e982 100644 --- a/generic/views.py +++ b/generic/views.py @@ -5346,6 +5346,7 @@ def view_answer_history(request, app_name, model_name, pk): ) elif model_name.lower() == "useranswer" and app_name.lower() == "physics": ans_text = f"A: {fields.get('a')}, B: {fields.get('b')}, C: {fields.get('c')}, D: {fields.get('d')}, E: {fields.get('e')}" + history_data.append({ "revision_id": v.revision_id, @@ -5354,6 +5355,7 @@ def view_answer_history(request, app_name, model_name, pk): "answer_text": ans_text, "score": fields.get("score", ""), "comment": v.revision.comment, + "time_answered": fields.get("time_answered", ""), }) context = {