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

Fixed several bugs

Browse Source
This commit is contained in:
Robert Vokac 2024-03-09 16:38:42 +00:00
parent ddace4495d
commit 171118e785
No known key found for this signature in database
GPG Key ID: 693D30BEE3329055
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/MainWindow.java
View File

@ -688,6 +688,7 @@ public class MainWindow extends TWindow {
TTime timeElapsed = TTime TTime timeElapsed = TTime
.computeTimeDiff(startTime, nowTime); .computeTimeDiff(startTime, nowTime);
TTime timeRemains = TTime.computeTimeDiff(nowTime, endTime); TTime timeRemains = TTime.computeTimeDiff(nowTime, endTime);
TTime timeTotal = TTime.computeTimeDiff(startTime, endTime);
String timeElapsedString = timeElapsed.toString(); String timeElapsedString = timeElapsed.toString();
String timeRemainsString = timeRemains.toString(); String timeRemainsString = timeRemains.toString();
@ -710,23 +711,15 @@ public class MainWindow extends TWindow {
TTime overtime = overtimeTextField.asTTime(); TTime overtime = overtimeTextField.asTTime();
int hourDone = (int) (Constants.WORKING_HOURS_LENGTH + overtime.getHour() int hourDone = (int) (Constants.WORKING_HOURS_LENGTH + overtime.getHour()
- timeRemains.getHour()); - timeRemains.getHour());
int minutesDone
= (int) (Constants.WORKING_MINUTES_LENGTH + overtime.getMinute()
- timeRemains.getMinute());
int secondsDone = secondNow;
int millisecondsDone = millisecondNow;
int totalMinutesDone = hourDone * 60 + minutesDone;
int totalSecondsDone = totalMinutesDone * 60 + secondsDone;
int totalMillisecondsDone int totalMillisecondsDone
= totalSecondsDone * 1000 + millisecondsDone; = timeElapsed.toTotalMilliseconds();
int totalMinutes = TTime.countDiffInMinutes(arrivalTextField.asTTime(), int totalMinutes = timeTotal.getMinute();
departureTextField.asTTime());
int totalSeconds = totalMinutes * TTime.SECONDS_PER_MINUTE;
int totalMilliseconds = totalSeconds * TTime.MILLISECONDS_PER_SECOND;
int totalMilliseconds = timeTotal.toTotalMilliseconds();
System.out.println("totalMillisecondsDone=" + totalMillisecondsDone);
System.out.println("totalMilliseconds=" + totalMilliseconds);
double done = ((double) totalMillisecondsDone) double done = ((double) totalMillisecondsDone)
/ ((double) totalMilliseconds); / ((double) totalMilliseconds);
if(done < 0) { if(done < 0) {
@ -771,7 +764,7 @@ public class MainWindow extends TWindow {
.setDonePercent(YearBattery.getYearProgress(clock)); .setDonePercent(YearBattery.getYearProgress(clock));
yearBattery.setLabel(""); yearBattery.setLabel("");
if (timeRemains.getHour() <= 0 && timeRemains.getMinute() <= 0 && timeRemains.getSecond() <= 0) { if (timeRemains.getHour() <= 0 && timeRemains.getMinute() <= 0 && timeRemains.getSecond() <= 0 && timeRemains.getMillisecond() <= 0) {
Toaster toasterManager = new Toaster(); Toaster toasterManager = new Toaster();
toasterManager.setDisplayTime(30000); toasterManager.setDisplayTime(30000);
toasterManager.showToaster( toasterManager.showToaster(