From 55cb59936410bb6223bf92128f8bb31cd9d0feec Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 7 Dec 2020 23:52:29 +0000
Subject: [PATCH] let (non admin) users mark

---
 anatomy/static/css/anatomy.css                |  4 ++++
 anatomy/templates/anatomy/mark.html           |  1 +
 .../templates/anatomy/question_detail.html    | 19 ++++++++++++++++++-
 anatomy/views.py                              |  4 ++--
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/anatomy/static/css/anatomy.css b/anatomy/static/css/anatomy.css
index f9b9385a..3042477e 100644
--- a/anatomy/static/css/anatomy.css
+++ b/anatomy/static/css/anatomy.css
@@ -275,4 +275,8 @@ img.uploading:hover {
 		transform: scale(0.95);
 		box-shadow: 0 0 0 0 rgba(142, 68, 173, 0);
 	}
+}
+
+#annotation-json-content {
+  display: none;
 }
\ No newline at end of file
diff --git a/anatomy/templates/anatomy/mark.html b/anatomy/templates/anatomy/mark.html
index c8fd5eb5..57e5f4eb 100644
--- a/anatomy/templates/anatomy/mark.html
+++ b/anatomy/templates/anatomy/mark.html
@@ -2,6 +2,7 @@
 
 {% block content %}
 <h2>Marking question {{question_details.current}} of {{question_details.total}}</h2>
+<a href="{% url 'anatomy:anatomy_question_update' question.id %}" title="Edit the Question">Edit</a> <a href="{% url 'admin:anatomy_anatomyquestion_change' question.id %}" title="Edit the Question using the admin interface">Admin Edit</a>
 <p>{{ question.question_type }}</p>
 
 <div id="dicom-image" data-url="{{ question.image.url}}" data-annotations='{{question.image_annotations}}'>
diff --git a/anatomy/templates/anatomy/question_detail.html b/anatomy/templates/anatomy/question_detail.html
index 923c1be7..bdddd552 100644
--- a/anatomy/templates/anatomy/question_detail.html
+++ b/anatomy/templates/anatomy/question_detail.html
@@ -18,6 +18,9 @@
     Answers (score): {% for answer in question.answers.all %}
     {{ answer }} ({{answer.status}}),
     {% endfor %}
+    <div>
+        Description: {{ question.description }}
+    </div>
     <div>
         Examinations: {% for exam in question.exams.all %}
         {{ exam.name }}
@@ -30,11 +33,25 @@
         Region: {{ question.region }}
     </div>
     <div>
-        Annotation JSON: {{ question.image_annotations }}
+        Structure: {{ question.structure }}
+    </div>
+    <div>
+        Body Part: {{ question.body_part }}
+    </div>
+    <div>
+        Author: {% for user in question.author.all %}
+    {{ author }}, 
+    {% endfor %}
+    </div>
+    <div>
+        <span id="annotation-json-toggle">Annotation JSON (+/-):</span> <span id="annotation-json-content"><pre>{{ question.image_annotations }}</pre></span>
     </div>
 </div>
 <script type="text/javascript">
     $(document).ready(function () {
+
+        $("#annotation-json-toggle").click(() => { $("#annotation-json-content").toggle() });
+
         // send request to change the is_private state on customSwitches toggle
         $("#save-annotations").click(function () {
             json = getJsonToolStateNoId();
diff --git a/anatomy/views.py b/anatomy/views.py
index f9c052d8..66a8e696 100644
--- a/anatomy/views.py
+++ b/anatomy/views.py
@@ -296,8 +296,8 @@ def postExamAnswers(request):
     # return render(request, "anatomy/exam.html", {"exam" : exam, "question" : question})
 
 
+#@user_passes_test(user_is_admin, login_url="/accounts/login")
 @login_required
-@user_passes_test(user_is_admin, login_url="/accounts/login")
 def mark_overview(request, pk):
     exam = get_object_or_404(Exam, pk=pk)
 
@@ -309,8 +309,8 @@ def mark_overview(request, pk):
     })
 
 
+#@user_passes_test(user_is_admin, login_url="/accounts/login")
 @login_required
-@user_passes_test(user_is_admin, login_url="/accounts/login")
 def mark(request, pk, sk):
     exam = get_object_or_404(Exam, pk=pk)