BP-833, fix starting between durations
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlanningController.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlanningController.java
index abf0659..641d6d3 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlanningController.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlanningController.java
@@ -1571,9 +1571,12 @@
// if durations ends current day use the end of duration
tmpDuration.setValidDayTo(DateHelper.getDayOfWeek(currentDate));
} else {
+ int diff = DateHelper.calculateDifferenceOfDays(currentWeekDayInt, endDurationWeekDayInt,
+ dur.getValidFrom(), dur.getValidTo());
+ Date addedDiffDate = DateHelper.addDaysToDate(currentDate, diff);
// else use the end of day.
- tmpDuration.setValidDayTo(DateHelper.getDayOfWeek(currentDate));
- tmpDuration.setValidTo(DateHelper.getEndOfDay(currentDate));
+ tmpDuration.setValidDayTo(DateHelper.getDayOfWeek(addedDiffDate));
+ tmpDuration.setValidTo(addedDiffDate);
}
lsFittingDurations.add(tmpDuration);
}
