From bfce4e9eb0cb61949e1395300b386f75d456a48d Mon Sep 17 00:00:00 2001 From: Sebastien Renard Date: Thu, 27 Feb 2025 22:44:57 +0100 Subject: [PATCH] add subtotal renderer and make it default renderer for lead billing table --- templates/billing/_lead_billing.html | 3 ++- templates/core/_pivotable_body.html | 3 ++- templates/core/_pivotable_header.html | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/billing/_lead_billing.html b/templates/billing/_lead_billing.html index 270f47e8..8f786a83 100644 --- a/templates/billing/_lead_billing.html +++ b/templates/billing/_lead_billing.html @@ -19,7 +19,8 @@

{% trans "Client billing control" %}

$("#pivotable-output-{{ lead.id|unlocalize }}").pivot({{ data|safe }}, { rows: ["{% trans 'billing mode' %}", "{% trans 'mission' %}", "{% trans 'type' %}", "{% trans 'consultant' %}"], cols: ["{% trans 'month' %}"], - renderer: $.pivotUtilities.renderers.Table, + dataClass: $.pivotUtilities.SubtotalPivotData, + renderer: $.pivotUtilities.subtotal_renderers["Table With Subtotal"], sorters: {"type": $.pivotUtilities.sortAs(['{% trans "Done work" %}', '{% trans "Service bill" %}', '{% trans "Expense" %}', '{% trans "Expense bill" %}', ])}, aggregator: $.pivotUtilities.aggregators.Sum(["{% trans 'amount' %}"]) }, lang); diff --git a/templates/core/_pivotable_body.html b/templates/core/_pivotable_body.html index f80fd302..53403564 100644 --- a/templates/core/_pivotable_body.html +++ b/templates/core/_pivotable_body.html @@ -6,11 +6,12 @@ var lang = {% if LANGUAGE_CODE == "fr-fr" %}'fr'{% else %}'en'{% endif %}; function drawPivot(data, rows, cols, rendererName, aggregatorName, vals, options) { - var renderers = $.extend($.pivotUtilities.renderers, $.pivotUtilities.plotly_renderers, $.pivotUtilities.export_renderers); + var renderers = $.extend($.pivotUtilities.renderers, $.pivotUtilities.plotly_renderers, $.pivotUtilities.export_renderers, $.pivotUtilities.subtotal_renderers); if (typeof options == "undefined") { var options = {}; } $("#{{ output|default_if_none:'pivotable-output' }}").pivotUI( data, { + dataClass: $.pivotUtilities.SubtotalPivotData, rows: rows, cols: cols, renderers: renderers, diff --git a/templates/core/_pivotable_header.html b/templates/core/_pivotable_header.html index 71cf72b3..7a386326 100644 --- a/templates/core/_pivotable_header.html +++ b/templates/core/_pivotable_header.html @@ -14,6 +14,8 @@ + +