From 8a4a12f0051b1e47040e930c05120e624c0e7108 Mon Sep 17 00:00:00 2001
From: Juliana <juliana@le-filament.com>
Date: Wed, 2 Jun 2021 14:30:54 +0200
Subject: [PATCH] [ADD] Add prm ID to function get cdc
---
models/enercoop_operation.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/models/enercoop_operation.py b/models/enercoop_operation.py
index f30efef..da9fd09 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
--
GitLab