From b1a1d651ab682546ca2ce0aabc977b13a8e48293 Mon Sep 17 00:00:00 2001
From: Juliana <juliana@le-filament.com>
Date: Mon, 7 Mar 2022 17:50:52 +0100
Subject: [PATCH] [FIX]Bug on sum values
---
models/acc_operation.py | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/models/acc_operation.py b/models/acc_operation.py
index b729f1c..e2abd8d 100644
--- a/models/acc_operation.py
+++ b/models/acc_operation.py
@@ -764,21 +764,21 @@ class AccOperation(models.Model):
result = {}
if scale == "hour":
- sum_res1 = sum(int(item["y"]) for item in chart_data["autocons"])
- sum_res2 = sum(int(item["y"]) for item in chart_data["allocons"])
+ sum_res1 = sum(item["y"] for item in chart_data["autocons"])
+ sum_res2 = sum(item["y"] for item in chart_data["allocons"])
else:
sum_res1 = sum(chart_data["autocons"])
sum_res2 = sum(chart_data["allocons"])
if sum_res1 == 0:
label = ["Alloconso"]
- res = [sum_res2]
+ res = [int(sum_res2)]
elif sum_res2 == 0:
label = ["Autoconso"]
- res = [sum_res1]
+ res = [int(sum_res1)]
else:
label = ["Autoconso", "Alloconso"]
- res = [sum_res1, sum_res2]
+ res = [int(sum_res1), int(sum_res2)]
result["donuts_chart_conso"] = {
"type": "doughnut",
@@ -905,21 +905,21 @@ class AccOperation(models.Model):
result = {}
if scale == "hour":
- sum_res1 = sum(int(item["y"]) for item in chart_data["autocons_prod"])
- sum_res2 = sum(int(item["y"]) for item in chart_data["surplus"])
+ sum_res1 = sum(item["y"] for item in chart_data["autocons_prod"])
+ sum_res2 = sum(item["y"] for item in chart_data["surplus"])
else:
sum_res1 = sum(chart_data["autocons_prod"])
sum_res2 = sum(chart_data["surplus"])
if sum_res1 == 0:
label = ["Surplus"]
- res = [sum_res2]
+ res = [int(sum_res2)]
elif sum_res2 == 0:
label = ["AutoProd"]
- res = [sum_res1]
+ res = [int(sum_res1)]
else:
label = ["AutoProd", "Surplus"]
- res = [sum_res1, sum_res2]
+ res = [int(sum_res1), int(sum_res2)]
result["donuts_chart_prod"] = {
"type": "doughnut",
--
GitLab