diff --git a/src/main/java/de/szimnau/zeitlaeufer/DrinkingBar.java b/src/main/java/de/szimnau/zeitlaeufer/DrinkingBar.java index 7020a75..98cbb40 100644 --- a/src/main/java/de/szimnau/zeitlaeufer/DrinkingBar.java +++ b/src/main/java/de/szimnau/zeitlaeufer/DrinkingBar.java @@ -21,7 +21,8 @@ public class DrinkingBar extends AbstractLoadingBar implements WorkdayLoadingBar private static final int MINS_PER_HALF_HOUR = CommonTools.MINS_PER_HOUR / 2; private static final int MINUTES_BEFORE_PAUSE = 4 * CommonTools.MINS_PER_HOUR + MINS_PER_HALF_HOUR; - private static final int MINUTES_WITH_PAUSE = 6 * CommonTools.MINS_PER_HOUR; + private static final int MAX_MINUTES_WITHOUT_PAUSE = 6 * CommonTools.MINS_PER_HOUR; + private static final int MAX_MINUTES_WITH_PAUSE = 6 * CommonTools.MINS_PER_HOUR; private static final int DEFAULT_TOTAL_TIME = 8 * CommonTools.MINS_PER_HOUR + MINS_PER_HALF_HOUR; private static final BigDecimal DEFAULT_TOTAL_TIME_BD = BigDecimal.valueOf(DEFAULT_TOTAL_TIME); private static final BigDecimal DEFAULT_TOTAL_LITRES = BigDecimal.valueOf(2.0); @@ -65,7 +66,10 @@ public class DrinkingBar extends AbstractLoadingBar implements WorkdayLoadingBar @Override protected String fillLoadingBar(long passedMinutes, boolean progressive) { long effectivePassedMinutes = passedMinutes < 0 ? 0 : passedMinutes; - if (getTotalMinutes() > MINUTES_WITH_PAUSE && passedMinutes > MINUTES_BEFORE_PAUSE && passedMinutes <= MINUTES_WITH_PAUSE) { + /* the pause in counting up passed minutes could be more precise. + there IS a way to find out how LONG the lunch break was (known until WorkdayLoadingBar.realInitZapfenstreich), + but NOT the exact time slot from when to when the lunch break did take place... */ + if (getTotalMinutes() > MAX_MINUTES_WITHOUT_PAUSE && passedMinutes > MINUTES_BEFORE_PAUSE && passedMinutes <= MAX_MINUTES_WITH_PAUSE) { effectivePassedMinutes = MINUTES_BEFORE_PAUSE; } var effectivePassedMinutesBD = BigDecimal.valueOf(effectivePassedMinutes);