diff --git a/analytics/site/conversionadmin.py b/analytics/site/conversionadmin.py index 8b47dee4..60e93b79 100644 --- a/analytics/site/conversionadmin.py +++ b/analytics/site/conversionadmin.py @@ -2,12 +2,14 @@ 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 class ConversionStatAdmin(BaseRequestStatAdmin): + change_list_template = 'analytics/conversion_summary_change_list.html' page_title = _("Conversion of requests into successful deals (for the last 365 days)") # -- custom methods -- # @@ -53,7 +55,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 +98,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/conversion_summary_change_list.html b/analytics/templates/analytics/conversion_summary_change_list.html new file mode 100644 index 00000000..88752a0f --- /dev/null +++ b/analytics/templates/analytics/conversion_summary_change_list.html @@ -0,0 +1,12 @@ +{% extends "admin/change_list.html" %} +{% load i18n %} +{% block content_title %} +

{{ page_title }}

+{% endblock %} +{% block result_list %} +
+ {% include "analytics/data_table.html" %} + {% include "analytics/bar_chart.html" %} +
+{% endblock %} +{% block pagination %}{% endblock %}