diff --git a/models/enercoop_operation.py b/models/enercoop_operation.py index f30efefe445723b75334568eb8133643f4731feb..da9fd094543af813c4e105fe6bf54553e2062c5f 100644 --- a/models/enercoop_operation.py +++ b/models/enercoop_operation.py @@ -60,7 +60,7 @@ class EnercoopOperation(models.Model): date_start, date_end = operation_ids.get_last_day(scale) # Get the data to display in chart - chart_data = operation_ids.get_cdc(scale, date_start, date_end, 19) + chart_data = operation_ids.get_cdc(type=scale, date_start=date_start, date_end=date_end) # Build the chart depending on data calculated result_graph = operation_ids.chart_data_cons(chart_data) @@ -372,7 +372,7 @@ class EnercoopOperation(models.Model): } return result - def get_cdc(self, type, date_start, date_end, prm_id): + def get_cdc(self, type, date_start, date_end, prm_id=None): """ Fonction permettant de récupérer les données pour la construction des chart pour une ou des opérations données @@ -417,7 +417,9 @@ class EnercoopOperation(models.Model): if type == 'week': type_date = 'date_slot:hour' - enercoop_counter_id = self.env['enercoop.counter'].browse(prm_id) + enercoop_counter_id = self.env['enercoop.counter'] + if prm_id: + enercoop_counter_id = self.env['enercoop.counter'].browse(prm_id) if enercoop_counter_id: # Get all data group by curves type and date