diff --git a/scoring/templates/scoring/council.html b/scoring/templates/scoring/council.html index b5967e05..e4138237 100644 --- a/scoring/templates/scoring/council.html +++ b/scoring/templates/scoring/council.html @@ -230,23 +230,25 @@

Visit us again on a bigger screen

Questions - {{ council.name }} + {{ council.name }} {% for comparison in comparisons %} - {{ comparison.council.name }} + {{ comparison.council.name }} {% endfor %} Councils with full marks per question - - 2025 - 2023 Variation + + 2025 + 2023 + 2023 Variation {% for comparison in comparisons %} - 2025 - Variation 2023 + 2025 + 2023 + 2023 Variation {% endfor %} - + @@ -283,10 +285,12 @@

Visit us again on a bigger screen

{% if section.top_performer %} - + {% include 'caps/icons/scorecards-star.html' with classes='text-info align-text-bottom me-1' width='1.2em' height='1.2rem' role='presentation' %} {{ section.weighted_score|floatformat:0 }}% + {% comment %} TODO: Include previous scorecards score(2023) {% endcomment %} + {{ section.weighted_score|floatformat:0 }}% {% comment %} TODO: Change bg-green-100 to bg-red-100 if comparison is negative {% endcomment %} {% comment %} TODO: Change text-success to text-danger if comparison is negative {% endcomment %} @@ -294,13 +298,15 @@

Visit us again on a bigger screen

{% comment %} TODO: Change bg-green-100 to bg-gray-100 if there is no comparison {% endcomment %} {% comment %} TODO: Change text-success to text-dark if there is no comparison {% endcomment %} {% comment %} TODO: If there is no comparison then display '-' {% endcomment %} - ↑ 5% + ↑ 5% {% else %} + {% comment %} TODO: Include previous scorecards score(2023) {% endcomment %} {{section.weighted_score|floatformat:0 }}% - + {{ section.weighted_score|floatformat:0 }}% + {% comment %} TODO: Change bg-green-100 to bg-red-100 if comparison is negative {% endcomment %} {% comment %} TODO: Change text-success to text-danger if comparison is negative {% endcomment %} {% comment %} TODO: Change ↑ to ↓ if comparison is negative {% endcomment %} @@ -315,7 +321,9 @@

Visit us again on a bigger screen

{{ comparison.weighted_score|floatformat:0 }}% - + {% comment %} TODO: Include previous scorecards score(2023) {% endcomment %} + {{ section.weighted_score|floatformat:0 }}% + {% comment %} TODO: Change bg-green-100 to bg-red-100 if comparison is negative {% endcomment %} {% comment %} TODO: Change text-success to text-danger if comparison is negative {% endcomment %} {% comment %} TODO: Change ↑ to ↓ if comparison is negative {% endcomment %} @@ -342,10 +350,17 @@

Visit us again on a bigger screen

- {{ answer.score|format_mark }} out of {{ answer.max }} + {{ answer.score|format_mark }} out of {{ answer.max }} + + {{ answer.score|format_mark }}/{{ answer.max }} + + {% comment %} TODO: Include previous scorecards score(2023) {% endcomment %} + + {{ answer.score|format_mark }} out of {{ answer.max }} + {{ answer.score|format_mark }}/{{ answer.max }} - + {% comment %} TODO: Change bg-green-100 to bg-red-100 if comparison is negative {% endcomment %} {% comment %} TODO: Change text-success to text-danger if comparison is negative {% endcomment %} {% comment %} TODO: Change ↑ to ↓ if comparison is negative {% endcomment %} @@ -358,9 +373,14 @@

Visit us again on a bigger screen

{% for comparison in answer.comparisons %} - {{ comparison.score|format_mark }} out of {{ comparison.max }} + {{ comparison.score|format_mark }} out of {{ comparison.max }} - + {% comment %} TODO: Include previous scorecards score(2023) {% endcomment %} + + {{ comparison.score|format_mark }} out of {{ comparison.max }} + + + {% comment %} TODO: Change bg-green-100 to bg-red-100 if comparison is negative {% endcomment %} {% comment %} TODO: Change text-success to text-danger if comparison is negative {% endcomment %} {% comment %} TODO: Change ↑ to ↓ if comparison is negative {% endcomment %} @@ -373,7 +393,7 @@

Visit us again on a bigger screen

{% endfor %} -
+
{% widthratio answer.council_count council_count 100%}% @@ -402,10 +422,12 @@

Visit us again on a bigger screen

{{ plan_score.weighted_total|floatformat:0 }}% - - - + {% comment %} TODO: Include previous scorecards score(2023) {% endcomment %} + + {{ plan_score.weighted_total|floatformat:0 }}% + + {% comment %} TODO: Change bg-green-100 to bg-red-100 if comparison is negative {% endcomment %} {% comment %} TODO: Change text-success to text-danger if comparison is negative {% endcomment %} {% comment %} TODO: Change ↑ to ↓ if comparison is negative {% endcomment %} @@ -419,7 +441,11 @@

Visit us again on a bigger screen

{{ comparison.weighted_total|floatformat:0 }}% - + {% comment %} TODO: Include previous scorecards score(2023) {% endcomment %} + + {{ comparison.weighted_total|floatformat:0 }}% + + {% comment %} TODO: Change bg-green-100 to bg-red-100 if comparison is negative {% endcomment %} {% comment %} TODO: Change text-success to text-danger if comparison is negative {% endcomment %} {% comment %} TODO: Change ↑ to ↓ if comparison is negative {% endcomment %} @@ -428,6 +454,7 @@

Visit us again on a bigger screen

{% comment %} TODO: If there is no comparison then display '-' {% endcomment %} ↑ 5% + {% endfor %}