summaryrefslogtreecommitdiff
path: root/overlays/worktime
diff options
context:
space:
mode:
Diffstat (limited to 'overlays/worktime')
-rwxr-xr-xoverlays/worktime/worktime/__main__.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/overlays/worktime/worktime/__main__.py b/overlays/worktime/worktime/__main__.py
index 16769953..d458ffdb 100755
--- a/overlays/worktime/worktime/__main__.py
+++ b/overlays/worktime/worktime/__main__.py
@@ -644,14 +644,17 @@ def time_worked(now, waybar, **args):
644 644
645 clockout_time, exact_clockout_time, clockout_difference = round_clockout_time(difference) 645 clockout_time, exact_clockout_time, clockout_difference = round_clockout_time(difference)
646 clockout_time_pull_forward, exact_clockout_time_pull_forward, clockout_difference_pull_forward = round_clockout_time(difference_pull_forward) 646 clockout_time_pull_forward, exact_clockout_time_pull_forward, clockout_difference_pull_forward = round_clockout_time(difference_pull_forward)
647 clockout_pull_forward_sum = now.now + now.time_to_work - now.time_worked + sum(now.pull_forward.values(), start=timedelta(milliseconds=0))
648
647 if now.running_entry and clockout_time and (clockout_difference >= 0 or clockout_difference_pull_forward >= 0): 649 if now.running_entry and clockout_time and (clockout_difference >= 0 or clockout_difference_pull_forward >= 0):
648 out_text = f"{difference_string}/{clockout_time:%H:%M}" 650 out_text = f"{difference_string}/{clockout_time:%H:%M}"
649 tooltip = f"{tooltip_timedelta(worked)}/{exact_clockout_time:%H:%M:%S}" 651 tooltip = f"{tooltip_timedelta(worked)}/{exact_clockout_time:%H:%M:%S}"
650 652
651 if clockout_time_pull_forward != clockout_time: 653 if clockout_pull_forward_sum > exact_clockout_time_pull_forward:
652 out_text += f"…{clockout_time_pull_forward:%H:%M}" 654 if clockout_time_pull_forward != clockout_time:
653 if exact_clockout_time_pull_forward != exact_clockout_time: 655 out_text += f"…{clockout_time_pull_forward:%H:%M}"
654 tooltip += f"…{exact_clockout_time_pull_forward:%H:%M:%S}" 656 if exact_clockout_time_pull_forward != exact_clockout_time:
657 tooltip += f"…{exact_clockout_time_pull_forward:%H:%M:%S}"
655 else: 658 else:
656 out_text = difference_string 659 out_text = difference_string
657 else: 660 else: