From 28e872ce3ad0460ca613f8184f663314cc3524a4 Mon Sep 17 00:00:00 2001 From: Filip Izydorczyk Date: Thu, 14 Jan 2021 15:05:41 +0100 Subject: [PATCH] 2nd tour looks if assignment is accepted --- .../com/plannaplan/services/AssignmentService.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/buisnesslogic/src/main/java/com/plannaplan/services/AssignmentService.java b/buisnesslogic/src/main/java/com/plannaplan/services/AssignmentService.java index e5a8ccf..a99d0ea 100755 --- a/buisnesslogic/src/main/java/com/plannaplan/services/AssignmentService.java +++ b/buisnesslogic/src/main/java/com/plannaplan/services/AssignmentService.java @@ -91,12 +91,14 @@ public class AssignmentService { if (com.isPresent()) { final List assignments = this.getCommisionAssignments(com.get()); assignments.forEach(a -> { - final Groups group = a.getGroup(); - if (group.getCapacity() > group.getRegisteredStudents().size()) { - e.claimGroup(group); - accepted.add(group); - } else { - removed.add(group); + if (a.isAccepted() == false) { + final Groups group = a.getGroup(); + if (group.getCapacity() > group.getRegisteredStudents().size()) { + e.claimGroup(group); + accepted.add(group); + } else { + removed.add(group); + } } }); }