This commit is contained in:
Ross
2021-07-06 19:57:15 +01:00
parent 410fae0d0d
commit 65d202a649
5 changed files with 23 additions and 5 deletions
+4
View File
@@ -62,6 +62,10 @@ class RapidUserAnswerTable(tables.Table):
delete = tables.LinkColumn(
"rapids:rapid_user_answer_delete", text="Delete", args=[A("pk")], orderable=False
)
view = tables.LinkColumn('rapids:rapid_user_answer_view',
text='View',
args=[A('pk')],
orderable=False)
class Meta:
model = CidUserAnswer
template_name = "django_tables2/bootstrap4.html"
@@ -0,0 +1,8 @@
{% extends 'rapids/base.html' %}
{% block content %}
{{ciduseranswer.question}}
{{ciduseranswer.normal}}
{{ciduseranswer.cid}}
{% endblock content %}
+3 -1
View File
@@ -26,9 +26,11 @@
{% for question in questions.all %}
<li data-question_pk={{question.pk}}>
<a href="{% url 'rapids:exam_question_detail' pk=exam.pk sk=forloop.counter0 %}">
{% for image in question.GetImages %}
<img src="{{ image|thumbnail_url:'exam-list' }}" alt="thumbail" />
{% endfor %}
</a>
{% if not question.normal %}
<b>Abnormality:</b> {{ question.get_abnormalities }} <b>Region:</b> {{ question.get_regions }}
<br />
@@ -37,7 +39,7 @@
<b>Normal</b>
{% endif %}
<br />
Examination: {{ question.get_examinations }}, <a href="{% url 'rapids:exam_question_detail' pk=exam.pk sk=forloop.counter0 %}">View</a>, <a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Mark</a>
Examination: {{ question.get_examinations }}, <a href="{% url 'rapids:question_detail' pk=question.pk %}">View</a>, <a href="{% url 'rapids:mark' pk=exam.pk sk=forloop.counter0 %}">Mark</a>
</li>
{% endfor %}
</ol>
+2 -1
View File
@@ -66,6 +66,7 @@ urlpatterns = [
name="rapid_update",
),
path("<int:pk>/add_note", views.AddNote.as_view(), name="rapid_add_note"),
path("user_answers/", views.RapidUserAnswerView.as_view(), name="rapid_user_answer_view"),
path("user_answers/", views.RapidUserAnswerTableView.as_view(), name="rapid_user_answer_table_view"),
path("user_answers/<int:pk>", views.RapidUserAnswerView.as_view(), name="rapid_user_answer_view"),
path("user_answers/<int:pk>/delete", views.UserAnswerDelete.as_view(), name="rapid_user_answer_delete"),
]
+6 -3
View File
@@ -8,6 +8,7 @@ from django.contrib.auth.models import User
from django.core.exceptions import PermissionDenied
from django.contrib.auth.mixins import LoginRequiredMixin
from django.views.generic.detail import DetailView
from django.views.generic.edit import CreateView, UpdateView, DeleteView
from django.views.generic import ListView
@@ -957,16 +958,18 @@ class ExamUpdate(RevisionMixin, LoginRequiredMixin, AuthorOrCheckerRequiredMixin
form.instance.author.add(self.request.user.id)
return super().form_valid(form)
class RapidUserAnswerView(LoginRequiredMixin, SingleTableMixin, FilterView):
class RapidUserAnswerView(LoginRequiredMixin, DetailView):
model = CidUserAnswer
class RapidUserAnswerTableView(LoginRequiredMixin, SingleTableMixin, FilterView):
model = CidUserAnswer
table_class = RapidUserAnswerTable
template_name = "rapids/rapid_question_view.html"
filterset_class = RapidUserAnswerFilter
class UserAnswerDelete(SuperuserRequiredMixin, DeleteView):
model = CidUserAnswer
success_url = reverse_lazy("rapids:rapid_user_answer_view")
success_url = reverse_lazy("rapids:rapid_user_answer_table_view")
class LargeResultsSetPagination(PageNumberPagination):
page_size = 1000