From 4da4b8e34017a7eb59c33cee3d69b5d6a2875411 Mon Sep 17 00:00:00 2001 From: Robert Vokac Date: Sat, 3 Feb 2024 22:07:51 +0000 Subject: [PATCH] Added new improvements --- src/main/java/rvc/timecalc/TimeCalcWindow.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/rvc/timecalc/TimeCalcWindow.java b/src/main/java/rvc/timecalc/TimeCalcWindow.java index 616371a..a0310bd 100644 --- a/src/main/java/rvc/timecalc/TimeCalcWindow.java +++ b/src/main/java/rvc/timecalc/TimeCalcWindow.java @@ -400,11 +400,11 @@ public class TimeCalcWindow { batteryForWeek.setDonePercent((weekDayWhenMondayIsOne == 0 || weekDayWhenMondayIsOne == 6) ? 100 : ((weekDayWhenMondayIsOne - 1) * 0.20 + done * 0.20)); - batteryForWeek.setLabel("#" + (nowIsWeekend ? 0 : (6 - weekDayWhenMondayIsOne))); + batteryForWeek.setLabel(nowIsWeekend ? "5/5" : (weekDayWhenMondayIsOne + "/5")); batteryForMonth.setDonePercent(weekDayWhenMondayIsOne == 0 || weekDayWhenMondayIsOne == 6 ? workDaysDone/workDaysTotal : (workDaysDone + done) / workDaysTotal); - batteryForMonth.setLabel("#" + (nowIsWeekend ? workDaysTodo : (workDaysTodo + 1))); + batteryForMonth.setLabel((nowIsWeekend ? workDaysDone : workDaysDone + 1) + "/" + (workDaysTotal)); double minutesRemainsD = (double) minuteRemains; @@ -420,7 +420,8 @@ public class TimeCalcWindow { } batteryForHour.setDonePercent(1 - ((minutesRemainsD%60d)/60d)); if(done < 1 && !nowIsWeekend) { - batteryForHour.setLabel("#" + (minuteRemains == 0 ? minuteRemains / 60 : minuteRemains/ 60 + 1)); + int hoursForLabel = (minuteRemains == 0 ? minuteRemains / 60 + 1 : minuteRemains/ 60); + batteryForHour.setLabel( ((totalMinutes / 60) - hoursForLabel) + "/" + (totalMinutes / 60)); } int totalSecondsRemains =