From 9068febd302f3f2bf7d0f3a3f73f7b8e405eeb5f Mon Sep 17 00:00:00 2001 From: Sokurov Idar Date: Thu, 11 Mar 2021 19:55:09 +0300 Subject: [PATCH] bugfix --- main/extra_func.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main/extra_func.py b/main/extra_func.py index bb7b084..b76eb55 100644 --- a/main/extra_func.py +++ b/main/extra_func.py @@ -185,7 +185,7 @@ def daterange(start_date, end_date) -> list: return dates -def get_timedelta(log,time=None) -> timedelta: +def get_timedelta(log, time=None) -> timedelta: """ Возвращает объект класса timedelta, который хранит промежуток времени от начала суток до момента, который находится в log (объект класса RoleChangeLogs) или в time(datetime.time), если введён @@ -350,9 +350,10 @@ class StatisticData: self.statistic[first_log.change_time.date()] += get_timedelta(first_log).total_seconds() if last_log.new_role == ROLES['engineer']: - self.fill_daterange(last_log.change_time.date() + timedelta(days=1), self.end_date) - self.statistic[self.end_date + timedelta(days=1)] = get_timedelta(None,datetime.now().time()).total_seconds() + self.fill_daterange(last_log.change_time.date() + timedelta(days=1), self.end_date + timedelta(days=1)) self.statistic[last_log.change_time.date()] += (timedelta(days=1) - get_timedelta(last_log)).total_seconds() + if self.end_date == datetime.now().date(): + self.statistic[self.end_date] = get_timedelta(None, datetime.now().time()).total_seconds() for log_index in range(len(self.data) - 1): if self.data[log_index].new_role == ROLES['engineer']: