From 0b4b1549049838e3dc0b9e5d04ccaa0d83041a86 Mon Sep 17 00:00:00 2001
From: Juliana <juliana@le-filament.com>
Date: Tue, 20 Sep 2022 15:36:08 +0200
Subject: [PATCH] [UPD]Delete data type complement
---
models/acc_operation.py | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/models/acc_operation.py b/models/acc_operation.py
index 07971ca..a6cdabd 100644
--- a/models/acc_operation.py
+++ b/models/acc_operation.py
@@ -262,9 +262,8 @@ class AccOperation(models.Model):
(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,
(SUM( (CASE
WHEN comp_data_type = 'cons' THEN A.power
ELSE 0 END) )/2) / 1000 as cons
@@ -337,9 +336,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 = '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
@@ -539,9 +537,8 @@ class AccOperation(models.Model):
(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))
@@ -614,9 +611,8 @@ class AccOperation(models.Model):
(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))
--
GitLab