diff --git a/models/acc_operation.py b/models/acc_operation.py index e2abd8dbb20d415a3ad808c0dc9f7a32e0a4a778..698756f2c30fad072bd2fcde828dc2f103443df1 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -242,7 +242,7 @@ 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 = 'cons' THEN A.power ELSE 0 END) )/2) / 1000 as allocons + (SUM( (CASE WHEN comp_data_type = 'complement' 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 @@ -305,7 +305,7 @@ 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 = 'cons' THEN A.power ELSE 0 END) )/2) / 1000 as allocons + (SUM( (CASE WHEN comp_data_type = 'complement' 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 @@ -485,7 +485,7 @@ 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 = 'cons' THEN A.power ELSE 0 END) )/2) / 1000 as allocons, + (SUM( (CASE WHEN comp_data_type = 'complement' 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 @@ -550,7 +550,7 @@ 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 = 'cons' THEN A.power ELSE 0 END) )/2) / 1000 as allocons, + (SUM( (CASE WHEN comp_data_type = 'complement' 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 @@ -601,7 +601,7 @@ class AccOperation(models.Model): "labels": chart_data["label"], "datasets": [ { - "label": "Conso", + "label": "AlloConso", "data": chart_data["allocons"], "backgroundColor": "rgba(57, 120, 187, 0.2)", "borderColor": "rgba(57, 120, 187, 1)",