robertvokac/time-calc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Added new improvements

Browse Source
This commit is contained in:
Robert Vokac 2024-02-03 07:14:04 +00:00
parent 60ff5ecc8e
commit ab329b9d71
No known key found for this signature in database
GPG Key ID: 693D30BEE3329055
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/nanoboot/utils/timecalc/gui/progress/MonthBattery.java
View File

@ -8,9 +8,10 @@ public class MonthBattery extends Battery{
public MonthBattery(int x, int i, int i1) {
super("Month", x, i, i1);
}
public static double getMonthProgress(int weekDayWhenMondayIsOne, double done) {
public static double getMonthProgress(int weekDayWhenMondayIsOne, int workDaysDone, int workDaysTotal, double done) {
return weekDayWhenMondayIsOne == 0
|| weekDayWhenMondayIsOne == 6 ?
100 : ((weekDayWhenMondayIsOne - 1) * 0.20 + done * 0.20);
workDaysDone / workDaysTotal :
(workDaysDone + done) / workDaysTotal;
}
}

26
src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcManager.java
View File

@ -29,6 +29,7 @@ import java.awt.event.KeyEvent;
import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.Month;
import java.util.Calendar;
import java.util.Date;
@ -326,17 +327,7 @@ public class TimeCalcManager {
LocalDateTime now = LocalDateTime.now();
String nowString =
DateFormats.DATE_TIME_FORMATTER_HHmmssSSS.format(now);
// if (alreadyShownTimes.contains(nowString)) {
// //nothing to do
// try {
// Thread.sleep(100);
// } catch (InterruptedException e) {
//
// }
// continue;
// } else {
// alreadyShownTimes.add(nowString);
// }
int hourNow = Integer.parseInt(nowString.split(":")[0]);
int minuteNow = Integer.parseInt(nowString.split(":")[1]);
int secondNow = Integer.parseInt(nowString.split(":")[2]);
@ -367,10 +358,7 @@ public class TimeCalcManager {
weekBattery.setLabel(
nowIsWeekend ? "5/5" : (weekDayWhenMondayIsOne + "/5"));
monthBattery.setDonePercent(weekDayWhenMondayIsOne == 0
|| weekDayWhenMondayIsOne == 6 ?
workDaysDone / workDaysTotal :
(workDaysDone + done) / workDaysTotal);
monthBattery.setDonePercent(MonthBattery.getMonthProgress(weekDayWhenMondayIsOne, workDaysDone, workDaysTotal, done));
monthBattery.setLabel(
(nowIsWeekend ? workDaysDone : workDaysDone + 1) + "/"
+ (workDaysTotal));
@ -391,14 +379,6 @@ public class TimeCalcManager {
double totalSecondsRemainsDouble =
((double) totalMillisecondsRemains) / 1000;
//if(System.getProperty("progress")!=null) {
// } else {
// sb.append(msg);
// }
if (timeRemains.getHour() == 0 && timeRemains.getMinute() == 1 && !vtipyShown) {
vtipyShown = true;
Jokes.showRandom();