From 62c7372201ffdec418cc2a1b96abf5bd12758c99 Mon Sep 17 00:00:00 2001
From: Juliana <juliana@le-filament.com>
Date: Thu, 20 Jan 2022 17:33:54 +0100
Subject: [PATCH] [FIX]Error display alloconso
---
models/acc_operation.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/models/acc_operation.py b/models/acc_operation.py
index 0d9533d..0633eb3 100644
--- a/models/acc_operation.py
+++ b/models/acc_operation.py
@@ -221,7 +221,8 @@ class AccOperation(models.Model):
date_trunc(%s, A.date_slot) AS date_slot,
(SUM( (CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END) )/2) / 1000 as autocons,
(SUM( (CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END) )/2) / 1000 as prod,
- (SUM( (CASE WHEN comp_data_type = 'complement' THEN A.power ELSE 0 END) )/2) / 1000 as allocons
+ ((SUM( (CASE WHEN comp_data_type = 'cons' THEN A.power ELSE 0 END)) -
+ SUM(CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END) ) / 2) / 1000 as allocons
FROM acc_enedis_cdc A
JOIN acc_operation E ON E.id = A.acc_operation_id
WHERE A.acc_operation_id IS NOT NULL
@@ -275,7 +276,8 @@ class AccOperation(models.Model):
SELECT
date_trunc(%s, A.date_slot) AS date_slot,
(SUM( (CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END) )/2) / 1000 as autocons,
- (SUM( (CASE WHEN comp_data_type = 'complement' THEN A.power ELSE 0 END) )/2) / 1000 as allocons
+ ((SUM( (CASE WHEN comp_data_type = 'cons' THEN A.power ELSE 0 END)) -
+ SUM(CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END) ) / 2) / 1000 as allocons
FROM acc_enedis_cdc A
JOIN acc_operation E ON E.id = A.acc_operation_id
WHERE A.acc_operation_id IS NOT NULL
@@ -432,7 +434,8 @@ class AccOperation(models.Model):
(SUM((CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons,
(SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END)) / 2) / 1000 as prod_s,
(SUM( (CASE WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END) )/2) / 1000 as surplus,
- (SUM((CASE WHEN comp_data_type = 'complement' THEN A.power ELSE 0 END)) / 2) / 1000 as allocons,
+ ((SUM( (CASE WHEN comp_data_type = 'cons' THEN A.power ELSE 0 END)) -
+ SUM(CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END) ) / 2) / 1000 as allocons,
((SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END)) - SUM(CASE
WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons_prod
FROM acc_enedis_cdc A
@@ -497,7 +500,8 @@ class AccOperation(models.Model):
date_trunc(%s, A.date_slot) AS date_slot,
(SUM((CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons,
(SUM( (CASE WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END) )/2) / 1000 as surplus,
- (SUM((CASE WHEN comp_data_type = 'complement' THEN A.power ELSE 0 END)) / 2) / 1000 as allocons,
+ ((SUM( (CASE WHEN comp_data_type = 'cons' THEN A.power ELSE 0 END)) -
+ SUM(CASE WHEN comp_data_type = 'autocons' THEN A.power ELSE 0 END) ) / 2) / 1000 as allocons,
((SUM((CASE WHEN comp_data_type = 'prod' THEN A.power ELSE 0 END)) - SUM(CASE
WHEN comp_data_type = 'surplus' THEN A.power ELSE 0 END)) / 2) / 1000 as autocons_prod
FROM acc_enedis_cdc A
--
GitLab