Skip to content
Extraits de code Groupes Projets
Valider 22d85330 rédigé par Juliana's avatar Juliana
Parcourir les fichiers

[ADD]Change allocons -> cons

parent 8b0c01d4
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -221,8 +221,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)) -
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 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
......@@ -276,8 +275,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)) -
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 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
......@@ -434,8 +432,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)) -
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 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
......@@ -500,8 +497,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)) -
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 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
......@@ -552,7 +548,7 @@ class AccOperation(models.Model):
'labels': chart_data['label'],
'datasets': [
{
'label': 'Allo Conso',
'label': 'Conso',
'data': chart_data['allocons'],
'backgroundColor': 'rgba(57, 120, 187, 0.2)',
'borderColor': 'rgba(57, 120, 187, 1)',
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter