diff --git a/models/acc_operation.py b/models/acc_operation.py index cdeaa0b308984a669f47cfa660aaa1c31c7b4f35..616e5306af7c8f8f59b467ee0479c2ef6d933e0b 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -260,7 +260,10 @@ class AccOperation(models.Model): 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 + ELSE 0 END) )/2) / 1000 as allocons, + (SUM( (CASE + WHEN comp_data_type = 'cons' THEN A.power + ELSE 0 END) )/2) / 1000 as cons FROM acc_enedis_cdc A JOIN @@ -289,11 +292,13 @@ class AccOperation(models.Model): data_autocons.append(int(row[1])) data_prod.append(int(row[2])) data_allocons.append(int(row[3])) + data_cons.append(int(row[4])) label.append(row[0]) else: data_autocons.append({"x": row[0], "y": round(row[1], 2)}) data_prod.append({"x": row[0], "y": round(row[2], 2)}) data_allocons.append({"x": row[0], "y": round(row[3], 2)}) + data_cons.append({"x": row[0], "y": round(row[4], 2)}) label.append(row[0]) cdc_jour = { @@ -538,7 +543,10 @@ class AccOperation(models.Model): ELSE 0 END)) - SUM(CASE WHEN comp_data_type = 'surplus' THEN A.power - ELSE 0 END)) / 2) / 1000 as autocons_prod + ELSE 0 END)) / 2) / 1000 as autocons_prod, + (SUM( (CASE + WHEN comp_data_type = 'cons' THEN A.power + ELSE 0 END) )/2) / 1000 as cons, FROM acc_enedis_cdc A JOIN acc_operation E ON E.id = A.acc_operation_id WHERE A.acc_operation_id IS NOT NULL @@ -559,6 +567,7 @@ class AccOperation(models.Model): data_surplus.append(int(row[4])) data_allocons.append(int(row[5])) data_autocons_prod.append(int(row[6])) + data_cons.append(int(row[7])) label.append(row[0]) else: data_cons.append({"x": row[0], "y": round(row[1], 2)}) @@ -567,6 +576,7 @@ class AccOperation(models.Model): data_surplus.append({"x": row[0], "y": round(row[4], 2)}) data_allocons.append({"x": row[0], "y": round(row[5], 2)}) data_autocons_prod.append({"x": row[0], "y": round(row[6], 2)}) + data_cons.append({"x": row[0], "y": round(row[7], 2)}) label.append(row[0]) cdc_jour = { @@ -665,8 +675,8 @@ class AccOperation(models.Model): "labels": chart_data["label"], "datasets": [ { - "label": "AlloConso", - "data": chart_data["allocons"], + "label": "Conso", + "data": chart_data["cons"], "backgroundColor": "rgba(57, 120, 187, 0.2)", "borderColor": "rgba(57, 120, 187, 1)", "borderWidth": 1,