This is an automated email from the git hooks/post-receive script. New commit to branch feature/april in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 375727c6c848b3ed60f16bd01e7e65ec940fd709 Author: jcouteau <couteau@codelutin.com> Date: Tue Oct 2 14:53:51 2018 +0200 refs #221 - Vote associatif - VoterListService should be ok --- .../chorem/pollen/services/service/VoterListService.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java index 3b54d373..2d274335 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java @@ -30,6 +30,7 @@ import org.apache.commons.lang3.tuple.Pair; import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.persistence.entity.PollenPrincipal; import org.chorem.pollen.persistence.entity.PollenUser; +import org.chorem.pollen.persistence.entity.Question; import org.chorem.pollen.persistence.entity.Vote; import org.chorem.pollen.persistence.entity.VoterList; import org.chorem.pollen.persistence.entity.VoterListMember; @@ -48,6 +49,7 @@ import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -850,7 +852,14 @@ public class VoterListService extends PollenServiceSupport { } protected int sendInvitation(Poll poll, List<VoterListMember> members, boolean allMemberNoVoting) { - List<Vote> votes = getVoteDao().forPollEquals(poll).findAll(); + + //get all votes for all questions + List<Question> questions = getQuestionService().getQuestionsforPoll(poll); + List<Vote> votes = new ArrayList<>(); + for (Question question:questions) { + List<Vote> questionVotes = getVoteDao().forQuestionEquals(question).findAll(); + votes.addAll(questionVotes); + } List<VoterListMember> memberToSend; @@ -872,7 +881,7 @@ public class VoterListService extends PollenServiceSupport { getNotificationService().sendInvitation(poll, memberToSend); - // plusieurs membre dans des liste différent peuvent avoir le même email + // plusieurs membre dans des listes différentes peuvent avoir le même email List<PollenPrincipal> pollenPrincipals = memberToSend.stream().map(VoterListMember::getMember).collect(Collectors.toList()); getVoterListMemberDao() -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.