From 2ad00cf318305c83d1ac013f177458439d4bf9b3 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 21 Feb 2025 10:43:00 +0100 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 7de0ff75..cca5ab5a 100755 --- a/overlays/worktime/worktime/__main__.py +++ b/overlays/worktime/worktime/__main__.py @@ -644,15 +644,15 @@ 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 = now.now + now.time_to_work - 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}" tooltip = f"{tooltip_timedelta(worked)}/{exact_clockout_time:%H:%M:%S}" - if round_clockout_time(clockout_pull_forward_sum) >= clockout_time_pull_forward and clockout_time_pull_forward != clockout_time: + if clockout_pull_forward_sum >= clockout_time_pull_forward and clockout_time_pull_forward != clockout_time: out_text += f"…{clockout_time_pull_forward:%H:%M}" - if clockout_pull_forward_sum >= exact_clockout_time_pull_forward and exact_clockout_time_pull_forward != exact_clockout_time: + if exact_clockout_pull_forward_sum >= exact_clockout_time_pull_forward and exact_clockout_time_pull_forward != exact_clockout_time: tooltip += f"…{exact_clockout_time_pull_forward:%H:%M:%S}" else: out_text = difference_string -- cgit v1.2.3