zip QuestionResults colors

evap/evaluation/templatetags/evaluation_filters.py

@@ -5,6 +5,7 @@
 from django.utils.translation import gettext_lazy as _
 
 from evap.evaluation.models import BASE_UNIPOLAR_CHOICES, Contribution, Evaluation
+from evap.results.tools import RatingResult
 from evap.rewards.tools import can_reward_points_be_used_by
 from evap.student.forms import HeadingField
 
@@ -76,7 +77,7 @@
 
 @register.filter(name="zip")
 def _zip(a, b):
-    return zip(a, b)
+    return zip(a, b, strict=True)
 
 
 @register.filter
@@ -110,12 +111,12 @@ def percentage_one_decimal(fraction, population):
 
 
 @register.filter
-def to_colors(choices):
-    if not choices:
+def to_colors(question_result: RatingResult | None):
+    if not question_result:
         # When displaying the course distribution, there are no associated voting choices.
         # In that case, we just use the colors of a unipolar scale.
-        return BASE_UNIPOLAR_CHOICES["colors"]
-    return choices.colors
+        return BASE_UNIPOLAR_CHOICES["colors"][:-1]
+    return question_result.colors
 
 
 @register.filter

evap/results/templates/distribution_with_grade.html

@@ -5,7 +5,7 @@
     <div class="distribution-bar {{ question_result.choices.css_class }}"
         {% if question_result.question.is_bipolar_likert_question %} style="left: {{ question_result.minus_balance_count|percentage_one_decimal:question_result.count_sum }}"{% endif %}
     >
-        {% with colors=question_result.choices|to_colors %}
+        {% with colors=question_result|to_colors %}
             {% for value, color in distribution|zip:colors %}
                 {% if value != 0 %}
                     <div class="vote-bg-{{ color }}" style="width: {{ value|percentage_one_decimal:1 }};">&nbsp;</div>

evap/results/tools.py

@@ -51,11 +51,12 @@ def __init__(self, question, answer_counters, additional_text_result=None) -> No
         self.additional_text_result = additional_text_result
         self.counts = None
         self.zipped_choices = None
+        counts = OrderedDict(
+            (value, [0, name, color, value]) for (name, color, value) in self.choices.as_name_color_value_tuples()
+        )
+        counts.pop(NO_ANSWER)
+        self.colors = tuple((color for _, _, color, _ in counts.values()))
         if answer_counters is not None:
-            counts = OrderedDict(
-                (value, [0, name, color, value]) for (name, color, value) in self.choices.as_name_color_value_tuples()
-            )
-            counts.pop(NO_ANSWER)
             for answer_counter in answer_counters:
                 counts[answer_counter.answer][0] = answer_counter.count
             self.zipped_choices = list(counts.values())