diff --git a/models/acc_operation.py b/models/acc_operation.py index 527e7d06ceeefdd47fcf9035c8cc5227d5677719..9891964dad0ee5abd849cc0ee7353108e2fb28b0 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -1184,12 +1184,18 @@ class AccOperation(models.Model): result_graph = {} if not date_start and not date_end: date_start, date_end = self.get_last_day(scale) + is_scale = True else: date_end = date_utils.end_of(date_end, 'day') + is_scale = False # Get the step to display curve in chart scale, step_courbe, step_display_courbe = self.get_step_from_date( date_start=date_start, date_end=date_end, scale=scale) + if scale == 'week' or scale == 'day': + is_curve_line = True + else: + is_curve_line = False # Get PRM ids if prm_id: @@ -1225,11 +1231,15 @@ class AccOperation(models.Model): date_min = self.get_first_day() date_min = date_min.strftime("%d/%m/%Y") + if not is_scale: + scale = False + result_graph.update({ 'date_start': date_start, 'date_end': date_end, 'date_min': date_min, 'date_max': date_max, - 'scale': scale + 'scale': scale, + 'is_curve_line': is_curve_line }) return result_graph