summaryrefslogtreecommitdiff
path: root/overlays
diff options
context:
space:
mode:
Diffstat (limited to 'overlays')
-rwxr-xr-xoverlays/worktime/worktime/__main__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/overlays/worktime/worktime/__main__.py b/overlays/worktime/worktime/__main__.py
index ef5a7a38..16769953 100755
--- a/overlays/worktime/worktime/__main__.py
+++ b/overlays/worktime/worktime/__main__.py
@@ -542,7 +542,7 @@ def worktime(pull_forward_cutoff, waybar, **args):
542 542
543 return difference_string 543 return difference_string
544 544
545 difference = worktime.time_to_work - worktime.time_worked 545 difference = worktime.time_to_work - worktime.time_worked + sum(worktime.pull_forward.values(), start=timedelta(milliseconds=0))
546 total_minutes_difference = 5 * ceil(difference / timedelta(minutes = 5)) 546 total_minutes_difference = 5 * ceil(difference / timedelta(minutes = 5))
547 547
548 if worktime.running_entry and abs(difference) < timedelta(days = 1) and (total_minutes_difference > 0 or abs(worktime.running_entry) >= abs(difference)) : 548 if worktime.running_entry and abs(difference) < timedelta(days = 1) and (total_minutes_difference > 0 or abs(worktime.running_entry) >= abs(difference)) :
@@ -578,6 +578,7 @@ def worktime(pull_forward_cutoff, waybar, **args):
578 worktime_no_pulled_forward = deepcopy(worktime) 578 worktime_no_pulled_forward = deepcopy(worktime)
579 worktime_no_pulled_forward.time_to_work -= worktime_no_pulled_forward.time_pulled_forward 579 worktime_no_pulled_forward.time_to_work -= worktime_no_pulled_forward.time_pulled_forward
580 worktime_no_pulled_forward.time_pulled_forward = timedelta() 580 worktime_no_pulled_forward.time_pulled_forward = timedelta()
581 worktime_no_pulled_forward.pull_forward = dict()
581 582
582 difference_string = format_worktime(worktime) 583 difference_string = format_worktime(worktime)
583 difference_string_no_pulled_forward = format_worktime(worktime_no_pulled_forward) 584 difference_string_no_pulled_forward = format_worktime(worktime_no_pulled_forward)