replace zip_choices with strict zip

e-valuation · Nov 6, 2023 · e7cb10f · e7cb10f
1 parent e7d7d9b
commit e7cb10f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/evap/evaluation/models.py b/evap/evaluation/models.py
@@ -1245,6 +1245,9 @@ class Choices(NamedTuple):
     names: list[StrOrPromise]
     is_inverted: bool
 
+    def as_name_color_value_tuples(self):
+        return zip(self.names, self.colors, self.values, strict=True)
+
 
 class BipolarChoices(NamedTuple):
     css_class: str
@@ -1256,6 +1259,9 @@ class BipolarChoices(NamedTuple):
     minus_name: StrOrPromise
     is_inverted: bool
 
+    def as_name_color_value_tuples(self):
+        return zip(self.names, self.colors, self.values, strict=True)
+
 
 NO_ANSWER = 6
 BASE_UNIPOLAR_CHOICES = {

diff --git a/evap/evaluation/templatetags/evaluation_filters.py b/evap/evaluation/templatetags/evaluation_filters.py
@@ -79,11 +79,6 @@ def _zip(a, b):
     return zip(a, b)
 
 
-@register.filter()
-def zip_choices(counts, choices):
-    return zip(counts, choices.names, choices.colors, choices.values)
-
-
 @register.filter
 def ordering_index(evaluation):
     if evaluation.state < Evaluation.State.IN_EVALUATION:

diff --git a/evap/results/templates/result_widget_tooltip.html b/evap/results/templates/result_widget_tooltip.html
@@ -13,7 +13,7 @@
     {% endif %}
     {% with question_result.question.is_bipolar_likert_question as is_bipolar %}
         <p>
-            {% for count, name, color, value in question_result.counts|zip_choices:question_result.choices %}
+            {% for count, name, color, value in question_result.zipped_choices %}
                 <span class='vote-text-{{ color }} fas fa-fw-absolute
                     {% if is_bipolar and value < 0 %}fa-caret-down pole-icon
                     {% elif is_bipolar and value > 0 %}fa-caret-up pole-icon

diff --git a/evap/results/tools.py b/evap/results/tools.py
@@ -48,10 +48,12 @@ def __init__(self, question, answer_counters, additional_text_result=None):
         self.additional_text_result = additional_text_result
 
         if answer_counters is not None:
-            counts = OrderedDict((value, 0) for value in self.choices.values if value != NO_ANSWER)
+            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] = answer_counter.count
-            self.counts = tuple(counts.values())
+                counts[answer_counter.answer][0] = answer_counter.count
+            self.zipped_choices = tuple(counts.values())
+            self.counts = tuple((count for count, _, _, _ in counts.values()))
         else:
             self.counts = None