Compare commits

...

2 Commits

Author SHA1 Message Date
SZIMNAU
12c8898252 reverted 'verschlimmbesserung' trying to improve end time calculation 2026-01-06 15:57:41 +01:00
fszimnau
9e65158901 fixed method name 2026-01-06 08:26:55 +01:00
2 changed files with 7 additions and 7 deletions

View File

@@ -20,12 +20,12 @@ public interface WorkdayLoadingBar {
void showLoadingBar(boolean debug, boolean passedMinutesZero); void showLoadingBar(boolean debug, boolean passedMinutesZero);
default boolean canHaveHadNoMittagspauseYet() { default boolean couldHaveHadNoMittagspauseYet() {
return canHaveHadNoMittagspauseYet(false); return couldHaveHadNoMittagspauseYet(false);
} }
default boolean canHaveHadNoMittagspauseYet(boolean debugWithPassedMinutesZero) { default boolean couldHaveHadNoMittagspauseYet(boolean debugWithPassedMinutesZero) {
return getPassedMinutes(debugWithPassedMinutesZero) < DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH; return getPassedMinutes(debugWithPassedMinutesZero) < DEFAULT_NUMBER_WORK_MINS_BEFORE_LUNCH;
} }

View File

@@ -61,11 +61,11 @@ public class LoadingBarCliTools {
WorkdayLoadingBar lb = constructor.apply(startTime); WorkdayLoadingBar lb = constructor.apply(startTime);
boolean debug = false; boolean debug = false;
boolean passedMinutesZero = false; boolean passedMinutesZero = false;
if (lb.couldHaveHadNoMittagspauseYetYetYet(debug && passedMinutesZero)) { if (lb.couldHaveHadNoMittagspauseYet(debug && passedMinutesZero)) {
handleMittagspause(br, lb); handleMittagspause(br, lb);
lb.showLoadingBar(debug, passedMinutesZero); lb.showLoadingBar(debug, passedMinutesZero);
} }
handleZapfenstreich(br, lb, passedMinutesZero); handleZapfenstreich(br, lb);
lb.showLoadingBar(debug, passedMinutesZero); lb.showLoadingBar(debug, passedMinutesZero);
} }
@@ -89,14 +89,14 @@ public class LoadingBarCliTools {
} }
private static void handleZapfenstreich(BufferedReader br, WorkdayLoadingBar lb, boolean passedMinutesZero) throws IOException { private static void handleZapfenstreich(BufferedReader br, WorkdayLoadingBar lb) throws IOException {
print("Mittagspause hat gedauert (optional): "); print("Mittagspause hat gedauert (optional): ");
String mittagspauseDurationRaw = br.readLine(); String mittagspauseDurationRaw = br.readLine();
Integer mittagspauseDuration = null; Integer mittagspauseDuration = null;
if (mittagspauseDurationRaw != null && !mittagspauseDurationRaw.isBlank()) { if (mittagspauseDurationRaw != null && !mittagspauseDurationRaw.isBlank()) {
mittagspauseDuration = Integer.valueOf(mittagspauseDurationRaw); mittagspauseDuration = Integer.valueOf(mittagspauseDurationRaw);
} }
LocalTime vorlaeufigeEndzeit = lb.getStartTime().plusMinutes(lb.getPassedMinutes(passedMinutesZero)) LocalTime vorlaeufigeEndzeit = lb.getStartTime().plusMinutes(WorkdayLoadingBar.MAX_NUMBER_WORK_MINS)
.plusMinutes(mittagspauseDuration != null ? mittagspauseDuration : WorkdayLoadingBar.MIN_LUNCH_DURATION); .plusMinutes(mittagspauseDuration != null ? mittagspauseDuration : WorkdayLoadingBar.MIN_LUNCH_DURATION);
println("Endzeit: " + FormatTools.TIME_FORMATTER.format(vorlaeufigeEndzeit)); println("Endzeit: " + FormatTools.TIME_FORMATTER.format(vorlaeufigeEndzeit));
print("Feierabend verschieben um (optional): "); print("Feierabend verschieben um (optional): ");