From d9553ace7a500831f6e8a585680176c873003490 Mon Sep 17 00:00:00 2001 From: fabianArbeit Date: Wed, 6 Aug 2025 12:13:23 +0200 Subject: [PATCH] central evaluation of passed minutes --- .../main/java/de/szimnau/AbstractLoadingBar.java | 15 +++++++++++---- .../src/main/java/de/szimnau/LoadingBar.java | 7 ++++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/zeitlaeufer/src/main/java/de/szimnau/AbstractLoadingBar.java b/zeitlaeufer/src/main/java/de/szimnau/AbstractLoadingBar.java index fc34220..767419d 100644 --- a/zeitlaeufer/src/main/java/de/szimnau/AbstractLoadingBar.java +++ b/zeitlaeufer/src/main/java/de/szimnau/AbstractLoadingBar.java @@ -64,6 +64,16 @@ public abstract class AbstractLoadingBar { } + protected long getPassedMinutes() { + return getPassedMinutes(false); + } + + + protected long getPassedMinutes(boolean passedMinutesZero) { + return passedMinutesZero ? 0 : startTime.until(LocalTime.now().truncatedTo(ChronoUnit.MINUTES), ChronoUnit.MINUTES); + } + + protected void showLoadingBar() { showLoadingBar(false, false, 0); } @@ -90,10 +100,7 @@ public abstract class AbstractLoadingBar { private void showLoadingBar(boolean debug, boolean passedMinutesZero, long millisWaiting) { - long passedMinutes = startTime.until(LocalTime.now().truncatedTo(ChronoUnit.MINUTES), ChronoUnit.MINUTES); - if (debug && passedMinutesZero) { - passedMinutes = 0; - } + long passedMinutes = getPassedMinutes(debug && passedMinutesZero); if (passedMinutes > totalMinutes) { passedMinutes = totalMinutes; } else if (passedMinutes < 0) { diff --git a/zeitlaeufer/src/main/java/de/szimnau/LoadingBar.java b/zeitlaeufer/src/main/java/de/szimnau/LoadingBar.java index 8b75aa0..b2f7939 100644 --- a/zeitlaeufer/src/main/java/de/szimnau/LoadingBar.java +++ b/zeitlaeufer/src/main/java/de/szimnau/LoadingBar.java @@ -302,7 +302,12 @@ public class LoadingBar extends AbstractProgressBar { protected boolean hasMittagspauseArrived() { - return getStartTime().until(LocalTime.now(), ChronoUnit.MINUTES) < DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH; + return hasMittagspauseArrived(false); + } + + + protected boolean hasMittagspauseArrived(boolean debugWithPassedMinutesZero) { + return getPassedMinutes(debugWithPassedMinutesZero) < DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH; }