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

Fixed Work Days chart for averages for empty lists

Browse Source
This commit is contained in:
Robert Vokac 2024-12-12 18:09:28 +01:00
parent 146c0fbeff
commit 0c75852eb3
Signed by: robertvokac
GPG Key ID: FB9CE8E20AADA55F
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/time-calc-app/src/main/java/com/robertvokac/utils/timecalc/entity/WorkingDayForStats.java
View File

@ -112,6 +112,7 @@ public class WorkingDayForStats extends WorkingDay {
l.add(wd);
});
}
System.out.println("list7.size()=" + list7.size());
wd.setArrivalTimeMovingAverage7Days(list7.stream()
.map(WorkingDay::getArrivalAsDouble)
.mapToDouble(Double::doubleValue)
@ -132,6 +133,10 @@ public class WorkingDayForStats extends WorkingDay {
.mapToDouble(Double::doubleValue)
.average()
.orElse(0.0));
if(list7.isEmpty()) wd.setArrivalTimeMovingAverage7Days(wd.getArrivalTimeMovingAverage56Days());
if(list14.isEmpty()) wd.setArrivalTimeMovingAverage14Days(wd.getArrivalTimeMovingAverage56Days());
if(list28.isEmpty()) wd.setArrivalTimeMovingAverage28Days(wd.getArrivalTimeMovingAverage56Days());
// System.out.println(
// WorkingDay.createId(cal) + " 1 :: " + list7.size());
// System.out.println(

6
modules/time-calc-app/src/main/java/com/robertvokac/utils/timecalc/swing/common/ArrivalChart.java
View File

@ -248,7 +248,11 @@ public class ArrivalChart extends JPanel {
seriesTarget.add(day3, new Double(0d));
seriesTargetMinus30Minutes.add(day3, new Double(-0.5d));
seriesTargetMinus60Minutes.add(day3, new Double(-1.0d));
seriesMa7.add(day3, new Double(ma7[i]));
double ma7i = ma7[i];
if(ma7i < (ma28[i] - 2)) {
ma7i = ma28[i] - 2;
}
seriesMa7.add(day3, new Double(ma7i));
seriesMa14.add(day3, new Double(ma14[i]));
seriesMa28.add(day3, new Double(ma28[i]));
seriesMa56.add(day3, new Double(ma56[i]));