From 4a52d6d6506dfad49c0c19c00bea4721e6bf89e3 Mon Sep 17 00:00:00 2001
From: Benjamin <benjamin@le-filament.com>
Date: Thu, 27 May 2021 18:04:27 +0200
Subject: [PATCH] [fix] timedelta & read_group errors
---
.gitignore | 3 +++
models/enercoop_operation.py | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..75bb204
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.*
+*.pyc
+!.gitignore
diff --git a/models/enercoop_operation.py b/models/enercoop_operation.py
index 7dfbc80..f34b3a7 100644
--- a/models/enercoop_operation.py
+++ b/models/enercoop_operation.py
@@ -169,7 +169,7 @@ class EnercoopOperation(models.Model):
scale = 'day'
return scale
else:
- delta = date_end - date_start
+ delta = (date_end - date_start).days
if delta <= 7:
scale = 'week'
elif delta <= 31:
@@ -410,7 +410,7 @@ class EnercoopOperation(models.Model):
[('enercoop_operation_id', 'in', self.ids),
('date_slot', '>=', date_start),
('date_slot', '<', date_end)],
- ['power', 'enercoop_operation_id', 'date_slot', 'year'],
+ ['power', 'enercoop_operation_id', 'date_slot'],
['comp_data_type', type_date], orderby='comp_data_type, date_slot ASC', lazy=False)
# Get the date for the abscissa axis
@@ -610,4 +610,4 @@ class EnercoopOperation(models.Model):
'scale': scale
})
- return result_graph
\ No newline at end of file
+ return result_graph
--
GitLab