March 2010 - Pollen-commits - mailman.cloud.codelutin.com

r2913 - branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll
by fdesbois＠users.chorem.org March 9, 2010

March 9, 2010

Author: fdesbois Date: 2010-03-09 17:47:07 +0100 (Tue, 09 Mar 2010) New Revision: 2913 Log: Remove old method Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-09 16:44:39 UTC (rev 2912) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-09 16:47:07 UTC (rev 2913) @@ -520,30 +520,6 @@ } /** - * Retourne vrai si le votant a déjà voté. - * - * @param votingId le votant a rechercher - * @return vrai si le votant a déjà voté - */ - private boolean hasAlreadyVoted(String votingId) { - - // comparaison du votant (pollAccount) avec les votants des votes existants -// for (VoteDTO vote : getVotes()) { -// PollAccountDTO account = servicePollAccount -// .findPollAccountById(vote.getPollAccountId()); -// -// if (account.getVotingId().equals(votingId)) { -// return true; -// } -// } - - if (log.isDebugEnabled()) { - log.debug("BUSINESS REQUEST [hasAlreadyVoted]"); - } - return serviceVote.hasAlreadyVoted(votingId, poll); - } - - /** * Retourne vrai si la modification du vote est autorisée. C'est à dire si * l'utilisateur connecté est l'auteur du vote ou si le votant défini par * l'url est l'auteur du vote.

1 0

r2912 - in branches/pollen-1.2.3-1.2.x: pollen-business/src/main/java/org/chorem/pollen/business/services pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll
by fdesbois＠users.chorem.org March 9, 2010

March 9, 2010

Author: fdesbois Date: 2010-03-09 17:44:39 +0100 (Tue, 09 Mar 2010) New Revision: 2912 Log: Regression problem on existing vote : use a new method from serviceVote "hasAlreadyVoted" Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVote.java branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVote.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVote.java 2010-03-09 16:02:39 UTC (rev 2911) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVote.java 2010-03-09 16:44:39 UTC (rev 2912) @@ -69,6 +69,15 @@ int startIndex, int endIndex); /** + * Test if the {@code votingId} has already voted for the {@code poll}. + * + * @param votingId to test existing vote + * @param poll where the votingId can have already voted + * @return true if the votingId has already voted or false otherwise + */ + public boolean hasAlreadyVoted(String votingId, PollDTO poll); + + /** * Retourne les votes d'un sondage * * @param properties La HashMap pour sélectionner les votes d'un sondage. Il Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java 2010-03-09 16:02:39 UTC (rev 2911) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java 2010-03-09 16:44:39 UTC (rev 2912) @@ -178,6 +178,7 @@ } } + @Override public List<VoteDTO> getVotesByPoll(PollDTO poll, int startIndex, int endIndex) { TopiaContext transaction = null; @@ -213,15 +214,9 @@ if (log.isDebugEnabled()) { log.debug("Nb votes found : " + votes.size()); } + converter.setTransaction(transaction); + results = converter.createVoteDTOs(votes); -// PollDAO dao = PollenModelDAOHelper.getPollDAO(transaction); -// Poll ePoll = dao.findByPollId(poll.getPollId()); - -// if (ePoll != null) { - converter.setTransaction(transaction); - results = converter.createVoteDTOs(votes); -// } - } catch (Exception eee) { ContextUtil.doCatch(eee, transaction, "Unable to load votes from poll with uid = " + @@ -233,6 +228,39 @@ } @Override + public boolean hasAlreadyVoted(String votingId, PollDTO poll) { + TopiaContext transaction = null; + boolean result = false; + try { + + transaction = rootContext.beginTransaction(); + + // Test using a count(*) on votes + List<Long> tmp = transaction.find( + "SELECT COUNT(*)" + + " FROM " + Vote.class.getName() + + " WHERE poll.pollId = :pollUId" + + " AND pollAccount.votingId = :votingId", + "pollUId", poll.getPollId(), + "votingId", votingId); + + int count = tmp.get(0).intValue(); + + // If the count is greater than 0, there is an existing votingId + // who has already voted for the poll + result = count > 0; + + } catch (Exception eee) { + ContextUtil.doCatch(eee, transaction, + "Unable test vote existing for account with votingId = " + + votingId + " and poll with uid = " + poll.getPollId()); + } finally { + ContextUtil.doFinally(transaction); + } + return result; + } + + @Override public List<VoteDTO> selectVotes(Map<String, Object> properties) { TopiaContext transaction = null; List<VoteDTO> results = null; Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-09 16:02:39 UTC (rev 2911) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-09 16:44:39 UTC (rev 2912) @@ -500,7 +500,12 @@ } // Contrôle si le votant n'a pas déjà voté - alreadyVoted = hasAlreadyVoted(pollAccount.getVotingId()); + if (log.isInfoEnabled()) { + log.info("BUSINESS REQUEST [hasAlreadyVoted]"); + } + alreadyVoted = serviceVote.hasAlreadyVoted( + pollAccount.getVotingId(), poll); + modifAllowed = isModifAllowed(pollAccount.getVotingId()); if (alreadyVoted && !modifAllowed) { voteForm.recordError(nameField, messages.format("alreadyVoted", @@ -523,16 +528,19 @@ private boolean hasAlreadyVoted(String votingId) { // comparaison du votant (pollAccount) avec les votants des votes existants - for (VoteDTO vote : getVotes()) { - PollAccountDTO account = servicePollAccount - .findPollAccountById(vote.getPollAccountId()); +// for (VoteDTO vote : getVotes()) { +// PollAccountDTO account = servicePollAccount +// .findPollAccountById(vote.getPollAccountId()); +// +// if (account.getVotingId().equals(votingId)) { +// return true; +// } +// } - if (account.getVotingId().equals(votingId)) { - return true; - } + if (log.isDebugEnabled()) { + log.debug("BUSINESS REQUEST [hasAlreadyVoted]"); } - - return false; + return serviceVote.hasAlreadyVoted(votingId, poll); } /** @@ -1185,7 +1193,14 @@ public void setPage(int page) { this.page = page; } - + + /** + * Retrieve votes of the current poll from business module. + * The votes are ordered by creation date, only the ones to display are + * loaded depends on current page using pager component. + * + * @return the list of votes to display + */ public List<VoteDTO> getVotes() { if (votes == null) { if (log.isInfoEnabled()) {

1 0

r2911 - in branches/pollen-1.2.3-1.2.x/pollen-ui/src/main: java/org/chorem/pollen/ui/pages/poll webapp/poll
by fdesbois＠users.chorem.org March 9, 2010

March 9, 2010

Author: fdesbois Date: 2010-03-09 17:02:39 +0100 (Tue, 09 Mar 2010) New Revision: 2911 Log: Change rowsPerPage to 100 Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-09 15:59:47 UTC (rev 2910) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-09 16:02:39 UTC (rev 2911) @@ -1188,11 +1188,6 @@ public List<VoteDTO> getVotes() { if (votes == null) { -// votes = new ArrayList<VoteDTO>(); -// List<VoteDTO> all = poll.getVoteDTOs(); -// for (int i = pager.getStartIndex(); i <= pager.getEndIndex(); i++) { -// votes.add(all.get(i)); -// } if (log.isInfoEnabled()) { log.info("BUSINESS REQUEST [getVotesByPoll]"); } Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2010-03-09 15:59:47 UTC (rev 2910) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2010-03-09 16:02:39 UTC (rev 2911) @@ -50,7 +50,7 @@ <p>${voteSizeMessage}</p> <t:feedback t:id="voteFeedback"/> <p:else> - <t:pager t:nbRowsPerPage="3" t:nbTotalRows="poll.nbVotes" t:currentPage="page"/> + <t:pager t:nbRowsPerPage="100" t:nbTotalRows="poll.nbVotes" t:currentPage="page"/> </p:else> </t:if> <t:form t:id="voteForm" t:zone="pollZone">

1 0

r2910 - in branches/pollen-1.2.3-1.2.x: pollen-business/src/main/java/org/chorem/pollen/business/converters pollen-business/src/main/java/org/chorem/pollen/business/services pollen-ui/src/main/java/org/chorem/pollen/ui/components pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll pollen-ui/src/main/webapp/poll
by fdesbois＠users.chorem.org March 9, 2010

March 9, 2010

Author: fdesbois Date: 2010-03-09 16:59:47 +0100 (Tue, 09 Mar 2010) New Revision: 2910 Log: Optimize votes loading on voteForPoll page + add links for first page and last page on pager Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVote.java branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java 2010-03-09 12:16:13 UTC (rev 2909) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java 2010-03-09 15:59:47 UTC (rev 2910) @@ -120,14 +120,14 @@ pollDTO.setChoiceDTOs(choiceConverter.createChoiceDTOs(ePoll .getChoice())); } - if (ePoll.getVote().size() > 0) { - // FD-20100308 Votes are not loaded for an anonymous vote : - // see ref ANO #130 - if (!ePoll.getAnonymous()) { - pollDTO.setVoteDTOs(voteConverter.createVoteDTOs(ePoll.getVote())); - } - pollDTO.setNbVotes(ePoll.getVote().size()); - } +// if (ePoll.getVote().size() > 0) { +// // FD-20100308 Votes are not loaded for an anonymous vote : +// // see ref ANO #130 +// if (!ePoll.getAnonymous()) { +// pollDTO.setVoteDTOs(voteConverter.createVoteDTOs(ePoll.getVote())); +// } +// pollDTO.setNbVotes(ePoll.getVote().size()); +// } if (ePoll.getComment().size() > 0) { pollDTO.setCommentDTOs(commentConverter.createCommentDTOs(ePoll .getComment())); Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2010-03-09 12:16:13 UTC (rev 2909) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2010-03-09 15:59:47 UTC (rev 2910) @@ -239,6 +239,14 @@ if (pollEntity != null) { converter.setTransaction(transaction); result = converter.createPollDTO(pollEntity); + // Need the number total of votes to push in the dto + List<Long> tmp = transaction.find( + "SELECT COUNT(*)" + + " FROM " + Vote.class.getName() + + " WHERE poll.pollId = :pollUId", + "pollUId", pollId); + int count = tmp.get(0).intValue(); + result.setNbVotes(count); } transaction.commitTransaction(); Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVote.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVote.java 2010-03-09 12:16:13 UTC (rev 2909) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVote.java 2010-03-09 15:59:47 UTC (rev 2910) @@ -20,6 +20,7 @@ import java.util.Map; import org.chorem.pollen.business.dto.PollAccountDTO; +import org.chorem.pollen.business.dto.PollDTO; import org.chorem.pollen.business.dto.VoteDTO; /** @@ -54,6 +55,20 @@ public boolean deleteVote(String voteId); /** + * Retrieve existings votes from the {@code poll}. Only needed votes inside + * the range ({@code startIndex} and {@code endIndex}) will be retrieve. + * The results will be ordered by creationDate (the last vote done will + * be at the end of the list). + * + * @param poll to retrieve votes + * @param startIndex begin range for resulting votes + * @param endIndex end range for resulting votes + * @return the votes corresponding to the poll between the range + */ + public List<VoteDTO> getVotesByPoll(PollDTO poll, + int startIndex, int endIndex); + + /** * Retourne les votes d'un sondage * * @param properties La HashMap pour sélectionner les votes d'un sondage. Il Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java 2010-03-09 12:16:13 UTC (rev 2909) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java 2010-03-09 15:59:47 UTC (rev 2910) @@ -16,6 +16,7 @@ package org.chorem.pollen.business.services; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -24,9 +25,12 @@ import org.chorem.pollen.business.converters.DataPollAccountConverter; import org.chorem.pollen.business.converters.DataVoteConverter; import org.chorem.pollen.business.dto.PollAccountDTO; +import org.chorem.pollen.business.dto.PollDTO; import org.chorem.pollen.business.dto.VoteDTO; +import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PollAccount; import org.chorem.pollen.business.persistence.PollAccountDAO; +import org.chorem.pollen.business.persistence.PollDAO; import org.chorem.pollen.business.persistence.PollenModelDAOHelper; import org.chorem.pollen.business.persistence.Vote; import org.chorem.pollen.business.persistence.VoteDAO; @@ -174,6 +178,60 @@ } } + public List<VoteDTO> getVotesByPoll(PollDTO poll, + int startIndex, int endIndex) { + TopiaContext transaction = null; + List<VoteDTO> results = new ArrayList<VoteDTO>(); + try { + // No need to load votes for an anonymous poll + if (poll.isAnonymous()) { + return results; + } + + // FIXME-FD20100309 : change model to suppress link from poll to vote + // It's not necessary to have votes when retrieving the poll, this + // method do this job only when it's needed + + if (log.isDebugEnabled()) { + log.debug("Load votes for poll with uid = " + poll.getPollId()); + log.debug("LIMIT : startIndex = " + startIndex + " _ " + + "endIndex = " + endIndex); + } + + transaction = rootContext.beginTransaction(); + + // FIXME : refactor this to use TopiaQuery from ToPIA 2.3 + // Order the results by creation date (the last vote done will be + // at the end of the list) + List<Vote> votes = transaction.find( + "FROM " + Vote.class.getName() + + " WHERE poll.pollId = :pollUId" + + " ORDER BY topiaCreateDate", + startIndex, endIndex, + "pollUId", poll.getPollId()); + + if (log.isDebugEnabled()) { + log.debug("Nb votes found : " + votes.size()); + } + +// PollDAO dao = PollenModelDAOHelper.getPollDAO(transaction); +// Poll ePoll = dao.findByPollId(poll.getPollId()); + +// if (ePoll != null) { + converter.setTransaction(transaction); + results = converter.createVoteDTOs(votes); +// } + + } catch (Exception eee) { + ContextUtil.doCatch(eee, transaction, + "Unable to load votes from poll with uid = " + + poll.getPollId()); + } finally { + ContextUtil.doFinally(transaction); + } + return results; + } + @Override public List<VoteDTO> selectVotes(Map<String, Object> properties) { TopiaContext transaction = null; Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java 2010-03-09 12:16:13 UTC (rev 2909) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java 2010-03-09 15:59:47 UTC (rev 2910) @@ -5,6 +5,7 @@ import org.apache.tapestry5.EventConstants; import org.apache.tapestry5.Link; import org.apache.tapestry5.MarkupWriter; +import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; @@ -33,7 +34,8 @@ /** * Main element of the pager, the page which contains the pager have * to manage this property (using @Persist for exemple) to ensure that - * the pager will done its work correctly. + * the pager will done its work correctly. You can use + * {@link #getFirstPage() } to initialize the first page. */ @Parameter(required = true) private int currentPage; @@ -61,18 +63,31 @@ log.debug("has previous : " + hasPrevious()); log.debug("has next : " + hasNext()); log.debug("indexes from : " + getStartIndex() + " to " + getEndIndex()); + log.debug("last page : " + getLastPage()); } writer.element("div", "class", "p-pager"); if (hasPrevious()) { - writeLink(writer, currentPage - 1, "< ", "p-pager-previous"); + int previousPage = currentPage - 1; + if (previousPage != getFirstPage()) { + writeLink(writer, getFirstPage(), "<<", "p-pager-first"); + writer.write(" "); + } + writeLink(writer, previousPage, "<", "p-pager-previous"); + writer.write(" "); } writer.element("strong"); writer.write(getFirstValue() + " - " + getLastValue() + " " + messages.get("over") + " " + nbTotalRows); writer.end(); if (hasNext()) { - writeLink(writer, currentPage + 1, " >", "p-pager-next"); + int nextPage = currentPage + 1; + writer.write(" "); + writeLink(writer, nextPage, ">", "p-pager-next"); + if (nextPage != getLastPage()) { + writer.write(" "); + writeLink(writer, getLastPage(), ">>", "p-pager-last"); + } } writer.end(); } @@ -147,6 +162,15 @@ return getEndIndex() < (nbTotalRows - 1); } + public int getFirstPage() { + return 1; + } + + @Log + public int getLastPage() { + return (int)Math.ceil((double)nbTotalRows / (double)nbRowsPerPage); + } + /** * Action event for changing page. The currentPage is changed to * {@code newPage}. Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-09 12:16:13 UTC (rev 2909) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-09 15:59:47 UTC (rev 2910) @@ -302,7 +302,7 @@ public String getVoteSizeMessage() { if (log.isDebugEnabled()) { - log.debug("poll voteDTOs list size : " + poll.getVoteDTOs().size()); + log.debug("poll voteDTOs list size : " + getVotes().size()); log.debug("poll nbVotes : " + poll.getNbVotes()); } return messages.format("vote-size", poll.getNbVotes()); @@ -380,7 +380,7 @@ // mise à jour du vote ou création d'un nouveau vote if (alreadyVoted) { - for (VoteDTO v : poll.getVoteDTOs()) { + for (VoteDTO v : getVotes()) { PollAccountDTO voteAccount = servicePollAccount .findPollAccountById(v.getPollAccountId()); @@ -402,13 +402,16 @@ getResultsAsString()); sendMailNotification(); voteFeedback.addInfo(messages.get("vote-success")); + page = pager.getLastPage(); + // Reset votes to reload them depends on page change. + votes = null; } voteChoices.clear(); return pollZone.getBody(); } private void deleteVote(String voteId) { - for (VoteDTO vote : poll.getVoteDTOs()) { + for (VoteDTO vote : getVotes()) { if (vote.getId().equals(voteId)) { List<ChoiceDTO> choiceDTOs = vote.getChoiceDTOs(); @@ -520,7 +523,7 @@ private boolean hasAlreadyVoted(String votingId) { // comparaison du votant (pollAccount) avec les votants des votes existants - for (VoteDTO vote : poll.getVoteDTOs()) { + for (VoteDTO vote : getVotes()) { PollAccountDTO account = servicePollAccount .findPollAccountById(vote.getPollAccountId()); @@ -546,10 +549,10 @@ // parcours des votes pour trouver celui correspondant au votingId // et contrôle du droit de modification - while (i < poll.getVoteDTOs().size() && !modifAllowed) { + while (i < getVotes().size() && !modifAllowed) { // account : compte associé au vote courant - String id = poll.getVoteDTOs().get(i).getPollAccountId(); + String id = getVotes().get(i).getPollAccountId(); PollAccountDTO account = servicePollAccount.findPollAccountById(id); // si le votant du vote correspond au votingId @@ -629,7 +632,7 @@ for (PreventRuleDTO rule : poll.getPreventRuleDTOs()) { PreventRuleManager manager = new PreventRuleManager(rule); - manager.execute("vote", poll.getVoteDTOs().size(), data); + manager.execute("vote", getVotes().size(), data); } } @@ -1164,7 +1167,7 @@ countPoll(); } - /************** PAGER MANAGMENT *******************************************/ + /************** PAGER AND VOTES MANAGMENT *********************************/ @InjectComponent private Pager pager; @@ -1175,7 +1178,7 @@ private Integer page; public int getPage() { - return page == null ? 1 : page; + return page == null ? pager.getFirstPage() : page; } @Log @@ -1185,11 +1188,16 @@ public List<VoteDTO> getVotes() { if (votes == null) { - votes = new ArrayList<VoteDTO>(); - List<VoteDTO> all = poll.getVoteDTOs(); - for (int i = pager.getStartIndex(); i <= pager.getEndIndex(); i++) { - votes.add(all.get(i)); +// votes = new ArrayList<VoteDTO>(); +// List<VoteDTO> all = poll.getVoteDTOs(); +// for (int i = pager.getStartIndex(); i <= pager.getEndIndex(); i++) { +// votes.add(all.get(i)); +// } + if (log.isInfoEnabled()) { + log.info("BUSINESS REQUEST [getVotesByPoll]"); } + votes = serviceVote.getVotesByPoll(poll, + pager.getStartIndex(), pager.getEndIndex()); } return votes; } Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2010-03-09 12:16:13 UTC (rev 2909) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2010-03-09 15:59:47 UTC (rev 2910) @@ -50,7 +50,7 @@ <p>${voteSizeMessage}</p> <t:feedback t:id="voteFeedback"/> <p:else> - <t:pager t:nbRowsPerPage="15" t:nbTotalRows="poll.nbVotes" t:currentPage="page"/> + <t:pager t:nbRowsPerPage="3" t:nbTotalRows="poll.nbVotes" t:currentPage="page"/> </p:else> </t:if> <t:form t:id="voteForm" t:zone="pollZone">

1 0

r2909 - branches/pollen-1.2.3-1.2.x
by fdesbois＠users.chorem.org March 9, 2010

March 9, 2010

Author: fdesbois Date: 2010-03-09 13:16:13 +0100 (Tue, 09 Mar 2010) New Revision: 2909 Log: Change pom to release 1.2.4 from branche Modified: branches/pollen-1.2.3-1.2.x/pom.xml Modified: branches/pollen-1.2.3-1.2.x/pom.xml =================================================================== --- branches/pollen-1.2.3-1.2.x/pom.xml 2010-03-09 11:50:12 UTC (rev 2908) +++ branches/pollen-1.2.3-1.2.x/pom.xml 2010-03-09 12:16:13 UTC (rev 2909) @@ -345,9 +345,9 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.3</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.3</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.2.3</url> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.2.3-1.2.x</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.2.3-1.2.x</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/branches/pollen-1.2.3-1.2.x</url> </scm> <repositories>

1 0

r2908 - branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components
by fdesbois＠users.chorem.org March 9, 2010

March 9, 2010

Author: fdesbois Date: 2010-03-09 12:50:12 +0100 (Tue, 09 Mar 2010) New Revision: 2908 Log: Add some javadoc for Pager Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java 2010-03-09 11:39:25 UTC (rev 2907) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java 2010-03-09 11:50:12 UTC (rev 2908) @@ -24,12 +24,23 @@ */ public class Pager { + /** + * Number of total rows. + */ @Parameter(required = true) private int nbTotalRows; + /** + * Main element of the pager, the page which contains the pager have + * to manage this property (using @Persist for exemple) to ensure that + * the pager will done its work correctly. + */ @Parameter(required = true) private int currentPage; + /** + * Number of rows to show per page. + */ @Parameter(required = true) private int nbRowsPerPage; @@ -70,6 +81,15 @@ } + /** + * Use an action event to change the current page. The link refresh the + * entire page, no zone is managed yet. + * + * @param writer used to write a element + * @param index new page to change (argument of onAction method) + * @param text to write inside the a tag + * @param style of the css (class) for the a tag + */ protected void writeLink(MarkupWriter writer, int index, String text, String style) { Link link = resources.createEventLink(EventConstants.ACTION, @@ -79,10 +99,20 @@ writer.end(); } + /** + * Get the start index of the range shown. + * + * @return the start index for elements to show + */ public int getStartIndex() { return ( (currentPage - 1) * nbRowsPerPage); } + /** + * Get the end index of the range shown. + * + * @return the end index for elements to show + */ public int getEndIndex() { int end = (currentPage * nbRowsPerPage) - 1; if (end >= nbTotalRows) { @@ -91,22 +121,38 @@ return end; } - public int getFirstValue() { + protected int getFirstValue() { return getStartIndex() + 1; } - public int getLastValue() { + protected int getLastValue() { return getEndIndex() + 1; } + /** + * Test if there is previous elements before this actual range. + * + * @return true if there is previous elements, false otherwise + */ public boolean hasPrevious() { return getStartIndex() > 0; } + /** + * Test if there is next elements after this actual range. + * + * @return true if there is next elements, false otherwise + */ public boolean hasNext() { return getEndIndex() < (nbTotalRows - 1); } + /** + * Action event for changing page. The currentPage is changed to + * {@code newPage}. + * + * @param newPage to set + */ void onAction(int newPage) { currentPage = newPage; }

1 0

r2907 - branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components
by fdesbois＠users.chorem.org March 9, 2010

March 9, 2010

Author: fdesbois Date: 2010-03-09 12:39:25 +0100 (Tue, 09 Mar 2010) New Revision: 2907 Log: Evo #132 : add pager for votes Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java 2010-03-09 11:38:42 UTC (rev 2906) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java 2010-03-09 11:39:25 UTC (rev 2907) @@ -72,7 +72,8 @@ protected void writeLink(MarkupWriter writer, int index, String text, String style) { - Link link = resources.createEventLink(EventConstants.ACTION, new Object[] {index}); + Link link = resources.createEventLink(EventConstants.ACTION, + new Object[] {index}); writer.element("a", "href", link, "class", style); writer.write(text); writer.end();

1 0

r2906 - in branches/pollen-1.2.3-1.2.x/pollen-ui/src/main: java/org/chorem/pollen/ui/components java/org/chorem/pollen/ui/pages/poll resources/org/chorem/pollen/ui/components resources/org/chorem/pollen/ui/pages/poll webapp/poll
by fdesbois＠users.chorem.org March 9, 2010

March 9, 2010

Author: fdesbois Date: 2010-03-09 12:38:42 +0100 (Tue, 09 Mar 2010) New Revision: 2906 Log: Evo #132 : add pager for votes Added: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_en.properties branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_fr.properties Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml Added: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java (rev 0) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java 2010-03-09 11:38:42 UTC (rev 2906) @@ -0,0 +1,113 @@ +package org.chorem.pollen.ui.components; + + +import org.apache.tapestry5.ComponentResources; +import org.apache.tapestry5.EventConstants; +import org.apache.tapestry5.Link; +import org.apache.tapestry5.MarkupWriter; +import org.apache.tapestry5.annotations.Parameter; +import org.apache.tapestry5.ioc.Messages; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.slf4j.Logger; + + +/** + * Pager + * + * Created: 8 mars 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class Pager { + + @Parameter(required = true) + private int nbTotalRows; + + @Parameter(required = true) + private int currentPage; + + @Parameter(required = true) + private int nbRowsPerPage; + + @Inject + private ComponentResources resources; + + @Inject + private Messages messages; + + @Inject + private Logger log; + + void beginRender(MarkupWriter writer) { + if (log.isDebugEnabled()) { + log.debug("pager from : " + getFirstValue() + " to " + getLastValue()); + log.debug("current page : " + currentPage); + log.debug("max nb rows : " + nbTotalRows); + log.debug("has previous : " + hasPrevious()); + log.debug("has next : " + hasNext()); + log.debug("indexes from : " + getStartIndex() + " to " + getEndIndex()); + } + + writer.element("div", "class", "p-pager"); + if (hasPrevious()) { + writeLink(writer, currentPage - 1, "< ", "p-pager-previous"); + } + writer.element("strong"); + writer.write(getFirstValue() + " - " + getLastValue() + " " + + messages.get("over") + " " + nbTotalRows); + writer.end(); + if (hasNext()) { + writeLink(writer, currentPage + 1, " >", "p-pager-next"); + } + writer.end(); + } + + void afterRender(MarkupWriter writer) { + + } + + protected void writeLink(MarkupWriter writer, int index, + String text, String style) { + Link link = resources.createEventLink(EventConstants.ACTION, new Object[] {index}); + writer.element("a", "href", link, "class", style); + writer.write(text); + writer.end(); + } + + public int getStartIndex() { + return ( (currentPage - 1) * nbRowsPerPage); + } + + public int getEndIndex() { + int end = (currentPage * nbRowsPerPage) - 1; + if (end >= nbTotalRows) { + end = nbTotalRows - 1; + } + return end; + } + + public int getFirstValue() { + return getStartIndex() + 1; + } + + public int getLastValue() { + return getEndIndex() + 1; + } + + public boolean hasPrevious() { + return getStartIndex() > 0; + } + + public boolean hasNext() { + return getEndIndex() < (nbTotalRows - 1); + } + + void onAction(int newPage) { + currentPage = newPage; + } + +} Property changes on: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-08 16:23:31 UTC (rev 2905) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-09 11:38:42 UTC (rev 2906) @@ -28,6 +28,7 @@ import java.util.UUID; import org.apache.tapestry5.BindingConstants; +import org.apache.tapestry5.EventContext; import org.apache.tapestry5.ValidationException; import org.apache.tapestry5.annotations.Component; import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; @@ -71,6 +72,7 @@ import org.chorem.pollen.ui.base.ContextLink; import org.chorem.pollen.ui.components.FeedBack; import org.chorem.pollen.ui.components.ImageContextLink; +import org.chorem.pollen.ui.components.Pager; import org.chorem.pollen.ui.data.EvenOdd; import org.chorem.pollen.ui.data.Lien; import org.chorem.pollen.ui.data.PollAction; @@ -1080,19 +1082,19 @@ * * @param id l'identifiant du sondage et du votant */ - void onActivate(String id) { - param = id; + void onActivate(EventContext ec) { + param = ec.get(String.class, 0); // Initialisation du sondage - if (id != null && !"".equals(id)) { - String pollId = id.split(":", 2)[0]; + if (param != null && !"".equals(param)) { + String pollId = param.split(":", 2)[0]; poll = servicePoll.findPollByPollId(pollId); if (poll != null) { // Identification du votant - if (id.split(":", 2).length == 2) { - String accountId = id.split(":", 2)[1]; + if (param.split(":", 2).length == 2) { + String accountId = param.split(":", 2)[1]; pollAccount = servicePollAccount .findPollAccountByAccountId(accountId); pollAccountId = pollAccount.getId(); @@ -1161,4 +1163,34 @@ countPoll(); } + + /************** PAGER MANAGMENT *******************************************/ + + @InjectComponent + private Pager pager; + + private List<VoteDTO> votes; + + @Persist + private Integer page; + + public int getPage() { + return page == null ? 1 : page; + } + + @Log + public void setPage(int page) { + this.page = page; + } + + public List<VoteDTO> getVotes() { + if (votes == null) { + votes = new ArrayList<VoteDTO>(); + List<VoteDTO> all = poll.getVoteDTOs(); + for (int i = pager.getStartIndex(); i <= pager.getEndIndex(); i++) { + votes.add(all.get(i)); + } + } + return votes; + } } Added: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_en.properties =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_en.properties (rev 0) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_en.properties 2010-03-09 11:38:42 UTC (rev 2906) @@ -0,0 +1 @@ +over=over \ No newline at end of file Added: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_fr.properties =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_fr.properties (rev 0) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_fr.properties 2010-03-09 11:38:42 UTC (rev 2906) @@ -0,0 +1 @@ +over=sur Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties 2010-03-08 16:23:31 UTC (rev 2905) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties 2010-03-09 11:38:42 UTC (rev 2906) @@ -12,7 +12,7 @@ results-help=Voir les r\u00C3\u00A9sultats #vote -vote-size=%d votes on \u00E9t\u00E9 enregistr\u00E9s +vote-size=%d votes ont \u00E9t\u00E9 enregistr\u00E9s anonymous=anonyme description=Description voterName=Votant Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2010-03-08 16:23:31 UTC (rev 2905) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2010-03-09 11:38:42 UTC (rev 2906) @@ -46,8 +46,13 @@  <t:zone t:id="pollZone" t:show="show" t:update="show"> - <p>${voteSizeMessage}</p> - <t:feedback t:id="voteFeedback"/> + <t:if t:test="poll.anonymous"> + <p>${voteSizeMessage}</p> + <t:feedback t:id="voteFeedback"/> + <p:else> + <t:pager t:nbRowsPerPage="15" t:nbTotalRows="poll.nbVotes" t:currentPage="page"/> + </p:else> + </t:if> <t:form t:id="voteForm" t:zone="pollZone"> <table id="poll"> <thead> @@ -160,7 +165,7 @@ </t:if> <tbody> <t:unless t:test="poll.anonymous"> - <t:loop t:source="poll.voteDTOs" t:value="vote" volatile="true"> + <t:loop t:source="votes" t:value="vote" volatile="true"> <tr> <td class="${evenodd.next}"> <t:if test="${AccountFieldDisplayed}">

1 0

r2905 - branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/utils
by echatellier＠users.chorem.org March 8, 2010

March 8, 2010

Author: echatellier Date: 2010-03-08 17:23:31 +0100 (Mon, 08 Mar 2010) New Revision: 2905 Log: Add 'to' to send mail debug message Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java 2010-03-08 15:30:41 UTC (rev 2904) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java 2010-03-08 16:23:31 UTC (rev 2905) @@ -59,7 +59,7 @@ } if (log.isInfoEnabled()) { - log.info("Email envoyé."); + log.info("Mail sent to : " + to); if (log.isDebugEnabled()) { log.debug("Détail de l'email : " + "\ndate: " + email.getSentDate()

1 0

r2904 - in branches/pollen-1.2.3-1.2.x: pollen-business/src/main/java/org/chorem/pollen/business/business pollen-business/src/main/java/org/chorem/pollen/business/utils pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user pollen-ui/src/main/java/org/chorem/pollen/ui/services
by echatellier＠users.chorem.org March 8, 2010

March 8, 2010

Author: echatellier Date: 2010-03-08 16:30:41 +0100 (Mon, 08 Mar 2010) New Revision: 2904 Log: Misc doc update. Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/business/PreventRuleManager.java branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/UsersAdmin.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollModification.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Register.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/BackgroundWorkerImpl.java Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/business/PreventRuleManager.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/business/PreventRuleManager.java 2010-03-08 15:29:40 UTC (rev 2903) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/business/PreventRuleManager.java 2010-03-08 15:30:41 UTC (rev 2904) @@ -33,6 +33,9 @@ */ public class PreventRuleManager { + /** log. */ + private static final Log log = LogFactory.getLog(PreventRuleManager.class); + /** Représente l'action qui ne fait rien. */ public static final String NULL_ACTION = "nullAction"; /** Représente l'action qui écrit sur la sortie standard. */ @@ -40,9 +43,6 @@ /** Représente l'action qui envoi un email de notification. */ public static final String EMAIL_ACTION = "emailAction"; - /** log. */ - private static final Log log = LogFactory.getLog(PreventRuleManager.class); - private PreventRuleDTO preventRule = null; /** @@ -150,6 +150,8 @@ /** * Action qui ne fait rien. + * + * TODO set this method to protected */ public static void nullAction(Object data) { // ne fait rien @@ -157,6 +159,8 @@ /** * Action qui écrit sur la sortie standard. + * + * TODO set this method to protected */ public static void printAction(Object data) { String message = ""; @@ -168,14 +172,24 @@ /** * Action qui envoi un email de notification. + * + * @param data mail data + * + * TODO set this method to protected */ public static void emailAction(Object data) { Map<String, String> fields = null; - if (data instanceof Map) { + if (data instanceof Map<?, ?>) { fields = (Map<String, String>) data; + MailUtil.sendMail(fields.get("host"), Integer.parseInt(fields + .get("port")), fields.get("from"), fields.get("to"), fields + .get("title"), fields.get("msg")); } - MailUtil.sendMail(fields.get("host"), Integer.parseInt(fields - .get("port")), fields.get("from"), fields.get("to"), fields - .get("title"), fields.get("msg")); + else { + if (log.isWarnEnabled()) { + log.warn("emailAction data parameter is not instance of Map"); + } + } + } } Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java 2010-03-08 15:29:40 UTC (rev 2903) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java 2010-03-08 15:30:41 UTC (rev 2904) @@ -22,7 +22,7 @@ import org.apache.commons.mail.SimpleEmail; /** - * Classe permettant d'envoyer des mails. Basée sur SimpleMail. + * Classe permettant d'envoyer des mails. Basée sur {@link SimpleMail} (commons-email). * * @author rannou * @version $Id$ @@ -60,13 +60,14 @@ if (log.isInfoEnabled()) { log.info("Email envoyé."); + + if (log.isDebugEnabled()) { + log.debug("Détail de l'email : " + "\ndate: " + email.getSentDate() + + "\nhostname: " + email.getHostName() + "\nport: " + + email.getSmtpPort() + "\nfrom: " + + email.getFromAddress().toString() + "\nto: " + to + + "\nsubject: " + email.getSubject()); + } } - if (log.isDebugEnabled()) { - log.debug("Détail de l'email : " + "\ndate: " + email.getSentDate() - + "\nhostname: " + email.getHostName() + "\nport: " - + email.getSmtpPort() + "\nfrom: " - + email.getFromAddress().toString() + "\nto: " + to - + "\nsubject: " + email.getSubject()); - } } } Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/UsersAdmin.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/UsersAdmin.java 2010-03-08 15:29:40 UTC (rev 2903) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/UsersAdmin.java 2010-03-08 15:30:41 UTC (rev 2904) @@ -217,6 +217,8 @@ .getFirstName(), newUser.getLastName(), newUser.getLogin(), password, siteURL)); + // FIXME call directly MailUtil.sendMail() + // skip fill map, get from map... PreventRuleManager.emailAction(data); } Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollModification.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollModification.java 2010-03-08 15:29:40 UTC (rev 2903) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollModification.java 2010-03-08 15:30:41 UTC (rev 2904) @@ -553,6 +553,8 @@ data.put("msg", messages.format("votingEmail_msg", poll .getTitle(), account.getVotingId(), accountVoteURL)); + // FIXME call directly MailUtil.sendMail() + // skip fill map, get from map... PreventRuleManager.emailAction(data); } } Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-08 15:29:40 UTC (rev 2903) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-08 15:30:41 UTC (rev 2904) @@ -621,9 +621,7 @@ // Mail au créateur data.put("to", poll.getCreatorEmail()); - data - .put("title", messages.format("voteEmail_subject", poll - .getTitle())); + data.put("title", messages.format("voteEmail_subject", poll.getTitle())); data.put("msg", messages.format("voteEmail_msg", poll.getTitle(), poll .getVoteDTOs().size(), voteURL, modifURL)); Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Register.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Register.java 2010-03-08 15:29:40 UTC (rev 2903) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Register.java 2010-03-08 15:30:41 UTC (rev 2904) @@ -168,6 +168,8 @@ .getFirstName(), newUser.getLastName(), newUser.getLogin(), password1, siteURL)); + // FIXME call directly MailUtil.sendMail() + // skip fill map, get from map... PreventRuleManager.emailAction(data); } Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/BackgroundWorkerImpl.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/BackgroundWorkerImpl.java 2010-03-08 15:29:40 UTC (rev 2903) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/BackgroundWorkerImpl.java 2010-03-08 15:30:41 UTC (rev 2904) @@ -23,6 +23,7 @@ import java.util.Timer; import java.util.TimerTask; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.tapestry5.ioc.Messages; @@ -76,9 +77,8 @@ * Lancement des tâches en arrière-plan. */ public void executeTasks() { - if ("".equals(conf.getProperty("siteUrl"))) { - log - .warn("No property siteUrl. Reminder emails would not contain it"); + if (StringUtils.isEmpty(conf.getProperty("siteUrl"))) { + log.warn("No property siteUrl. Reminder emails would not contain it"); } // Exécution de la tâche toutes les 10 min

1 0