Skip to content

Commit

Permalink
[Scorecards] Changed fractions to 'Out of' in question marking
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@lucascumsille
lucascumsille committed Jan 27, 2025
1 parent d05adbb commit 4a669ff
Showing 1 changed file with 46 additions and 36 deletions.
82 changes: 46 additions & 36 deletions scoring/templates/scoring/council.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,21 +276,21 @@ <h3 class="exclamation text-white">Visit us again on a bigger screen</h3>
<td class="score border-bottom border-opacity-25 border-primary is--section-score">
{% include 'caps/icons/scorecards-star.html' with classes='text-info align-text-bottom me-1' width='1.2em' height='1.2rem' role='presentation' %}
<span>{{ section.weighted_score|floatformat:0 }}%</span>
<!-- TODO: Change bg-green-100 to bg-red-100 if variation is negative -->
<!-- TODO: Change text-success to text-danger if variation is negative -->
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no variation -->
<!-- TODO: Change text-success to text-dark if there is no variation -->
<!-- TODO: If there is no variation then display '-' -->
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
<!-- TODO: Change text-success to text-danger if comparison is negative -->
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
<!-- TODO: Change text-success to text-dark if there is no comparison -->
<!-- TODO: If there is no comparison then display '-' -->
<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>
</td>
{% else %}
<td class="score border-bottom border-opacity-25 border-primary is--section-score">
<span>{{section.weighted_score|floatformat:0 }}%</span>
<!-- TODO: Change bg-green-100 to bg-red-100 if variation is negative -->
<!-- TODO: Change text-success to text-danger if variation is negative -->
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no variation -->
<!-- TODO: Change text-success to text-dark if there is no variation -->
<!-- TODO: If there is no variation then display '-' -->
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
<!-- TODO: Change text-success to text-danger if comparison is negative -->
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
<!-- TODO: Change text-success to text-dark if there is no comparison -->
<!-- TODO: If there is no comparison then display '-' -->
<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>
</td>
{% endif %}
Expand Down Expand Up @@ -324,26 +324,36 @@ <h3 class="exclamation text-white">Visit us again on a bigger screen</h3>
</td>

<td data-column="score" class="score border-bottom">
<span>{{ answer.score|format_mark }}/{{ answer.max }}</span>
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
<!-- TODO: Change text-success to text-danger if comparison is negative -->
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
<!-- TODO: Change text-success to text-dark if there is no comparison -->
<!-- TODO: If there is no comparison then display '-' -->
<!-- TODO: If question didn't exist in previous years then let's add 'NA' with bg-gray-100 text-dark -->
<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>
<div class="d-flex flex-row gap-3 justify-content-end align-items-center">
<p class="mb-0">
<span class="fs-5">{{ answer.score|format_mark }} <span class="fs-7">out of </span> {{ answer.max }}
</span>
</p>
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
<!-- TODO: Change text-success to text-danger if comparison is negative -->
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
<!-- TODO: Change text-success to text-dark if there is no comparison -->
<!-- TODO: If there is no comparison then display '-' -->
<!-- TODO: If question didn't exist in previous years then let's add 'NA' with bg-gray-100 text-dark -->
<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>
</div>
</td>

{% for comparison in answer.comparisons %}
<td data-column="score" class="d-none d-md-table-cell score border-bottom">
<span>{{ comparison.score|format_mark }}/{{ comparison.max }}</span>
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
<!-- TODO: Change text-success to text-danger if comparison is negative -->
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
<!-- TODO: Change text-success to text-dark if there is no comparison -->
<!-- TODO: If there is no comparison then display '-' -->
<!-- TODO: If question didn't exist in previous years then let's add 'NA' with bg-gray-100 text-dark -->
<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>
<div class="d-flex flex-row gap-3 justify-content-end align-items-center">
<p class="mb-0">
<span class="fs-5">{{ comparison.score|format_mark }} <span class="fs-7">out of </span> {{ comparison.max }}
</span>
</p>
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
<!-- TODO: Change text-success to text-danger if comparison is negative -->
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
<!-- TODO: Change text-success to text-dark if there is no comparison -->
<!-- TODO: If there is no comparison then display '-' -->
<!-- TODO: If question didn't exist in previous years then let's add 'NA' with bg-gray-100 text-dark -->
<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>
</div>
</td>
{% endfor %}

Expand Down Expand Up @@ -377,22 +387,22 @@ <h3 class="exclamation text-white">Visit us again on a bigger screen</h3>
</td>
<td class="score border-bottom border-opacity-25 border-primary is--section-score">
{{ plan_score.weighted_total|floatformat:0 }}%
<!-- TODO: Change bg-green-100 to bg-red-100 if variation is negative -->
<!-- TODO: Change text-success to text-danger if variation is negative -->
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no variation -->
<!-- TODO: Change text-success to text-dark if there is no variation -->
<!-- TODO: If there is no variation then display '-' -->
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
<!-- TODO: Change text-success to text-danger if comparison is negative -->
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
<!-- TODO: Change text-success to text-dark if there is no comparison -->
<!-- TODO: If there is no comparison then display '-' -->
<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>
</td>

{% for comparison in comparisons %}
<td class="d-none d-md-table-cell score border-bottom border-opacity-25 border-primary is--section-score">
{{ comparison.weighted_total|floatformat:0 }}%
<!-- TODO: Change bg-green-100 to bg-red-100 if variation is negative -->
<!-- TODO: Change text-success to text-danger if variation is negative -->
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no variation -->
<!-- TODO: Change text-success to text-dark if there is no variation -->
<!-- TODO: If there is no variation then display '-' -->
<!-- TODO: Change bg-green-100 to bg-red-100 if comparison is negative -->
<!-- TODO: Change text-success to text-danger if comparison is negative -->
<!-- TODO: Change bg-green-100 to bg-gray-100 if there is no comparison -->
<!-- TODO: Change text-success to text-dark if there is no comparison -->
<!-- TODO: If there is no comparison then display '-' -->
<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>
</td>
{% endfor %}
Expand Down

0 comments on commit 4a669ff

Please sign in to comment.