Statistics: format boolean and null values for modalities

1 files changed, 11 insertions, 3 deletions

diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index 5b32a5fce..000b17a33 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -1205,6 +1205,14 @@ def _get_data_from_query_old(items, query_table_cols, request,
     return datas
 
 
+def _format_modality(value):
+    if value is None:
+        value = str(_("Unknown"))
+    if isinstance(value, bool):
+        value = str(_(str(value)))
+    return value
+
+
 def _get_json_stats(items, stats_sum_variable, stats_modality_1,
                     stats_modality_2):
     if stats_modality_2:
@@ -1219,17 +1227,17 @@ def _get_json_stats(items, stats_sum_variable, stats_modality_1,
     if stats_modality_2 and stats_modality_2 != stats_modality_1:
         q = q.order_by(stats_modality_1, stats_modality_2)
         for values in q.all():
-            modality_1 = values[stats_modality_1]
+            modality_1 = _format_modality(values[stats_modality_1])
             if not data or data[-1][0] != modality_1:
                 data.append([modality_1, []])
             data[-1][1].append(
-                (values[stats_modality_2], values["sum"])
+                (_format_modality(values[stats_modality_2]), values["sum"])
             )
     else:
         q = q.order_by(stats_modality_1)
         for values in q.all():
             modality_1 = values[stats_modality_1]
-            data.append([modality_1, values["sum"]])
+            data.append([_format_modality(modality_1), values["sum"]])
     data = json.dumps({"data": data})
     return HttpResponse(data, content_type='application/json')