.
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
<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>
|
<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>
|
||||||
<h3>{{ question.question_type }}</h3>
|
<h3>{{ question.question_type }}</h3>
|
||||||
|
|
||||||
<div id="single-dicom-viewer" class="marking-dicom" data-images="https://penracourses.org.uk{{ question.image.url}}" data-annotations='{{question.get_annotations}}'>
|
<div id="single-dicom-viewer" class="marking-dicom" data-images="https://www.penracourses.org.uk{{ question.image.url}}" data-annotations='{{question.get_annotations}}'>
|
||||||
</div>
|
</div>
|
||||||
<div class="marking">
|
<div class="marking">
|
||||||
<form method="POST" class="post-form">{% csrf_token %}
|
<form method="POST" class="post-form">{% csrf_token %}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<button id="save-annotations">Save Annotations</button>
|
<button id="save-annotations">Save Annotations</button>
|
||||||
<div id="dicom-image" class="dicom-image" data-url="https://penracourses.org.uk{{ question.image.url}}"
|
<div id="dicom-image" class="dicom-image" data-url="https://www.penracourses.org.uk{{ question.image.url}}"
|
||||||
data-annotations='{{question.image_annotations}}' data-edit_annotation=true></div>
|
data-annotations='{{question.image_annotations}}' data-edit_annotation=true></div>
|
||||||
<!-- testing -->
|
<!-- testing -->
|
||||||
<!--<div id="dicom-image" data-url="http://localhost:8000/static/abdoct.jpg"
|
<!--<div id="dicom-image" data-url="http://localhost:8000/static/abdoct.jpg"
|
||||||
|
|||||||
+2
-2
@@ -165,7 +165,7 @@ class Long(models.Model):
|
|||||||
|
|
||||||
def get_image_urls(self):
|
def get_image_urls(self):
|
||||||
return ",".join(
|
return ",".join(
|
||||||
["https://penracourses.org.uk{}".format(i.url) for i in self.get_images()]
|
["https://www.penracourses.org.uk{}".format(i.url) for i in self.get_images()]
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_unmarked_answer_count(self):
|
def get_unmarked_answer_count(self):
|
||||||
@@ -407,7 +407,7 @@ class LongSeries(models.Model):
|
|||||||
|
|
||||||
def get_image_urls(self, feedback=False):
|
def get_image_urls(self, feedback=False):
|
||||||
images = [
|
images = [
|
||||||
"https://penracourses.org.uk{}".format(i.image.url)
|
"https://www.penracourses.org.uk{}".format(i.image.url)
|
||||||
for i in self.images.all()
|
for i in self.images.all()
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -157,7 +157,7 @@ SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
|
|||||||
STATIC_URL = '/static/'
|
STATIC_URL = '/static/'
|
||||||
STATIC_ROOT = 'static/'
|
STATIC_ROOT = 'static/'
|
||||||
|
|
||||||
REMOTE_URL = "https://penracourses.org.uk"
|
REMOTE_URL = "https://www.penracourses.org.uk"
|
||||||
#
|
#
|
||||||
#if DEBUG:
|
#if DEBUG:
|
||||||
# STATIC_URL = REMOTE_URL + STATIC_URL
|
# STATIC_URL = REMOTE_URL + STATIC_URL
|
||||||
|
|||||||
+1
-1
@@ -302,7 +302,7 @@ class Rapid(models.Model):
|
|||||||
return images
|
return images
|
||||||
|
|
||||||
def get_image_urls(self):
|
def get_image_urls(self):
|
||||||
return ",".join(["https://penracourses.org.uk{}".format(i.url) for i in self.get_images()])
|
return ",".join(["https://www.penracourses.org.uk{}".format(i.url) for i in self.get_images()])
|
||||||
#def GetNonFeedbackQuestionImages(self):
|
#def GetNonFeedbackQuestionImages(self):
|
||||||
#return self.get_images()
|
#return self.get_images()
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
<span class="image-block">
|
<span class="image-block">
|
||||||
Image {{ forloop.counter }}{% if image.feedback_image %} [feedback image]{% endif %}:
|
Image {{ forloop.counter }}{% if image.feedback_image %} [feedback image]{% endif %}:
|
||||||
<div class="dicom-image rapid-img {% if image.feedback_image %}feedback-img{% endif %}"
|
<div class="dicom-image rapid-img {% if image.feedback_image %}feedback-img{% endif %}"
|
||||||
data-url="https://penracourses.org.uk{{ image.image.url}}"></div>
|
data-url="https://www.penracourses.org.uk{{ image.image.url}}"></div>
|
||||||
</span>
|
</span>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user