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

Change search function curve

parent 524b3e47
Branches
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Afficher les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 11 ajouts et 11 suppressions
models/enercoop_operation.py
+ 11
− 11
Voir le fichier @ 67be6bf3
......@@ -425,7 +425,7 @@ class EnercoopOperation(models.Model):
# Get all data group by curves type and date
cdc_ids = self.env['enercoop.enedis.cdc'].sudo().read_group(
[('enercoop_operation_id', 'in', self.ids),
('date_slot', '>=', date_start),
('date_slot', '>', date_start),
('date_slot', '<', date_end),
'|', ('enercoop_counter_id', '=', False), ('enercoop_counter_id', '=', enercoop_counter_id.id)
],
......@@ -435,7 +435,7 @@ class EnercoopOperation(models.Model):
if type == 'week':
cdc_histo_ids = self.env['enercoop.enedis.cdc'].sudo().read_group(
[('enercoop_operation_id', 'in', self.ids),
('date_slot', '>=', date_start),
('date_slot', '>', date_start),
('date_slot', '<', date_end),
'|', ('enercoop_counter_id', '=', False), ('enercoop_counter_id', '=', enercoop_counter_id.id)
],
......@@ -445,7 +445,7 @@ class EnercoopOperation(models.Model):
# Get the date for the abscissa axis
cdc_date_ids = self.env['enercoop.enedis.cdc'].sudo().read_group(
[('enercoop_operation_id', 'in', self.ids),
('date_slot', '>=', date_start),
('date_slot', '>', date_start),
('date_slot', '<', date_end),
'|', ('enercoop_counter_id', '=', False), ('enercoop_counter_id', '=', enercoop_counter_id.id)
],
......@@ -456,7 +456,7 @@ class EnercoopOperation(models.Model):
if type == 'day':
cdc_date_histo_ids = self.env['enercoop.enedis.cdc'].sudo().read_group(
[('enercoop_operation_id', 'in', self.ids),
('date_slot', '>=', date_start),
('date_slot', '>', date_start),
('date_slot', '<', date_end),
'|', ('enercoop_counter_id', '=', False), ('enercoop_counter_id', '=', enercoop_counter_id.id)
],
......@@ -475,7 +475,7 @@ class EnercoopOperation(models.Model):
if type == 'week':
cdc_histo_ids = self.env['enercoop.enedis.cdc'].sudo().read_group(
[('enercoop_operation_id', 'in', self.ids),
('date_slot', '>=', date_start),
('date_slot', '>', date_start),
('date_slot', '<', date_end)
],
['power', 'enercoop_operation_id', 'date_slot'],
......@@ -484,7 +484,7 @@ class EnercoopOperation(models.Model):
# Get the date for the abscissa axis
cdc_date_ids = self.env['enercoop.enedis.cdc'].sudo().read_group(
[('enercoop_operation_id', 'in', self.ids),
('date_slot', '>=', date_start),
('date_slot', '>', date_start),
('date_slot', '<', date_end),
],
['enercoop_operation_id', 'date_slot'],
......@@ -494,7 +494,7 @@ class EnercoopOperation(models.Model):
if type == 'day':
cdc_date_histo_ids = self.env['enercoop.enedis.cdc'].sudo().read_group(
[('enercoop_operation_id', 'in', self.ids),
('date_slot', '>=', date_start),
('date_slot', '>', date_start),
('date_slot', '<', date_end),
],
['enercoop_operation_id', 'date_slot'],
......@@ -559,7 +559,7 @@ class EnercoopOperation(models.Model):
AND A.enercoop_operation_id IN %s
AND ( A.enercoop_counter_id = %s
OR A.enercoop_counter_id = NULL )
AND A.date_slot >= %s
AND A.date_slot > %s
AND A.date_slot < %s
GROUP BY A.comp_data_type, A.date_slot
ORDER BY A.comp_data_type, A.date_slot ASC;
......@@ -577,7 +577,7 @@ class EnercoopOperation(models.Model):
JOIN enercoop_operation E ON E.id = A.enercoop_operation_id
WHERE A.enercoop_operation_id IS NOT NULL
AND A.enercoop_operation_id IN %s
AND A.date_slot >= %s
AND A.date_slot > %s
AND A.date_slot < %s
GROUP BY A.comp_data_type, A.date_slot
ORDER BY A.comp_data_type, A.date_slot ASC;
......@@ -604,7 +604,7 @@ class EnercoopOperation(models.Model):
if enercoop_counter_id:
bilan_cdc = self.env['enercoop.enedis.cdc'].sudo().read_group(
[('enercoop_operation_id', 'in', self.ids),
('date_slot', '>=', date_start),
('date_slot', '>', date_start),
('date_slot', '<', date_end),
'|', ('enercoop_counter_id', '=', False), ('enercoop_counter_id', '=', enercoop_counter_id.id)],
['power', 'enercoop_operation_id'],
......@@ -612,7 +612,7 @@ class EnercoopOperation(models.Model):
else:
bilan_cdc = self.env['enercoop.enedis.cdc'].sudo().read_group(
[('enercoop_operation_id', 'in', self.ids),
('date_slot', '>=', date_start),
('date_slot', '>', date_start),
('date_slot', '<', date_end)],
['power', 'enercoop_operation_id'],
['comp_data_type'], orderby='comp_data_type', lazy=False)
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter