Skip to content

Commit 4a669ff

Browse files
lucascumsillelucascumsille
committed
[Scorecards] Changed fractions to 'Out of' in question marking
After doing some testing and I noticed that the fractions might be confusing for some users. By using something more literal we might make it easier to analyse the information for the questions.
1 parent d05adbb commit 4a669ff

File tree

1 file changed

+46
-36
lines changed

1 file changed

+46
-36
lines changed

‎scoring/templates/scoring/council.html

+46-36
Original file line numberDiff line numberDiff line change
@@ -276,21 +276,21 @@ <h3 class="exclamation text-white">Visit us again on a bigger screen</h3>
276276
<td class="score border-bottom border-opacity-25 border-primary is--section-score">
277277
{% include 'caps/icons/scorecards-star.html' with classes='text-info align-text-bottom me-1' width='1.2em' height='1.2rem' role='presentation' %}
278278
<span>{{ section.weighted_score|floatformat:0 }}%</span>
279-
<!-- TODO: Change bg-green-100 to bg-red-100 if variation is negative -->
280-
<!-- TODO: Change text-success to text-danger if variation is negative -->
281-
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no variation -->
282-
<!-- TODO: Change text-success to text-dark if there is no variation -->
283-
<!-- TODO: If there is no variation then display '-' -->
279+
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
280+
<!-- TODO: Change text-success to text-danger if comparison is negative -->
281+
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
282+
<!-- TODO: Change text-success to text-dark if there is no comparison -->
283+
<!-- TODO: If there is no comparison then display '-' -->
284284
<button type="button" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Comparison with Action Scorecards 2023" class="badge small ms-2 mb-0 align-text-bottom bg-green-100 text-success border-0">+5%</button>
285285
</td>
286286
{% else %}
287287
<td class="score border-bottom border-opacity-25 border-primary is--section-score">
288288
<span>{{section.weighted_score|floatformat:0 }}%</span>
289-
<!-- TODO: Change bg-green-100 to bg-red-100 if variation is negative -->
290-
<!-- TODO: Change text-success to text-danger if variation is negative -->
291-
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no variation -->
292-
<!-- TODO: Change text-success to text-dark if there is no variation -->
293-
<!-- TODO: If there is no variation then display '-' -->
289+
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
290+
<!-- TODO: Change text-success to text-danger if comparison is negative -->
291+
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
292+
<!-- TODO: Change text-success to text-dark if there is no comparison -->
293+
<!-- TODO: If there is no comparison then display '-' -->
294294
<button type="button" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Comparison with Action Scorecards 2023" class="badge small ms-2 mb-0 align-text-bottom bg-green-100 text-success border-0">+5%</button>
295295
</td>
296296
{% endif %}
@@ -324,26 +324,36 @@ <h3 class="exclamation text-white">Visit us again on a bigger screen</h3>
324324
</td>
325325

326326
<td data-column="score" class="score border-bottom">
327-
<span>{{ answer.score|format_mark }}/{{ answer.max }}</span>
328-
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
329-
<!-- TODO: Change text-success to text-danger if comparison is negative -->
330-
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
331-
<!-- TODO: Change text-success to text-dark if there is no comparison -->
332-
<!-- TODO: If there is no comparison then display '-' -->
333-
<!-- TODO: If question didn't exist in previous years then let's add 'NA' with bg-gray-100 text-dark -->
334-
<button type="button" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Comparison with Action Scorecards 2023" class="badge small ms-2 mb-0 align-text-bottom bg-green-100 text-success border-0">+1</button>
327+
<div class="d-flex flex-row gap-3 justify-content-end align-items-center">
328+
<p class="mb-0">
329+
<span class="fs-5">{{ answer.score|format_mark }} <span class="fs-7">out of </span> {{ answer.max }}
330+
</span>
331+
</p>
332+
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
333+
<!-- TODO: Change text-success to text-danger if comparison is negative -->
334+
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
335+
<!-- TODO: Change text-success to text-dark if there is no comparison -->
336+
<!-- TODO: If there is no comparison then display '-' -->
337+
<!-- TODO: If question didn't exist in previous years then let's add 'NA' with bg-gray-100 text-dark -->
338+
<button type="button" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Comparison with Action Scorecards 2023" class="badge small ms-2 mb-0 align-text-bottom bg-green-100 text-success border-0">+1</button>
339+
</div>
335340
</td>
336341

337342
{% for comparison in answer.comparisons %}
338343
<td data-column="score" class="d-none d-md-table-cell score border-bottom">
339-
<span>{{ comparison.score|format_mark }}/{{ comparison.max }}</span>
340-
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
341-
<!-- TODO: Change text-success to text-danger if comparison is negative -->
342-
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
343-
<!-- TODO: Change text-success to text-dark if there is no comparison -->
344-
<!-- TODO: If there is no comparison then display '-' -->
345-
<!-- TODO: If question didn't exist in previous years then let's add 'NA' with bg-gray-100 text-dark -->
346-
<button type="button" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Comparison with Action Scorecards 2023" class="badge small ms-2 mb-0 align-text-bottom bg-green-100 text-success border-0">+1</button>
344+
<div class="d-flex flex-row gap-3 justify-content-end align-items-center">
345+
<p class="mb-0">
346+
<span class="fs-5">{{ comparison.score|format_mark }} <span class="fs-7">out of </span> {{ comparison.max }}
347+
</span>
348+
</p>
349+
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
350+
<!-- TODO: Change text-success to text-danger if comparison is negative -->
351+
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
352+
<!-- TODO: Change text-success to text-dark if there is no comparison -->
353+
<!-- TODO: If there is no comparison then display '-' -->
354+
<!-- TODO: If question didn't exist in previous years then let's add 'NA' with bg-gray-100 text-dark -->
355+
<button type="button" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Comparison with Action Scorecards 2023" class="badge small ms-2 mb-0 align-text-bottom bg-green-100 text-success border-0">+1</button>
356+
</div>
347357
</td>
348358
{% endfor %}
349359

@@ -377,22 +387,22 @@ <h3 class="exclamation text-white">Visit us again on a bigger screen</h3>
377387
</td>
378388
<td class="score border-bottom border-opacity-25 border-primary is--section-score">
379389
{{ plan_score.weighted_total|floatformat:0 }}%
380-
<!-- TODO: Change bg-green-100 to bg-red-100 if variation is negative -->
381-
<!-- TODO: Change text-success to text-danger if variation is negative -->
382-
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no variation -->
383-
<!-- TODO: Change text-success to text-dark if there is no variation -->
384-
<!-- TODO: If there is no variation then display '-' -->
390+
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
391+
<!-- TODO: Change text-success to text-danger if comparison is negative -->
392+
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
393+
<!-- TODO: Change text-success to text-dark if there is no comparison -->
394+
<!-- TODO: If there is no comparison then display '-' -->
385395
<button type="button" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Comparison with Action Scorecards 2023" class="badge small ms-2 mb-0 align-text-bottom bg-green-100 text-success border-0">+5%</button>
386396
</td>
387397

388398
{% for comparison in comparisons %}
389399
<td class="d-none d-md-table-cell score border-bottom border-opacity-25 border-primary is--section-score">
390400
{{ comparison.weighted_total|floatformat:0 }}%
391-
<!-- TODO: Change bg-green-100 to bg-red-100 if variation is negative -->
392-
<!-- TODO: Change text-success to text-danger if variation is negative -->
393-
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no variation -->
394-
<!-- TODO: Change text-success to text-dark if there is no variation -->
395-
<!-- TODO: If there is no variation then display '-' -->
401+
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
402+
<!-- TODO: Change text-success to text-danger if comparison is negative -->
403+
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
404+
<!-- TODO: Change text-success to text-dark if there is no comparison -->
405+
<!-- TODO: If there is no comparison then display '-' -->
396406
<button type="button" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Comparison with Action Scorecards 2023" class="badge small ms-2 mb-0 align-text-bottom bg-green-100 text-success border-0">+5%</button>
397407
</td>
398408
{% endfor %}

0 commit comments

Comments
 (0)