This commit is contained in:
Ross
2021-01-25 15:51:29 +00:00
parent 8238d5e869
commit 71b8ec86dd
3 changed files with 23 additions and 23 deletions
+6 -6
View File
@@ -7,20 +7,20 @@
<div> <div>
{% if previous > -1 %} {% if previous > -1 %}
<a href="{% url 'anatomy:exam_question_detail' exam.id previous %}">Previous question</a> <a href="{% url 'rapids:exam_question_detail' exam.id previous %}">Previous question</a>
{% endif %} {% endif %}
This question is part of exam: {{exam.name}} [{{pos}}/{{exam_length}}] This question is part of exam: {{exam.name}} [{{pos}}/{{exam_length}}]
{% if next %} {% if next %}
<a href="{% url 'anatomy:exam_question_detail' exam.id next %}">Next question</a> <a href="{% url 'rapids:exam_question_detail' exam.id next %}">Next question</a>
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}
<a href="{% url 'rapids:rapid_update' pk=rapid.pk %}" title="Edit the Rapid">Edit</a> <a href="{% url 'rapids:rapid_update' pk=question.pk %}" title="Edit the Rapid">Edit</a>
<a href="{% url 'rapids:rapid_clone' pk=rapid.pk %}" title="Clone the Rapid (duplicate everything but the images)">Clone</a> <a href="{% url 'rapids:rapid_clone' pk=question.pk %}" title="Clone the Rapid (duplicate everything but the images)">Clone</a>
<a href="{% url 'rapids:rapid_add_note' pk=rapid.pk %}"> Add Note</a> <a href="{% url 'rapids:rapid_add_note' pk=question.pk %}"> Add Note</a>
{% if request.user.is_superuser %} {% if request.user.is_superuser %}
<a href="{% url 'admin:rapids_rapid_change' rapid.id %}" title="Edit the Rapid using the admin interface">Admin Edit</a> <a href="{% url 'admin:rapids_rapid_change' question.id %}" title="Edit the Rapid using the admin interface">Admin Edit</a>
{% endif %} {% endif %}
{% include 'rapids/rapid_display_block.html' %} {% include 'rapids/rapid_display_block.html' %}
{% endblock %} {% endblock %}
@@ -1,32 +1,32 @@
<div class="rapid {% if rapid.scrapped %}rapid-scrapped{% endif %}"> <div class="rapid {% if question.scrapped %}rapid-scrapped{% endif %}">
<div class="date"> <div class="date">
{{ rapid.created_date }} {{ question.created_date }}
</div> </div>
<p class="pre-whitespace"><b>Rapid:</b> {{ rapid }}</p> <p class="pre-whitespace"><b>Rapid:</b> {{ question }}</p>
<p class="pre-whitespace"><b>Region:</b> {{ rapid.get_regions }}</p> <p class="pre-whitespace"><b>Region:</b> {{ question.get_regions }}</p>
<p class="pre-whitespace"><b>Examination:</b> {{ rapid.get_examinations }}</p> <p class="pre-whitespace"><b>Examination:</b> {{ question.get_examinations }}</p>
<p class="pre-whitespace"><b>Laterality:</b> {{ rapid.laterality }}</p> <p class="pre-whitespace"><b>Laterality:</b> {{ question.laterality }}</p>
<p class="pre-whitespace"><b>Abnormality:</b> {{ rapid.get_abnormalities }}</p> <p class="pre-whitespace"><b>Abnormality:</b> {{ question.get_abnormalities }}</p>
<p class="pre-whitespace"><b>Images:</b> <p class="pre-whitespace"><b>Images:</b>
{% for image in rapid.images.all %} {% for image in question.images.all %}
Image {{ forloop.counter }}{% if image.feedback_image %} [feedback image]{% endif %}: Image {{ forloop.counter }}{% if image.feedback_image %} [feedback image]{% endif %}:
<!-- <img class="rapid-img {% if image.feedback_image %}feedback-img{% endif %}" src="{{ image.image.url }}"><br/> --> <!-- <img class="rapid-img {% if image.feedback_image %}feedback-img{% endif %}" src="{{ image.image.url }}"><br/> -->
<div class="dicom-image rapid-img {% if image.feedback_image %}feedback-img{% endif %}" data-url="http://penracourses.org.uk{{ image.image.url}}"></div> <div class="dicom-image rapid-img {% if image.feedback_image %}feedback-img{% endif %}" data-url="http://penracourses.org.uk{{ image.image.url}}"></div>
{% endfor %}</p> {% endfor %}</p>
<p class="pre-whitespace"><b>Feedback:</b> {{ rapid.feedback }}</p> <p class="pre-whitespace"><b>Feedback:</b> {{ question.feedback }}</p>
<p><b>Author(s):</b> {% for author in rapid.author.all %} <a <p><b>Author(s):</b> {% for author in question.author.all %} <a
href="{% url 'rapids:author_detail' pk=author.pk %}">{{author}}</a>, {% endfor %}</p> href="{% url 'rapids:author_detail' pk=author.pk %}">{{author}}</a>, {% endfor %}</p>
<p><b>Checked by:</b> {% for verified in rapid.verified.all %} <a <p><b>Checked by:</b> {% for verified in question.verified.all %} <a
href="{% url 'rapids:verified_detail' pk=verified.pk %}">{{verified}}</a>, {% endfor %}</p> href="{% url 'rapids:verified_detail' pk=verified.pk %}">{{verified}}</a>, {% endfor %}</p>
<p><b>Scrapped:</b> {{ rapid.scrapped }} <a href="{% url 'rapids:rapid_scrap' pk=rapid.pk %}">(toggle)</a> <p><b>Scrapped:</b> {{ question.scrapped }} <a href="{% url 'rapids:rapid_scrap' pk=rapid.pk %}">(toggle)</a>
<p class="pre-whitespace"><b>Answers:</b> {{ rapid.GetMarkedAnswers }}</p> <p class="pre-whitespace"><b>Answers:</b> {{ question.GetMarkedAnswers }}</p>
</p> </p>
</div> </div>
<div> <div>
Notes: Notes:
<ul> <ul>
{% for note in rapid.rapid_notes.all %} {% for note in question.rapid_notes.all %}
<li> <li>
{{ note.created_on }} by {{ note.author }}: {{ note.note }} {{ note.created_on }} by {{ note.author }}: {{ note.note }}
</li> </li>
+3 -3
View File
@@ -91,7 +91,7 @@ def rapid_detail(request, pk):
# logging.debug(rapid.rapid_notes.first()) # logging.debug(rapid.rapid_notes.first())
# logging.debug(rapid.subspecialty.first().name.all()) # logging.debug(rapid.subspecialty.first().name.all())
return render(request, "rapids/rapid_detail.html", {"rapid": rapid}) return render(request, "rapids/rapid_detail.html", {"question": rapid})
@login_required @login_required
@@ -129,7 +129,7 @@ def rapid_split(request, pk):
# logging.debug(rapid.rapid_notes.first()) # logging.debug(rapid.rapid_notes.first())
# logging.debug(rapid.subspecialty.first().name.all()) # logging.debug(rapid.subspecialty.first().name.all())
return render(request, "rapids/rapid_detail.html", {"rapid": rapid}) return render(request, "rapids/rapid_detail.html", {"question": rapid})
@login_required @login_required
@@ -1040,7 +1040,7 @@ def exam_question_detail(request, pk, sk):
request, request,
"rapids/rapid_detail.html", "rapids/rapid_detail.html",
{ {
"rapid": question, "question": question,
"exam": exam, "exam": exam,
"next": next, "next": next,
"previous": previous, "previous": previous,