diff --git a/models/acc_operation.py b/models/acc_operation.py index 0d9533d1ec1076c550fd47a505ab92426aca3f90..0633eb3d25193d902933c6051a778c39daf4c7db 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