diff --git a/models/acc_operation.py b/models/acc_operation.py index 07971ca5da300b3af3bb87b7ab854caf69777642..a6cdabd81122f926d9e476ed320981a47a1d64a4 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))