diff --git a/rapids/tables.py b/rapids/tables.py index a98ba283..c87e852f 100755 --- a/rapids/tables.py +++ b/rapids/tables.py @@ -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" diff --git a/rapids/templates/rapids/ciduseranswer_detail.html b/rapids/templates/rapids/ciduseranswer_detail.html new file mode 100644 index 00000000..f59bb2ed --- /dev/null +++ b/rapids/templates/rapids/ciduseranswer_detail.html @@ -0,0 +1,8 @@ + +{% extends 'rapids/base.html' %} + +{% block content %} +{{ciduseranswer.question}} +{{ciduseranswer.normal}} +{{ciduseranswer.cid}} +{% endblock content %} \ No newline at end of file diff --git a/rapids/templates/rapids/exam_overview.html b/rapids/templates/rapids/exam_overview.html index 1406608b..c35c1233 100644 --- a/rapids/templates/rapids/exam_overview.html +++ b/rapids/templates/rapids/exam_overview.html @@ -26,9 +26,11 @@ {% for question in questions.all %}
  • + {% for image in question.GetImages %} thumbail {% endfor %} + {% if not question.normal %} Abnormality: {{ question.get_abnormalities }} Region: {{ question.get_regions }}
    @@ -37,7 +39,7 @@ Normal {% endif %}
    - Examination: {{ question.get_examinations }}, View, Mark + Examination: {{ question.get_examinations }}, View, Mark
  • {% endfor %} diff --git a/rapids/urls.py b/rapids/urls.py index 3f123476..44ccbcec 100755 --- a/rapids/urls.py +++ b/rapids/urls.py @@ -66,6 +66,7 @@ urlpatterns = [ name="rapid_update", ), path("/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/", views.RapidUserAnswerView.as_view(), name="rapid_user_answer_view"), path("user_answers//delete", views.UserAnswerDelete.as_view(), name="rapid_user_answer_delete"), ] diff --git a/rapids/views.py b/rapids/views.py index 4ddcb68b..fe85f80c 100755 --- a/rapids/views.py +++ b/rapids/views.py @@ -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