diff --git a/analytics/site/conversionadmin.py b/analytics/site/conversionadmin.py index 8b47dee4..e68bd4da 100644 --- a/analytics/site/conversionadmin.py +++ b/analytics/site/conversionadmin.py @@ -2,6 +2,7 @@ from django.db.models.query import QuerySet from django.template.response import TemplateResponse from django.utils.translation import gettext_lazy as _ +from django.utils.safestring import mark_safe from analytics.site.requeststatadmin import BaseRequestStatAdmin from analytics.utils.helpers import get_values_over_time @@ -53,7 +54,10 @@ def create_context_data(self, request: WSGIRequest, total_won_deals, 'receipt_date' ) - title = _('Conversion') + f' ({conversion} %)' + title = mark_safe( + f"{_('Conversion')} ({conversion} %)

" + f"{_('Total requests')} = {total_requests_count}" + ) conversion_over_time = list(map( lambda x, y: { @@ -93,7 +97,10 @@ def create_context_data(self, request: WSGIRequest, ) self.add_chart_data( response, - f"{conversion_of_primary_requests_str} ({primary_conversion} %)", + mark_safe( + f"{conversion_of_primary_requests_str} ({primary_conversion} %)

" + f"{_('Total primary requests')} = {primary_requests_count}" + ), primary_conversion_over_time, max_value2 ) diff --git a/analytics/templates/analytics/summary_change_list.html b/analytics/templates/analytics/summary_change_list.html index 9c73ebd3..98930475 100644 --- a/analytics/templates/analytics/summary_change_list.html +++ b/analytics/templates/analytics/summary_change_list.html @@ -5,9 +5,6 @@

{{ page_title }}

{% endblock %} {% block result_list %}
- {% for n, v in summary.items %} -

{{ n }} = {{ v }}

- {% endfor %} {% include "analytics/data_table.html" %} {% include "analytics/bar_chart.html" %}