BP-833, fix missing 'Vorschub' if lastUser is no longer in group
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 60e9076..531963f 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
@@ -409,7 +409,7 @@
// now get the next user in this phase, who is after the currPosition, start
// with 1 + currPosition
- for (int i = 1; i <= count; i++) {
+ for (int i = 1; i < count; i++) {
int index = (i + currPosition) % count;
@@ -418,6 +418,7 @@
if (lsUserInGroup.contains(userInStandbyGroup)) {
// user found
lastStartUserId = userInStandbyGroup.getUser().getId();
+ lastTurnUserId = lastStartUserId;
break;
}
}
@@ -434,6 +435,7 @@
// reset position if end of list has been reached
planningBodyResultDto = this.calculateScheduleBodyEntries(lsUserInGroup, dto.getStartDate(), tmpDate,
lastCalcDate, lastTurnUserId, username, lastStartUserId, phaseNumber);
+
tmpDate = planningBodyResultDto.getTempDate();
lastStartUserId = planningBodyResultDto.getLastStartUserId();
lastTurnUserId = planningBodyResultDto.getLastUserId();
