Skip to content

Commit 68da52b

Browse files
zarinozarino
committed
fixup! display previous year's response on RoR page, if exists
1 parent 9522308 commit 68da52b

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

‎crowdsourcer/templates/crowdsourcer/authority_ror_questions_with_previous.html

+40-40
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,10 @@ <h3 class="mb-4 mb-md-5 text-success">
4949
<fieldset class="py-4 py-md-5 border-top">
5050
<div class="row">
5151
<div class="col-md-7">
52-
<legend id="q{{q_form.question_obj.number_and_part}}" class="h4 mb-3 mb-sm-4">
53-
{{q_form.question_obj.number_and_part}}. {{ q_form.question_obj.description }}
54-
{% if q_form.question_obj.how_marked == "foi" %}(FOI){% endif %}
52+
<legend id="q{{q_form.question_obj.number_and_part}}" class="h4 mb-3 mb-sm-4">
53+
{{q_form.question_obj.number_and_part}}. {{ q_form.question_obj.description }}
54+
{% if q_form.question_obj.how_marked == "foi" %}(FOI){% endif %}
5555
</legend>
56-
</div>
57-
</div>
58-
<div class="row">
59-
<div class="col-md-4 offset-md-1 order-md-2 mb-3 mb-sm-4">
6056
<details class="text-muted">
6157
<summary class="fw-bold mb-2">Criteria</summary>
6258
{% autoescape off %}
@@ -71,11 +67,36 @@ <h3 class="mb-4 mb-md-5 text-success">
7167
</details>
7268
</div>
7369
</div>
74-
<div class="row">
75-
<div class="col-lg-6 mt-6">
70+
<div class="row gx-xl-5">
71+
<div class="col-lg-4 mt-5">
72+
<h4 class="h5">Your 2023 Scorecards Right of Reply response</h4>
73+
<p class="text-muted mb-3 mb-lg-4">This is what you or someone from your council supplied when responding to the equivalent question in the 2023 Scorecards Right of Reply, in Spring 2023. <strong>This is for your information only.</strong></p>
74+
75+
<h5 class="form-label fs-6">Agree with response</h5>
76+
<div class="read-only-answer mb-3 mb-md-4">
77+
{% if q_form.previous_response.agree_with_response %}
78+
Yes
79+
{% elif q_form.previous_response.agree_with_response == False %}
80+
No
81+
{% else %}
82+
(none)
83+
{% endif %}
84+
</div>
85+
86+
<h5 class="form-label fs-6">Links to evidence</h5>
87+
<div class="read-only-answer mb-3 mb-md-4">
88+
{{ q_form.previous_response.evidence|default:"(none)" }}
89+
</div>
90+
91+
<h5 class="form-label fs-6">Additional notes</h5>
92+
<div class="read-only-answer mb-3 mb-md-4">
93+
{{ q_form.previous_response.private_notes|default:"(none)"|linebreaks }}
94+
</div>
7695
</div>
77-
<div class="col-lg-6 mt-6">
78-
<h2 class="form-label fs-6">Marker’s answer</h2>
96+
<div class="col-lg-4 mt-5">
97+
<h4 class="h5 mb-3 mb-lg-4">2025 Scorecards First Mark assessment</h4>
98+
99+
<h5 class="form-label fs-6">Marker’s answer</h5>
79100
<div class="read-only-answer mb-3 mb-md-4">
80101
{% if q_form.orig.multi_option.values %}
81102
<p>
@@ -91,59 +112,38 @@ <h2 class="form-label fs-6">Marker’s answer</h2>
91112
</div>
92113

93114
{% if q_form.question_obj.how_marked == 'foi' %}
94-
<h2 class="form-label fs-6">FOI request</h2>
115+
<h5 class="form-label fs-6">FOI request</h5>
95116
<div class="read-only-answer mb-3 mb-md-4">
96117
{{ q_form.orig.evidence|urlize }}
97118
</div>
98119
{% else %}
99-
<h2 class="form-label fs-6">Marker’s evidence of criteria met</h2>
120+
<h5 class="form-label fs-6">Marker’s evidence of criteria met</h5>
100121
<div class="read-only-answer mb-3 mb-md-4">
101122
{{ q_form.orig.evidence|default:"(none)"|linebreaks }}
102123
</div>
103124
{% endif %}
104125

105126
{% if q_form.question_obj.how_marked != 'foi' %}
106-
<h2 class="form-label fs-6">Links to evidence</h2>
127+
<h5 class="form-label fs-6">Links to evidence</h5>
107128
<div class="read-only-answer mb-3 mb-md-4">
108129
{{ q_form.orig.public_notes|default:"(none)"|urlize|linebreaks }}
109130
</div>
110131

111-
<h2 class="form-label fs-6">Page number</h2>
132+
<h5 class="form-label fs-6">Page number</h5>
112133
<div class="read-only-answer mb-3 mb-md-4">
113134
{{ q_form.orig.page_number|default:"(none)" }}<br>
114135
</div>
115136
{% endif %}
116137

117-
<h2 class="form-label fs-6">Marker’s additional notes</h2>
138+
<h5 class="form-label fs-6">Marker’s additional notes</h5>
118139
<div class="read-only-answer mb-3 mb-md-4">
119140
{{ q_form.orig.private_notes|default:"(none)"|linebreaks }}
120141
</div>
121142
</div>
122-
</div>
123-
<div class="row">
124-
<div class="col-lg-6 mt-6">
125-
<h4 class="form-label fs-6">Your Scorecards 2023 response</h4>
126-
<div class="read-only-answer mb-3 mb-md-4">
127-
{% if q_form.previous_response.agree_with_response %}
128-
Yes
129-
{% elif q_form.previous_response.agree_with_response == False %}
130-
No
131-
{% else %}
132-
(none)
133-
{% endif %}
134-
</div>
135-
136-
<h4 class="form-label fs-6">Links to evidence</h4>
137-
<div class="read-only-answer mb-0 mb-md-0">
138-
{{ q_form.previous_response.evidence|default:"(none)" }}
139-
</div>
143+
<div class="col-lg-4 mt-5">
144+
<h4 class="h5">Your 2025 Scorecards Right of Reply response</h4>
145+
<p class="text-muted mb-3 mb-lg-4">Please provide your response here on the 2025 Scorecards First Mark assessment.</p>
140146

141-
<h4 class="form-label fs-6">Additional notes</h4>
142-
<div class="read-only-answer mb-3 mb-md-4">
143-
{{ q_form.previous_response.private_notes|default:"(none)"|linebreaks }}
144-
</div>
145-
</div>
146-
<div class="col-lg-6 mt-6">
147147
{% bootstrap_field q_form.agree_with_response %}
148148

149149
{% bootstrap_field q_form.evidence %}

0 commit comments

Comments
 (0)