really make pivotable target id a parameter

Author: digitalfox

templates/billing/client_billing_control_pivotable.html

@@ -28,7 +28,7 @@ <h2 class="mt-2">{% trans "Client billing control pivot table" %}</h2>
 
 <div id="pivotable-output" style="margin-top: 10px;"></div>
 
-{% with output as "pivotable-output" %}
+{% with output="pivotable-output" %}
     {% include "core/_pivotable_body.html" %}
 {% endwith %}
 

templates/billing/payment_delay.html

@@ -29,7 +29,7 @@ <h2 class="mt-2">{% trans "Client billing creation and payment delay for last 24
 
 <div id="pivotable-output" style="margin-top: 10px;"></div>
 
-{% with output as "pivotable-output" %}
+{% with output="pivotable-output" %}
     {% include "core/_pivotable_body.html" %}
 {% endwith %}
 

templates/core/_pivotable_body.html

@@ -8,7 +8,7 @@
  function drawPivot(data, rows, cols, rendererName, aggregatorName, vals, options) {
      var renderers = $.extend($.pivotUtilities.renderers, $.pivotUtilities.plotly_renderers, $.pivotUtilities.export_renderers);
      if (typeof options == "undefined") { var options = {}; }
-     $("#pivotable-output").pivotUI(
+     $("#{{ output|default_if_none:'pivotable-output' }}").pivotUI(
          data,
          {
              rows: rows,

templates/core/risks.html

@@ -20,7 +20,7 @@ <h2 class="mt-2">{% trans "Risks synthesis " %}</h2>
 
         <div id="pivotable-output" style="margin-top: 10px;"></div>
 
-        {% with output as "pivotable-output" %}
+        {% with output="pivotable-output" %}
             {% include "core/_pivotable_body.html" %}
         {% endwith %}
 

templates/crm/_clientcompany_rates_margin.html

@@ -74,9 +74,11 @@ <h2 class="mt-4">{% trans "Rates per consultant" %}</h2>
             <button class="btn btn-primary active" onclick="graph_per_consultant();">{% trans "Daily rate graph" %}</button>
         </div>
 
-        <div id="pivotable-output" style="margin-top: 10px;"></div>
+        <div class="row my-2">
+            <div id="rate-pivotable-output"></div>
+        </div>
 
-        {% with output as "pivotable-output" %}
+        {% with output="rate-pivotable-output" %}
             {% include "core/_pivotable_body.html" %}
         {% endwith %}
 

templates/crm/company_pivotable.html

@@ -17,7 +17,7 @@ <h2 class="mt-2">{% trans "Pivot table for company " %} {{ company }}</h2>
                 <div id="pivotable-output"></div>
             </div>
         </div>
-        {% with output as "pivotable-output" %}
+        {% with output="pivotable-output" %}
             {% include "core/_pivotable_body.html" %}
         {% endwith %}
 

templates/leads/lead_pivotable.html

@@ -15,7 +15,7 @@ <h2 class="mt-2">{% trans "Pivot table for lead " %} {{ lead }}</h2>
 
         <div id="pivotable-output" style="margin-top: 10px;"></div>
 
-        {% with output as "pivotable-output" %}
+        {% with output="pivotable-output" %}
             {% include "core/_pivotable_body.html" %}
         {% endwith %}
 

templates/leads/leads_pivotable.html

@@ -31,7 +31,7 @@ <h2>{% trans "Leads pivot table" %}</h2>
 
         <div id="pivotable-output" class="mt-2"></div>
 
-        {% with output as "pivotable-output" %}
+        {% with output="pivotable-output" %}
             {% include "core/_pivotable_body.html" %}
         {% endwith %}
 

templates/staffing/lunch_tickets_pivotable.html

@@ -24,7 +24,7 @@ <h2>{% trans "Lunch tickets pivot table" %}</h2>
 
         <div id="pivotable-output" style="margin-top: 10px;"></div>
 
-        {% with output as "pivotable-output" %}
+        {% with output="pivotable-output" %}
             {% include "core/_pivotable_body.html" %}
         {% endwith %}
 

templates/staffing/missions_report.html

@@ -44,7 +44,7 @@ <h2>{% trans "Non productive missions pivot table" %}</h2>
 
         <div id="pivotable-output" style="margin-top: 10px;"></div>
 
-        {% with output as "pivotable-output" %}
+        {% with output="pivotable-output" %}
             {% include "core/_pivotable_body.html" %}
         {% endwith %}