Adjusting YES/NO metrics

WikiMovimentoBrasil · Oct 20, 2023 · c39b2d0 · c39b2d0
1 parent 6effd6e
commit c39b2d0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/metrics/templates/metrics/list_metrics_per_project.html b/metrics/templates/metrics/list_metrics_per_project.html
@@ -48,8 +48,8 @@ <h2 id="{{ project_key }}">{{ project_value.project }}</h2>
                                 <tr>
                                     <th scope="row">{{ metric_key }}</th>
                                     <td>{{ metric_value.title }}<br><small>({% translate numeric_key %})</small></td>
-                                    <td>{{ numeric_value.done }}</td>
-                                    <td>{{ numeric_value.goal }}</td>
+                                    <td>{{ numeric_value.done|bool_yesno }}</td>
+                                    <td>{{ numeric_value.goal|bool_yesno }}</td>
                                     <td>
                                         <button type="button" class="btn-round btn-{{ numeric_value.done|categorize:numeric_value.goal }}">
                                             {{ numeric_value.done|perc:numeric_value.goal }}

diff --git a/metrics/templatetags/metricstags.py b/metrics/templatetags/metricstags.py
@@ -1,4 +1,6 @@
 from django import template
+from django.utils.translation import gettext_lazy as _
+
 register = template.Library()
 
 
@@ -16,3 +18,11 @@ def perc(a, b):
         return "{:.0f}%".format(100*a/b, 1)
     except:
         return "-"
+
+
+@register.filter
+def bool_yesno(a):
+    if type(a) == bool:
+        return _("Yes") if a else _("No")
+    else:
+        return a
diff --git a/metrics/views.py b/metrics/views.py
@@ -95,7 +95,7 @@ def get_metrics_and_aggregate_per_project():
                     "Number of partnerships": metric.number_of_partnerships,
                     "Number of organizers": metric.number_of_organizers,
                     "Number of people reached through social media": metric.number_of_people_reached_through_social_media,
-                    "Is complete": metric.boolean_type,
+                    "Occurence": metric.boolean_type,
                 }
                 done = {
                     "Wikipedia": reports.aggregate(total=Sum(F("wikipedia_created") + F("wikipedia_edited")))["total"] or 0,
@@ -121,7 +121,7 @@ def get_metrics_and_aggregate_per_project():
                     "Number of partnerships": Partner.objects.filter(partners__in=reports).distinct().count() or 0,
                     "Number of organizers": Organizer.objects.filter(organizers__in=reports).distinct().count() or 0,
                     "Number of people reached through social media": reports.aggregate(total=Sum(F("number_of_people_reached_through_social_media")))["total"] or 0,
-                    "Is complete": reports.filter(metrics_related__boolean_type=True).exists() or False,
+                    "Occurence": reports.filter(metrics_related__boolean_type=True).exists() or False,
                 }
 
                 result_metrics = {key: {"goal": value, "done": done[key]} for key, value in goal.items() if value != 0}