From 52c15abd5a4f86fd5483dd94efd9829cfeefe42f Mon Sep 17 00:00:00 2001
From: Benjamin <Benjamin@MBP-de-Benj.(none)>
Date: Thu, 7 Sep 2017 13:25:34 +0200
Subject: [PATCH] table graph
---
static/src/css/lefilament_tdb.css | 3 ++-
static/src/js/dashboard_year.js | 2 ++
static/src/xml/lefilament_tdb.xml | 8 ++++++++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/static/src/css/lefilament_tdb.css b/static/src/css/lefilament_tdb.css
index acee192..b43d277 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 5172589..8c32ccb 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 7c55845..2944aaf 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>
--
GitLab