From 83f6f26765124d4b52fe5a4e2bbe97f4158b26eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiberiu=20Sab=C4=83u?= Date: Fri, 5 Dec 2025 20:29:56 +0100 Subject: [PATCH 1/5] redesign conversion summary report --- analytics/site/conversionadmin.py | 5 +++-- analytics/templates/analytics/summary_change_list.html | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/analytics/site/conversionadmin.py b/analytics/site/conversionadmin.py index 8b47dee4..1a0528f9 100644 --- a/analytics/site/conversionadmin.py +++ b/analytics/site/conversionadmin.py @@ -4,6 +4,7 @@ from django.utils.translation import gettext_lazy as _ from analytics.site.requeststatadmin import BaseRequestStatAdmin +from django.utils.safestring import mark_safe from analytics.utils.helpers import get_values_over_time @@ -53,7 +54,7 @@ def create_context_data(self, request: WSGIRequest, total_won_deals, 'receipt_date' ) - title = _('Conversion') + f' ({conversion} %)' + title = mark_safe(_('Conversion') + f' ({conversion} %)

' + _('Total requests') + f' = {total_requests_count}') conversion_over_time = list(map( lambda x, y: { @@ -93,7 +94,7 @@ 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} %)

" + _('Total primary requests') + f" = {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" %}
From f55c23e42780210db7068ad5b73cdcee4da92418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiberiu=20Sab=C4=83u?= <96194994+tibisabau@users.noreply.github.com> Date: Fri, 5 Dec 2025 20:47:42 +0100 Subject: [PATCH 2/5] Update analytics/site/conversionadmin.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- analytics/site/conversionadmin.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/analytics/site/conversionadmin.py b/analytics/site/conversionadmin.py index 1a0528f9..06de8c6b 100644 --- a/analytics/site/conversionadmin.py +++ b/analytics/site/conversionadmin.py @@ -54,7 +54,10 @@ def create_context_data(self, request: WSGIRequest, total_won_deals, 'receipt_date' ) - title = mark_safe(_('Conversion') + f' ({conversion} %)

' + _('Total requests') + f' = {total_requests_count}') + title = mark_safe( + f"{_('Conversion')} ({conversion} %)

" + f"{_('Total requests')} = {total_requests_count}" + ) conversion_over_time = list(map( lambda x, y: { From 41799f4de080cdb09cd4ae64ed1c5f3ea96de673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiberiu=20Sab=C4=83u?= <96194994+tibisabau@users.noreply.github.com> Date: Fri, 5 Dec 2025 20:48:34 +0100 Subject: [PATCH 3/5] Update analytics/site/conversionadmin.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- analytics/site/conversionadmin.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/analytics/site/conversionadmin.py b/analytics/site/conversionadmin.py index 06de8c6b..dba2dd1b 100644 --- a/analytics/site/conversionadmin.py +++ b/analytics/site/conversionadmin.py @@ -97,7 +97,10 @@ def create_context_data(self, request: WSGIRequest, ) self.add_chart_data( response, - mark_safe(f"{conversion_of_primary_requests_str} ({primary_conversion} %)

" + _('Total primary requests') + f" = {primary_requests_count}"), + mark_safe( + f"{conversion_of_primary_requests_str} ({primary_conversion} %)

" + f"{_('Total primary requests')} = {primary_requests_count}" + ), primary_conversion_over_time, max_value2 ) From 7936a32dda1fd668a7917cc2bc502c095e083bea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiberiu=20Sab=C4=83u?= <96194994+tibisabau@users.noreply.github.com> Date: Fri, 5 Dec 2025 20:48:47 +0100 Subject: [PATCH 4/5] Update analytics/site/conversionadmin.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- analytics/site/conversionadmin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analytics/site/conversionadmin.py b/analytics/site/conversionadmin.py index dba2dd1b..e68bd4da 100644 --- a/analytics/site/conversionadmin.py +++ b/analytics/site/conversionadmin.py @@ -2,9 +2,9 @@ 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 django.utils.safestring import mark_safe from analytics.utils.helpers import get_values_over_time From 8383c82016cf412fd1e3d695c000b76ed2176ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiberiu=20Sab=C4=83u?= Date: Tue, 9 Dec 2025 10:32:58 +0100 Subject: [PATCH 5/5] create new template and restore original template --- analytics/site/conversionadmin.py | 1 + .../analytics/conversion_summary_change_list.html | 12 ++++++++++++ .../templates/analytics/summary_change_list.html | 3 +++ 3 files changed, 16 insertions(+) create mode 100644 analytics/templates/analytics/conversion_summary_change_list.html diff --git a/analytics/site/conversionadmin.py b/analytics/site/conversionadmin.py index e68bd4da..60e93b79 100644 --- a/analytics/site/conversionadmin.py +++ b/analytics/site/conversionadmin.py @@ -9,6 +9,7 @@ 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 -- # 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 %} diff --git a/analytics/templates/analytics/summary_change_list.html b/analytics/templates/analytics/summary_change_list.html index 98930475..0b2ff305 100644 --- a/analytics/templates/analytics/summary_change_list.html +++ b/analytics/templates/analytics/summary_change_list.html @@ -5,6 +5,9 @@

{{ 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" %}