Skip to content

fix: last_month et last_month_last_year valent 0 le 1er du mois (Refs #640) #641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Marlboro62 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: last_month et last_month_last_year valent 0 le 1er du mois (Refs #640) #641

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/models/stat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,12 +456,11 @@ def current_week_last_year(self):

def last_month(self):
now_date = datetime.now(timezone.utc)
yesterday_date = datetime.combine(now_date - relativedelta(days=1), datetime.max.time())
begin = datetime.combine(
(now_date.replace(day=1) - timedelta(days=1)).replace(day=1),
datetime.min.time(),
)
end = datetime.combine(yesterday_date.replace(day=1) - timedelta(days=1), datetime.max.time())
end = datetime.combine(now_date.replace(day=1) - timedelta(days=1), datetime.max.time())
for day in self.db.get_daily_range(self.usage_point_id, begin, end, self.measurement_direction):
self.value_last_month = self.value_last_month + day.value
logging.debug(f" last_month => {self.value_last_month}")
Expand Down Expand Up @@ -509,12 +508,11 @@ def current_month_evolution(self):

def last_month_last_year(self):
now_date = datetime.now(timezone.utc)
yesterday_date = datetime.combine(now_date - relativedelta(days=1), datetime.max.time())
begin = datetime.combine(
(now_date.replace(day=1) - timedelta(days=1)).replace(day=1),
datetime.min.time(),
) - relativedelta(years=1)
end = datetime.combine(yesterday_date.replace(day=1) - timedelta(days=1), datetime.max.time()) - relativedelta(
end = datetime.combine(now_date.replace(day=1) - timedelta(days=1), datetime.max.time()) - relativedelta(
years=1
)
for day in self.db.get_daily_range(self.usage_point_id, begin, end, self.measurement_direction):
Expand Down