This is an automated email from the git hooks/post-receive script. New commit to branch feature/210-rgpd in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 80b897515e6fb1d47d5c601698aae4bd834f11cb Author: jcouteau <couteau@codelutin.com> Date: Fri Sep 21 16:04:12 2018 +0200 fixes #227 - Liste d'émargement sans email --- .../pollen/services/service/VoterListService.java | 28 +++++++++++++++++++--- .../src/main/web/tag/poll/Participants.tag.html | 18 ++++---------- 2 files changed, 29 insertions(+), 17 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 17b1bdfa..3b54d373 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 @@ -90,6 +90,29 @@ public class VoterListService extends PollenServiceSupport { return bean; } + /** + * Same as {@link this.toVoterListMemberBean()} with only name, avatar and voting + * @param entity + * @return + */ + public VoterListMemberBean toVoterListMemberLightBean(VoterListMember entity) { + + VoterListMemberBean bean = new VoterListMemberBean(); + + PollenPrincipal pollenPrincipal = entity.getMember(); + if (pollenPrincipal != null) { + bean.setName(pollenPrincipal.getName()); + if (pollenPrincipal.getPollenUser() != null && pollenPrincipal.getPollenUser().getAvatar() != null) { + bean.setAvatar(getPollenResourceService().getReduceIdByTopiaId(pollenPrincipal.getPollenUser().getAvatar().getTopiaId())); + } + } + + boolean voting = getVoteDao().forVoterListMemberContains(entity).exists(); + bean.setVoting(voting); + + return bean; + } + public VoterListBean toVoterListBean(VoterList entity) { checkIsConnectedRequired(); @@ -246,7 +269,7 @@ public class VoterListService extends PollenServiceSupport { .forProperties(VoterListMember.PROPERTY_VOTER_LIST + "." + VoterList.PROPERTY_POLL, poll) .findPage(paginationParameter1); - return toPaginationListBean(result, this::toVoterListMemberBean); + return toPaginationListBean(result, this::toVoterListMemberLightBean); } public ExportBean exportAllVoterListMembers(String pollId) { @@ -261,11 +284,10 @@ public class VoterListService extends PollenServiceSupport { .setOrderByArguments(VoterListMember.PROPERTY_MEMBER + "." + PollenPrincipal.PROPERTY_NAME) .findAll(); - ImmutableList<VoterListMemberBean> memberBeans = toBeanList(members, this::toVoterListMemberBean); + ImmutableList<VoterListMemberBean> memberBeans = toBeanList(members, this::toVoterListMemberLightBean); Exporter<VoterListMemberBean> beanExporter = new ExporterBuilder<VoterListMemberBean>() .addColumn(PollenPrincipal.PROPERTY_NAME, VoterListMemberBean::getName) - .addColumn(PollenPrincipal.PROPERTY_EMAIL, VoterListMemberBean::getEmail) .addColumn("voting", VoterListMemberBean::isVoting, b -> Boolean.toString(b)) .build(); diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Participants.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Participants.tag.html index 25b550e5..f77381f8 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Participants.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Participants.tag.html @@ -46,13 +46,8 @@ <div class="avatar"> <Avatar avatar={element.avatar} name={element.name} rounded="true"/> </div> - <div class="name-email"> - <div class="name"> - {element.name} - </div> - <div class="email"> - {element.email} - </div> + <div class="name"> + {element.name} </div> </div> </yield> @@ -62,13 +57,8 @@ <div class="avatar"> <i class="fa fa-user-circle c-icon"></i> </div> - <div class="name-email"> - <div class="name"> - <i class="fa fa-spinner fa-pulse"></i> - </div> - <div class="email"> - <i class="fa fa-spinner fa-pulse"></i> - </div> + <div class="name"> + <i class="fa fa-spinner fa-pulse"></i> </div> </div> </yield> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.