diff --git a/static/src/css/lefilament_tdb.css b/static/src/css/lefilament_tdb.css index acee192b1907db8c9878d5f5e2d6362b07925387..b43d277a9b679a03794080c205a5620d2683938c 100644 --- a/static/src/css/lefilament_tdb.css +++ b/static/src/css/lefilament_tdb.css @@ -59,4 +59,5 @@ p.card-maj { margin: 0px; font-size: 10px; font-style: italic; font-weight: /*Legend*/ .table-legend { width: 100%; max-width: 100%; margin: 10px 0; border-collapse: separate; border-spacing: 8px; font-size: 11px; } -.table-legend .nb { text-align: right; } \ No newline at end of file +.table-legend .nb { text-align: right; } +.table-legend-total { border-top: 1px solid #aaa; font-weight: 700; } \ No newline at end of file diff --git a/static/src/js/dashboard_year.js b/static/src/js/dashboard_year.js index 51725893709f46aaa4cdf0fce9c5ac28feffa591..8c32ccb13d4bdf441179c07e1eadcd3955ac1db3 100644 --- a/static/src/js/dashboard_year.js +++ b/static/src/js/dashboard_year.js @@ -54,6 +54,8 @@ odoo.define('lefilament_tdb.dashboard_year', function (require) { self.ppipe2_win = (self.values.pipe_win); self.ppipe2_to_win = (self.values.pipe_to_win); self.ptarg2 = self.values.target -self.pfact2-self.pcomm2-self.ppipe2_to_win-self.ppipe2_win; + self.total2 = self.pfact2 + self.pcomm2 + self.ppipe2_win + self.total = self.pfact + self.pcomm + self.ppipe_win deferred.resolve(); }); return jQuery.when(this._super.apply(this, arguments),deferred); diff --git a/static/src/xml/lefilament_tdb.xml b/static/src/xml/lefilament_tdb.xml index 7c55845e8365802e88f7a547dfde19df2a524879..2944aaf158ebce8d6df4016852f20c3846dc7ad2 100644 --- a/static/src/xml/lefilament_tdb.xml +++ b/static/src/xml/lefilament_tdb.xml @@ -151,6 +151,14 @@ <td class="nb"><t t-esc="widget.render_percent(widget.ppipe_win)"></t></td> <td class="nb"><t t-esc="widget.render_keur(widget.ppipe2_win)"></t></td> </tr> + <tr class="table-legend-total"> + <td style="width: 20px;"></td> + <td>Total</td> + <td class="nb"><t t-esc="widget.render_percent(widget.total)"></t></td> + <td class="nb"><t t-esc="widget.render_keur(widget.total2)"></t></td> + </tr> + </table> + <table> <tr> <td style="background-color: #F6ACA2; width: 20px;"></td> <td>Pipe</td>