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 several improvements, changes and bug fixes

Browse Source
This commit is contained in:
Robert Vokac 2024-03-10 20:17:10 +00:00
parent 62048feb23
commit f4717913b6
No known key found for this signature in database
GPG Key ID: 693D30BEE3329055
2 changed files with 25 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -361,38 +361,23 @@ public class WorkingDaysWindow extends TWindow {
for (WorkingDayForStats wdfs : wdfsList) { for (WorkingDayForStats wdfs : wdfsList) {
ArrayList<String> list2 = new ArrayList<>(); ArrayList<String> list2 = new ArrayList<>();
listForArray.add(list2); listForArray.add(list2);
list2.add(wdfs.getDayOfWeekAsString());
list2.add(wdfs.getDayOfWeek() == 6 || wdfs.getDayOfWeek() == 7 ?
YES : NO);
list2.add(wdfs.getId());
if (wdfs.isThisDayTimeOff()) { if (wdfs.isThisDayTimeOff()) {
list2.add(wdfs.getDayOfWeekAsString());
list2.add(wdfs.getDayOfWeek() == 6 || wdfs.getDayOfWeek() == 7 ?
YES : NO);
list2.add(wdfs.getId());
list2.add(THREE_DASHES); list2.add(THREE_DASHES);
list2.add(THREE_DASHES); list2.add(THREE_DASHES);
list2.add(THREE_DASHES); list2.add(THREE_DASHES);
list2.add(THREE_DASHES); list2.add(THREE_DASHES);
list2.add(THREE_DASHES); list2.add(THREE_DASHES);
list2.add(wdfs.getNote());
list2.add(wdfs.isTimeOff() ? YES : NO);
list2.add(QUESTION_MARK);
list2.add(NumberFormats.FORMATTER_FIVE_DECIMAL_PLACES
.format(wdfs.getArrivalTimeMovingAverage7Days()
- target));
list2.add(NumberFormats.FORMATTER_FIVE_DECIMAL_PLACES
.format(wdfs.getArrivalTimeMovingAverage14Days()
- target));
list2.add(NumberFormats.FORMATTER_FIVE_DECIMAL_PLACES
.format(wdfs.getArrivalTimeMovingAverage28Days()
- target));
list2.add(NumberFormats.FORMATTER_FIVE_DECIMAL_PLACES
.format(wdfs.getArrivalTimeMovingAverage56Days()
- target));
} else { } else {
list2.add(wdfs.getDayOfWeekAsString());
TTime overtime = new TTime(wdfs.getOvertimeHour(), TTime overtime = new TTime(wdfs.getOvertimeHour(),
wdfs.getOvertimeMinute()); wdfs.getOvertimeMinute());
list2.add(wdfs.getDayOfWeek() == 6 || wdfs.getDayOfWeek() == 7 ?
YES : NO);
list2.add(wdfs.getId());
list2.add(new TTime(wdfs.getArrivalHour(), list2.add(new TTime(wdfs.getArrivalHour(),
wdfs.getArrivalMinute()).toString().substring(0, 5) wdfs.getArrivalMinute()).toString().substring(0, 5)
+ " (" + NumberFormats.FORMATTER_FIVE_DECIMAL_PLACES + " (" + NumberFormats.FORMATTER_FIVE_DECIMAL_PLACES
@ -406,22 +391,18 @@ public class WorkingDaysWindow extends TWindow {
list2.add( list2.add(
TTime.ofMinutes(wdfs.getPauseTimeInMinutes()).toString() TTime.ofMinutes(wdfs.getPauseTimeInMinutes()).toString()
.substring(0, 5)); .substring(0, 5));
list2.add(wdfs.getNote());
list2.add(wdfs.isTimeOff() ? YES : NO);
list2.add(QUESTION_MARK);
list2.add(NumberFormats.FORMATTER_FIVE_DECIMAL_PLACES
.format(wdfs.getArrivalTimeMovingAverage7Days()
- target));
list2.add(NumberFormats.FORMATTER_FIVE_DECIMAL_PLACES
.format(wdfs.getArrivalTimeMovingAverage14Days()
- target));
list2.add(NumberFormats.FORMATTER_FIVE_DECIMAL_PLACES
.format(wdfs.getArrivalTimeMovingAverage28Days()
- target));
list2.add(NumberFormats.FORMATTER_FIVE_DECIMAL_PLACES
.format(wdfs.getArrivalTimeMovingAverage56Days()
- target));
} }
list2.add(wdfs.getNote());
list2.add(wdfs.isTimeOff() ? YES : NO);
list2.add(QUESTION_MARK);
list2.add(TTime.ofMilliseconds(
(int) (wdfs.getArrivalTimeMovingAverage7Days() * 60d * 60d * 1000d)).toString().substring(0, 8));
list2.add(TTime.ofMilliseconds(
(int) (wdfs.getArrivalTimeMovingAverage14Days() * 60d * 60d * 1000d)).toString().substring(0, 8));
list2.add(TTime.ofMilliseconds(
(int) (wdfs.getArrivalTimeMovingAverage28Days() * 60d * 60d * 1000d)).toString().substring(0, 8));
list2.add(TTime.ofMilliseconds(
(int) (wdfs.getArrivalTimeMovingAverage56Days() * 60d * 60d * 1000d)).toString().substring(0, 8));
} }
String data[][] = new String[listForArray.size()][]; String data[][] = new String[listForArray.size()][];

7
modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/common/TTime.java
View File

@ -140,13 +140,18 @@ public class TTime implements Comparable<TTime> {
return ofMilliseconds(s * 1000); return ofMilliseconds(s * 1000);
} }
public static TTime ofMilliseconds(int s) { public static TTime ofMilliseconds(int s) {
boolean negative = false;
if(s < 0 ) {
s = Math.abs(s);
negative = true;
}
int hours = s / 60 / 60 / 1000; int hours = s / 60 / 60 / 1000;
int milliseconds = s - hours * 60 * 60 * 1000; int milliseconds = s - hours * 60 * 60 * 1000;
int minutes = milliseconds / 60 / 1000; int minutes = milliseconds / 60 / 1000;
milliseconds = milliseconds - minutes * 60 * 1000; milliseconds = milliseconds - minutes * 60 * 1000;
int seconds = milliseconds / 1000; int seconds = milliseconds / 1000;
milliseconds = milliseconds - seconds * 1000; milliseconds = milliseconds - seconds * 1000;
return new TTime(s < 0, Math.abs(hours), Math.abs(minutes), Math.abs(seconds), Math.abs(milliseconds)); return new TTime(negative, Math.abs(hours), Math.abs(minutes), Math.abs(seconds), Math.abs(milliseconds));
} }
public TTime add(TTime tTimeToBeAdded) { public TTime add(TTime tTimeToBeAdded) {