From 4f71c66e644843b07bf21a503b6cbd1a93809cff Mon Sep 17 00:00:00 2001 From: Robert Vokac Date: Sat, 27 Jan 2024 14:51:58 +0000 Subject: [PATCH] New improvements --- highlight.txt | 0 overtime.txt | 2 +- src/main/java/rvc/timecalc/Main.java | 8 ++------ src/main/java/rvc/timecalc/TimeCalcWindow.java | 6 +++--- starttime.txt | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) create mode 100644 highlight.txt diff --git a/highlight.txt b/highlight.txt new file mode 100644 index 0000000..e69de29 diff --git a/overtime.txt b/overtime.txt index 5b70e78..bcb4bda 100644 --- a/overtime.txt +++ b/overtime.txt @@ -1 +1 @@ -0:09 \ No newline at end of file +0:00 \ No newline at end of file diff --git a/src/main/java/rvc/timecalc/Main.java b/src/main/java/rvc/timecalc/Main.java index 57a39ae..1ba6c50 100644 --- a/src/main/java/rvc/timecalc/Main.java +++ b/src/main/java/rvc/timecalc/Main.java @@ -38,12 +38,8 @@ public class Main { lastOvertime == null ? "0:00" : lastOvertime ); - if(!starttimeTxt.exists()) { - Utils.writeTextToFile(starttimeTxt, startTime); - } - if(!overtimeTxt.exists()) { - Utils.writeTextToFile(overtimeTxt, overTime); - } + Utils.writeTextToFile(starttimeTxt, startTime); + Utils.writeTextToFile(overtimeTxt, overTime); try { TimeCalcWindow timeCalc = new TimeCalcWindow(startTime, overTime); diff --git a/src/main/java/rvc/timecalc/TimeCalcWindow.java b/src/main/java/rvc/timecalc/TimeCalcWindow.java index 121ea5a..952496e 100644 --- a/src/main/java/rvc/timecalc/TimeCalcWindow.java +++ b/src/main/java/rvc/timecalc/TimeCalcWindow.java @@ -182,8 +182,8 @@ public class TimeCalcWindow { double totalSecondsRemainsDouble = ((double)totalMillisecondsRemains)/1000; String msg = "Done=" + formatter5.format(done * 100) + "% Remains=" + String.format("%02d", hourRemains) + ":" + String - .format("%02d", minuteRemains) + ":" + String.format("%02d", secondsRemains) + " (" + formatter3 - .format(totalSecondsRemainsDouble) + .format("%02d", minuteRemains) + /*":" + String.format("%02d", secondsRemains)+ */ " (" + formatter3 + .format(totalSecondsRemainsDouble - 60) + " s" + ")" + " End=" + String .format("%02d", endHour) + ":" + String .format("%02d", endMinute); @@ -304,7 +304,7 @@ public class TimeCalcWindow { int spacesTodo = spacesTotal - (spacesDone < 0 ? 0 : spacesDone); sb.append("||" + createSpaces(58 - 2) + (spacesTodo == 0 ? " \n": "||======||\n")); - sb.append("||").append(createSpaces(spacesTotal + 4)).append("| |").append("\n"); + sb.append("||").append(createSpaces(spacesTotal + 4)).append(spacesTodo == 0 ? "" : "| |").append("\n"); NumberFormat formatter3 = new DecimalFormat("#0.00000"); sb.append( diff --git a/starttime.txt b/starttime.txt index 1d467db..6187db9 100644 --- a/starttime.txt +++ b/starttime.txt @@ -1 +1 @@ -6:39 \ No newline at end of file +0:48 \ No newline at end of file