From a238e01bd3f953e0bb5ee1faa608a3b23fc9f043 Mon Sep 17 00:00:00 2001 From: Benjamin <Benjamin@MBP-de-Benj.(none)> Date: Thu, 7 Sep 2017 13:44:01 +0200 Subject: [PATCH] table graph --- static/src/css/lefilament_tdb.css | 2 +- static/src/js/dashboard_year.js | 2 +- static/src/xml/lefilament_tdb.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/static/src/css/lefilament_tdb.css b/static/src/css/lefilament_tdb.css index b43d277..35e4c6c 100644 --- a/static/src/css/lefilament_tdb.css +++ b/static/src/css/lefilament_tdb.css @@ -60,4 +60,4 @@ 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; } -.table-legend-total { border-top: 1px solid #aaa; font-weight: 700; } \ No newline at end of file +.table-legend-total td { border-top: 1px solid #eee; font-weight: 700; padding: 2px 0; } diff --git a/static/src/js/dashboard_year.js b/static/src/js/dashboard_year.js index 8c32ccb..9cc8877 100644 --- a/static/src/js/dashboard_year.js +++ b/static/src/js/dashboard_year.js @@ -54,7 +54,7 @@ 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.total2 = ((self.values.facture + self.values.commandes + self.values.pipe_win) / self.values.target * 100).toFixed(0); self.total = self.pfact + self.pcomm + self.ppipe_win deferred.resolve(); }); diff --git a/static/src/xml/lefilament_tdb.xml b/static/src/xml/lefilament_tdb.xml index 2944aaf..aacdb08 100644 --- a/static/src/xml/lefilament_tdb.xml +++ b/static/src/xml/lefilament_tdb.xml @@ -158,7 +158,7 @@ <td class="nb"><t t-esc="widget.render_keur(widget.total2)"></t></td> </tr> </table> - <table> + <table class="table-legend"> <tr> <td style="background-color: #F6ACA2; width: 20px;"></td> <td>Pipe</td> -- GitLab