1 files changed, 23 insertions, 7 deletions

diff --git a/overlays/worktime/worktime/__main__.py b/overlays/worktime/worktime/__main__.py
index b0ac57e1..3e7aeb9f 100755
--- a/overlays/worktime/worktime/__main__.py
+++ b/overlays/worktime/worktime/__main__.py
@@ -375,8 +375,8 @@ 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.end_date.date() < day or day < self.start_date.date():
+                              #     continue
 
                               if self.would_be_workday(day):
                                   if excused_kind == 'leave':
@@ -444,6 +444,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()}
+
       self.days_to_work = dict()
 
       # if self.pull_forward:
@@ -485,15 +488,28 @@ class Worktime(object):
                 day_time = max(timedelta(), self.time_per_day(extra_day) - self.extra_days_to_work[extra_day])
                 self.extra_days_to_work[extra_day] += extra_day_time * (day_time / extra_day_time_left)
 
-          hours_per_day_forward = time_forward / len(days_forward) if len(days_forward) > 0 else timedelta()
+          def days_count(days_forward):
+              r = 0
+              for day in sorted(days_forward):
+                  day_time = timedelta()
+                  if day in self.extra_days_to_work:
+                      day_time += self.extra_days_to_work
+                  if day in holidays and not day in self.extra_days_to_work:
+                      day_time -= holidays[day]
+                  if day.isoweekday() in self.workdays:
+                      day_time += timedelta(hours = hours_per_week(day)) / len(self.workdays)
+                  r += max(timedelta(), day_time) / (timedelta(hours = hours_per_week(day)) / len(self.workdays))
+              return r
+
+          hours_per_day_forward = time_forward / days_count(days_forward) if days_count(days_forward) > 0 else timedelta()
           days_forward.discard(self.end_date.date())
 
-          self.time_pulled_forward += time_forward - hours_per_day_forward * len(days_forward)
+          self.time_pulled_forward += time_forward - hours_per_day_forward * days_count(days_forward)
 
       if self.end_date.date() in self.extra_days_to_work:
           self.time_pulled_forward += self.extra_days_to_work[self.end_date.date()]
 
-      self.time_to_work += self.time_pulled_forward
+      # self.time_to_work += self.time_pulled_forward
 
       self.time_worked += api.get_billable_hours(self.start_date, self.now)
 
@@ -572,7 +588,7 @@ def worktime(pull_forward_cutoff, waybar, **args):
     pull_forward_sum = sum(worktime.pull_forward.values(), start=timedelta(milliseconds=0))
     if pull_forward_sum >= min(pull_forward_cutoff, timedelta(seconds = 1)):
         worktime_no_pulled_forward = deepcopy(worktime)
-        worktime_no_pulled_forward.time_to_work -= worktime_no_pulled_forward.time_pulled_forward
+        # worktime_no_pulled_forward.time_to_work -= worktime_no_pulled_forward.time_pulled_forward
         worktime_no_pulled_forward.time_pulled_forward = timedelta()
         worktime_no_pulled_forward.pull_forward = dict()
         worktime.time_to_work += pull_forward_sum
@@ -641,7 +657,7 @@ def time_worked(now, waybar, **args):
 
         clockout_time, exact_clockout_time, clockout_difference = round_clockout_time(difference)
         clockout_time_pull_forward, exact_clockout_time_pull_forward, clockout_difference_pull_forward = round_clockout_time(difference_pull_forward)
-        clockout_pull_forward_sum, exact_clockout_pull_forward_sum, _ = round_clockout_time(now.time_to_work - now.time_pulled_forward - now.time_worked + sum(now.pull_forward.values(), start=timedelta(milliseconds=0)))
+        clockout_pull_forward_sum, exact_clockout_pull_forward_sum, _ = round_clockout_time(now.time_to_work - now.time_worked + sum(now.pull_forward.values(), start=timedelta(milliseconds=0)))
 
         if now.running_entry and clockout_time and (clockout_difference >= 0 or clockout_difference_pull_forward >= 0):
             out_text = f"{difference_string}/{clockout_time:%H:%M}"