robertvokac/time-calc
1
0
Fork 0
mirror of https://github.com/robertvokac/time-calc.git synced 2025-03-25 07:27:49 +01:00
Code Issues Projects Releases Activity

Added new improvements

Browse Source
This commit is contained in:
Robert Vokac 2024-02-03 22:07:51 +00:00
parent fbc59ca376
commit 4da4b8e340
No known key found for this signature in database
GPG Key ID: 693D30BEE3329055
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/rvc/timecalc/TimeCalcWindow.java
View File

@ -400,11 +400,11 @@ public class TimeCalcWindow {
batteryForWeek.setDonePercent((weekDayWhenMondayIsOne == 0 batteryForWeek.setDonePercent((weekDayWhenMondayIsOne == 0
|| weekDayWhenMondayIsOne == 6) ? || weekDayWhenMondayIsOne == 6) ?
100 : ((weekDayWhenMondayIsOne - 1) * 0.20 + done * 0.20)); 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 batteryForMonth.setDonePercent(weekDayWhenMondayIsOne == 0
|| weekDayWhenMondayIsOne == 6 ? workDaysDone/workDaysTotal : (workDaysDone + done) / workDaysTotal); || weekDayWhenMondayIsOne == 6 ? workDaysDone/workDaysTotal : (workDaysDone + done) / workDaysTotal);
batteryForMonth.setLabel("#" + (nowIsWeekend ? workDaysTodo : (workDaysTodo + 1))); batteryForMonth.setLabel((nowIsWeekend ? workDaysDone : workDaysDone + 1) + "/" + (workDaysTotal));
double minutesRemainsD = (double) minuteRemains; double minutesRemainsD = (double) minuteRemains;
@ -420,7 +420,8 @@ public class TimeCalcWindow {
} }
batteryForHour.setDonePercent(1 - ((minutesRemainsD%60d)/60d)); batteryForHour.setDonePercent(1 - ((minutesRemainsD%60d)/60d));
if(done < 1 && !nowIsWeekend) { 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 = int totalSecondsRemains =