last push
parent
e424a133c4
commit
533e01724b
|
|
@ -60,20 +60,25 @@ public class PlanTimes {
|
||||||
|
|
||||||
for (var week : calenderWeeks) {
|
for (var week : calenderWeeks) {
|
||||||
System.out.println(week.getStartDate() + " ---> " + week.getEndDate());
|
System.out.println(week.getStartDate() + " ---> " + week.getEndDate());
|
||||||
|
double planTimePerWeek = 0.0;
|
||||||
for (var change : changesInDateRange) {
|
for (var change : changesInDateRange) {
|
||||||
LocalDate d2 = timestampToDate(change.get(queryChanges.getFieldId("D2")).toString());
|
LocalDate d2 = timestampToDate(change.get(queryChanges.getFieldId("D2")).toString());
|
||||||
LocalDate dateStart = LocalDate.parse(week.getStartDate(), formatter);
|
LocalDate dateStart = LocalDate.parse(week.getStartDate(), formatter);
|
||||||
LocalDate dateEnd = LocalDate.parse(week.getEndDate(), formatter);
|
LocalDate dateEnd = LocalDate.parse(week.getEndDate(), formatter);
|
||||||
|
|
||||||
if (d2.isAfter(dateStart) && (d2.isEqual(dateEnd) || d2.isBefore(dateEnd))) {
|
if (d2.isAfter(dateStart) && (d2.isEqual(dateEnd) || d2.isBefore(dateEnd))) {
|
||||||
System.out.println(d2);
|
System.out.println(change.get(queryChanges.getFieldId("ChangeNr")).toString() + " _ "
|
||||||
|
+ new SimpleDateFormat("dd.MM.yyyy").format(d2));
|
||||||
|
|
||||||
|
planTimePerWeek += change.get(endDate)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (var v : calenderWeeks)
|
for (var v : calenderWeeks)
|
||||||
System.out.println(v.getWeek() + " - " + v.getPlanTime() + " - " + v.getStartDate() + " - " + v.getEndDate());
|
System.out
|
||||||
|
.println(v.getWeek() + " - " + v.getPlanTime() + " - " + v.getStartDate() + " - " + v.getEndDate());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public LocalDate timestampToDate(String timestamp) {
|
public LocalDate timestampToDate(String timestamp) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue