Skip to content

Commit 3b0a1aa

Browse files
malcolmbaigmalcolmbaig
committed
Implement ShowImageReadView as a TemplateView
This doesn't need to be a FormView currently, so use TemplateView for now.
1 parent 938be78 commit 3b0a1aa

2 files changed

Lines changed: 38 additions & 47 deletions

File tree

‎manage_breast_screening/reading/jinja2/read_image.jinja‎

Lines changed: 36 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{% extends "layout-app.jinja" %}
2-
{% from "django_form_helpers.jinja" import form_error_summary %}
32
{% from "nhsuk/components/button/macro.jinja" import button %}
43
{% from "nhsuk/components/inset-text/macro.jinja" import insetText %}
54
{% from "nhsuk/components/summary-list/macro.jinja" import summaryList %}
@@ -26,8 +25,6 @@
2625
{% block page_content %}
2726
<div class="nhsuk-grid-row">
2827
<div class="nhsuk-grid-column-full">
29-
{{ form_error_summary(form) }}
30-
3128
<div class="nhsuk-grid-row app-header">
3229
<div class="nhsuk-grid-column-two-thirds app-header">
3330
<h1 class="nhsuk-heading-l">
@@ -59,54 +56,50 @@
5956
</div>
6057
</div>
6158

62-
<form method="post" novalidate>
63-
{{ csrf_input }}
64-
65-
<div class="nhsuk-grid-row">
66-
<div class="nhsuk-grid-column-one-third nhsuk-u-margin-bottom-4">
67-
<h2 class="nhsuk-heading-s">Image thumbnails ({{ images | length }})</h2>
68-
<div class="app-mammogram-thumbnails">
69-
{% for image in images %}
70-
<div class="app-mammogram-thumbnail {{ image.class }}">
71-
<div class="app-mammogram-thumbnail__image-wrapper">
72-
<span class="app-mammogram-thumbnail__label">{{ image.name }}</span>
73-
<img class="app-mammogram-thumbnail__image app-mammogram-thumbnail__image--diagram"
74-
src="{{ image.url }}" alt="{{ image.name }} view">
75-
</div>
59+
<div class="nhsuk-grid-row">
60+
<div class="nhsuk-grid-column-one-third nhsuk-u-margin-bottom-4">
61+
<h2 class="nhsuk-heading-s">Image thumbnails ({{ images | length }})</h2>
62+
<div class="app-mammogram-thumbnails">
63+
{% for image in images %}
64+
<div class="app-mammogram-thumbnail {{ image.class }}">
65+
<div class="app-mammogram-thumbnail__image-wrapper">
66+
<span class="app-mammogram-thumbnail__label">{{ image.name }}</span>
67+
<img class="app-mammogram-thumbnail__image app-mammogram-thumbnail__image--diagram"
68+
src="{{ image.url }}" alt="{{ image.name }} view">
7669
</div>
77-
{% endfor %}
78-
</div>
70+
</div>
71+
{% endfor %}
7972
</div>
73+
</div>
8074

81-
<div class="nhsuk-grid-column-two-thirds">
82-
<h2 class="nhsuk-heading-m">What is your opinion of these images?</h2>
75+
<div class="nhsuk-grid-column-two-thirds">
76+
<h2 class="nhsuk-heading-m">What is your opinion of these images?</h2>
8377

84-
<div class="nhsuk-u-margin-bottom-4">
85-
<button class="nhsuk-button nhsuk-u-width-full nhsuk-u-margin-bottom-3">
86-
Normal <span class="app-shortcut-hint">(N)</span>
87-
</button>
88-
<p class="nhsuk-u-margin-bottom-4">
89-
<a class="nhsuk-link nhsuk-link--no-visited-state" href="#">Normal, but add details</a>
90-
</p>
91-
</div>
78+
<div class="nhsuk-u-margin-bottom-4">
79+
<button class="nhsuk-button nhsuk-u-width-full nhsuk-u-margin-bottom-3">
80+
Normal <span class="app-shortcut-hint">(N)</span>
81+
</button>
82+
<p class="nhsuk-u-margin-bottom-4">
83+
<a class="nhsuk-link nhsuk-link--no-visited-state" href="#">Normal, but add details</a>
84+
</p>
85+
</div>
9286

93-
<div class="nhsuk-u-margin-bottom-4">
94-
<a href="{{ url('reading:add_technical_recall', kwargs={'session_pk': view.kwargs.session_pk, 'read_pk': view.kwargs.pk}) }}"
95-
role="button"
96-
draggable="false"
97-
class="nhsuk-button nhsuk-button--secondary nhsuk-u-width-full nhsuk-u-margin-bottom-3">
98-
Technical recall <span class="app-shortcut-hint">(T)</span>
99-
</a>
100-
</div>
87+
<div class="nhsuk-u-margin-bottom-4">
88+
<a href="{{ url('reading:add_technical_recall', kwargs={'session_pk': view.kwargs.session_pk, 'read_pk': view.kwargs.pk}) }}"
89+
role="button"
90+
draggable="false"
91+
class="nhsuk-button nhsuk-button--secondary nhsuk-u-width-full nhsuk-u-margin-bottom-3">
92+
Technical recall <span class="app-shortcut-hint">(T)</span>
93+
</a>
94+
</div>
10195

102-
<div class="nhsuk-u-margin-bottom-4">
103-
<button class="nhsuk-button nhsuk-button--warning nhsuk-u-width-full">
104-
Recall for assessment <span class="app-shortcut-hint">(R)</span>
105-
</button>
106-
</div>
96+
<div class="nhsuk-u-margin-bottom-4">
97+
<button class="nhsuk-button nhsuk-button--warning nhsuk-u-width-full">
98+
Recall for assessment <span class="app-shortcut-hint">(R)</span>
99+
</button>
107100
</div>
108101
</div>
109-
</form>
102+
</div>
110103

111104
{% if notes_for_reader %}
112105
{% set inset_html %}

‎manage_breast_screening/reading/views.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
from logging import getLogger
22

33
from django.contrib.auth.decorators import permission_required
4-
from django.forms import Form
54
from django.shortcuts import render
65
from django.views.decorators.http import require_http_methods
7-
from django.views.generic import FormView, TemplateView
6+
from django.views.generic import TemplateView
87
from rules.contrib.views import PermissionRequiredMixin
98

109
from manage_breast_screening.auth.models import Permission
@@ -22,8 +21,7 @@ def show_reading_dashboard_view(request):
2221
return render(request, "show_readings.jinja")
2322

2423

25-
class ShowImageReadView(PermissionRequiredMixin, FormView):
26-
form_class = Form
24+
class ShowImageReadView(PermissionRequiredMixin, TemplateView):
2725
template_name = "read_image.jinja"
2826
permission_required = Permission.READ_IMAGES
2927

0 commit comments

Comments
 (0)