From 26d3c6abdbcbeb74e7d8bcd667630fbd47fb7365 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 20 Aug 2025 14:22:26 +0200 Subject: ... --- overlays/worktime/worktime/__main__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'overlays') diff --git a/overlays/worktime/worktime/__main__.py b/overlays/worktime/worktime/__main__.py index b0ac57e1..e4daf6d9 100755 --- a/overlays/worktime/worktime/__main__.py +++ b/overlays/worktime/worktime/__main__.py @@ -493,7 +493,7 @@ class Worktime(object): 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 +572,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 +641,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}" -- cgit v1.2.3