diff --git a/models/acc_enedis_cdc.py b/models/acc_enedis_cdc.py index 69892181edd19a44948103176c4a70b8db45a31b..da0aa8092f22c73554ca112c3324c6f19c33817f 100644 --- a/models/acc_enedis_cdc.py +++ b/models/acc_enedis_cdc.py @@ -391,12 +391,12 @@ class AccEnedisCdc(models.Model): divider = get_divider_from_row(row) label.append(row[0]) - data_cons.append({"x": row[0], "y": round(row[1] / divider, 2)}) - data_autocons.append({"x": row[0], "y": round(row[2] / divider, 2)}) + data_cons.append({"x": row[0], "y": row[1] / divider}) + data_autocons.append({"x": row[0], "y": row[2] / divider}) data_allocons.append( - {"x": row[0], "y": round((row[1] - row[2]) / divider, 2)} + {"x": row[0], "y": (row[1] - row[2]) / divider} ) - data_prod.append({"x": row[0], "y": round(row[3] / divider, 2)}) + data_prod.append({"x": row[0], "y": row[3] / divider}) cdc_cons = { "label": label, @@ -449,8 +449,8 @@ class AccEnedisCdc(models.Model): raw_data = self.env.cr.fetchall() for row in raw_data: divider = get_divider_from_row(row) - data_autocons_histo.append(round(row[1]/divider, 2)) - data_allocons_histo.append(round(row[2]/divider, 2)) + data_autocons_histo.append(row[1]/divider) + data_allocons_histo.append(row[2]/divider) label_histo.append(row[0]) cdc_cons = { diff --git a/static/src/js/operation_chart.js b/static/src/js/operation_chart.js index bd87a82193444bd498973fcd28c3017053208e80..5b5eeac10de66979cb00efe6b449fd84d89b2a3c 100644 --- a/static/src/js/operation_chart.js +++ b/static/src/js/operation_chart.js @@ -363,6 +363,18 @@ odoo.define("oacc_portal_overview_cdc.operation_chart", function (require) { sum_res2 += item; } }); + /* + autocons, allocons, cons, prod + - sert à construire bar et pie + - sur 2 mois on a 2 éléments donc regroupé par mois + - sert à construire la courbe + - par 7 jours on a regroupé par heure 7x24 + - par mois on a regroupé par heure 30x24 + autocons_histo, allocons_histo + - sert à construire bar et pie + - par 7 jours, regroupé par jour + - par mois, regroupé par jour + */ res = [Math.floor(sum_res1), Math.floor(sum_res2)]; data = { labels: ["AutoConso", "AlloConso"], diff --git a/templates/operation_templates_page.xml b/templates/operation_templates_page.xml index 56eb09f75021e3c8ee2fa74fc821f3ec107e003b..ea1dc85609f3528c93526a7d8a02909e3c88e2f0 100644 --- a/templates/operation_templates_page.xml +++ b/templates/operation_templates_page.xml @@ -192,7 +192,7 @@ class="col-2 col-xl-1 align-self-center mt-4 mt-lg-0" t-if="partners" > - PRM ou contact + Participant ou compteur </div> <div class="col-10 col-xl-5 align-self-center mt-4 mt-lg-0"