From 218ac55d86ee49d151c0ba2dfbca6da104c66703 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 25 Aug 2025 14:19:52 +0200 Subject: ... --- overlays/worktime/worktime/__main__.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'overlays/worktime') diff --git a/overlays/worktime/worktime/__main__.py b/overlays/worktime/worktime/__main__.py index 3e7aeb9f..016690f0 100755 --- a/overlays/worktime/worktime/__main__.py +++ b/overlays/worktime/worktime/__main__.py @@ -375,10 +375,7 @@ class Worktime(object): parse_datestr(stripped_line) for day in [fromDay + timedelta(days = x) for x in range(0, (toDay - fromDay).days + 1)]: - # if self.end_date.date() < day or day < self.start_date.date(): - # continue - - if self.would_be_workday(day): + if self.would_be_workday(day) and self.start_date.date() <= day and day <= self.end_date.date(): if excused_kind == 'leave': self.leave_days.add(day) elif time is not None and time >= self.time_per_day(day): @@ -444,8 +441,9 @@ class Worktime(object): if e.errno != 2: raise e - for year in range(self.end_date.year + 1, max(self.pull_forward.keys()).year + 1): - holidays |= {k: v * timedelta(hours = hours_per_week(k)) / len(self.workdays) for k, v in Worktime.holidays(year).items()} + if self.pull_forward: + for year in range(self.end_date.year + 1, max(self.pull_forward.keys()).year + 1): + holidays |= {k: v * timedelta(hours = hours_per_week(k)) / len(self.workdays) for k, v in Worktime.holidays(year).items()} self.days_to_work = dict() -- cgit v1.2.3