diff --git a/models/acc_operation.py b/models/acc_operation.py index 39356ab1269a6daf56864553b0d0697153f5c9e2..5bd35b6739ac82342210aef96285aed09d44beb1 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -51,8 +51,8 @@ class AccOperation(models.Model): + self._from_clause() + self._where_clause( self.id, - self._convert_time(start_date), - self._convert_time(end_date_month), + start_date, + end_date_month, ) + self._group_clause("month") + self._order_clause() @@ -251,7 +251,7 @@ class AccOperation(models.Model): "autoprod", ): result += f""" - AND (cdc.comp_data_type = {extra_curve_type} + AND (cdc.comp_data_type = '{extra_curve_type}' OR cdc.acc_counter_id = {prm_id}) """ else: @@ -259,7 +259,7 @@ class AccOperation(models.Model): AND cdc.acc_counter_id = {prm_id} """ if partner_id and isinstance(partner_id, int): - result += f" AND cdc.partner_id = {partner_id}" + result += f" AND cdc.partner_id = {partner_id} " return result def _group_clause(self, date_slot): @@ -495,27 +495,25 @@ class AccOperation(models.Model): display_hourly_curves, step_curve, step_display_curve = self.get_step_from_date( start_date=start_date, end_date=end_date ) - start_datetime = self._convert_time(start_date) - end_datetime = self._convert_time(end_date) chart_data = {} if data_type == "cons" or data_type == "pmo": chart_data_cons = self.get_cdc_by_query_cons( - step_curve, start_datetime, end_datetime, prm_id, partner_id + step_curve, start_date, end_date, prm_id, partner_id ) if display_hourly_curves: chart_data_histo = self.get_cdc_by_query_daily_histo_cons( - start_datetime, end_datetime, prm_id, partner_id + start_date, end_date, prm_id, partner_id ) chart_data_cons.update(chart_data_histo) chart_data.update(chart_data_cons) if data_type == "prod" or data_type == "pmo": chart_data_prod = self.get_cdc_by_query_prod( - step_curve, start_datetime, end_datetime, prm_id, partner_id + step_curve, start_date, end_date, prm_id, partner_id ) if display_hourly_curves: chart_data_histo = self.get_cdc_by_query_daily_histo_prod( - start_datetime, end_datetime, prm_id, partner_id + start_date, end_date, prm_id, partner_id ) chart_data_prod.update(chart_data_histo) chart_data.update(chart_data_prod)