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

r2935 - in trunk/doc: . presentation-2010-03-11
by fdesbois＠users.chorem.org March 13, 2010

March 13, 2010

Author: fdesbois Date: 2010-03-13 19:23:06 +0100 (Sat, 13 Mar 2010) New Revision: 2935 Log: slides for Solution Linux Added: trunk/doc/presentation-2010-03-11/ trunk/doc/presentation-2010-03-11/.~lock.Presentation-Pollen.odp# trunk/doc/presentation-2010-03-11/Creation_choix.png trunk/doc/presentation-2010-03-11/Creation_infos.png trunk/doc/presentation-2010-03-11/Creation_liens.png trunk/doc/presentation-2010-03-11/Creation_options.png trunk/doc/presentation-2010-03-11/Presentation-Pollen.odp trunk/doc/presentation-2010-03-11/Resultats.png trunk/doc/presentation-2010-03-11/Vote_condorcet.png trunk/doc/presentation-2010-03-11/Vote_nombre.png trunk/doc/presentation-2010-03-11/Vote_pourcentage.png trunk/doc/presentation-2010-03-11/plan Added: trunk/doc/presentation-2010-03-11/.~lock.Presentation-Pollen.odp# =================================================================== --- trunk/doc/presentation-2010-03-11/.~lock.Presentation-Pollen.odp# (rev 0) +++ trunk/doc/presentation-2010-03-11/.~lock.Presentation-Pollen.odp# 2010-03-13 18:23:06 UTC (rev 2935) @@ -0,0 +1 @@ +,fdesbois,garfield,13.03.2010 19:21,file:///home/fdesbois/.openoffice.org/3; \ No newline at end of file Added: trunk/doc/presentation-2010-03-11/Creation_choix.png =================================================================== (Binary files differ) Property changes on: trunk/doc/presentation-2010-03-11/Creation_choix.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/doc/presentation-2010-03-11/Creation_infos.png =================================================================== (Binary files differ) Property changes on: trunk/doc/presentation-2010-03-11/Creation_infos.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/doc/presentation-2010-03-11/Creation_liens.png =================================================================== (Binary files differ) Property changes on: trunk/doc/presentation-2010-03-11/Creation_liens.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/doc/presentation-2010-03-11/Creation_options.png =================================================================== (Binary files differ) Property changes on: trunk/doc/presentation-2010-03-11/Creation_options.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/doc/presentation-2010-03-11/Presentation-Pollen.odp =================================================================== (Binary files differ) Property changes on: trunk/doc/presentation-2010-03-11/Presentation-Pollen.odp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/doc/presentation-2010-03-11/Resultats.png =================================================================== (Binary files differ) Property changes on: trunk/doc/presentation-2010-03-11/Resultats.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/doc/presentation-2010-03-11/Vote_condorcet.png =================================================================== (Binary files differ) Property changes on: trunk/doc/presentation-2010-03-11/Vote_condorcet.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/doc/presentation-2010-03-11/Vote_nombre.png =================================================================== (Binary files differ) Property changes on: trunk/doc/presentation-2010-03-11/Vote_nombre.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/doc/presentation-2010-03-11/Vote_pourcentage.png =================================================================== (Binary files differ) Property changes on: trunk/doc/presentation-2010-03-11/Vote_pourcentage.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/doc/presentation-2010-03-11/plan =================================================================== --- trunk/doc/presentation-2010-03-11/plan (rev 0) +++ trunk/doc/presentation-2010-03-11/plan 2010-03-13 18:23:06 UTC (rev 2935) @@ -0,0 +1,51 @@ +1 - Introduction : qu'est ce que Pollen + * Application WEB de sondage + * License GPL v3 + * Gestion de sondage avec ou sans compte utilisateur + * Vote restreint à certaines personnes ou non + * Dépouillement multiples + * Suivi RSS des sondages + +2 - Gestion du sondage + * 3 types de choix : DATE, IMAGE, TEXT + * Gestion liste/groupe de votants : CSV, LDAP + * Options : anonymat, résultats continus, notifications par email, ... + +3 - Screenshot creation + +4 - Screenshot liste (LDAP, CSV) + +5 - Votes + * Vote NORMAL : sélection simple des choix + * Vote POURCENTAGE : classement des choix en utilisant des pourcentages + * Vote NOMBRE : utilisation d'un nombre pour quantifier chaque choix (par exemple un prix) + * Vote CONDORCET : classement des choix par ordre de préférence + +6 - Screenshot NORMAL Date + +7 - Screenshot NOMBRE Text + +8 - Screenshot CONDORCET Image / groupe + +9 - Résultats + * Dépend du type de vote (NORMAL, CONDORCET, ...) + * Possibilité d'exécuter un autre dépouillement + * Possibilité de calculer les résultats par groupe de votants (si définis) + +10 - Screenshot résultat Image / groupe + +11 - Technologies / Références + * ToPIA : Framework pour la persistance + http://www.nuiton.org/projects/show/topia + * EUGene : Générateur de code + http://www.nuiton.org/projects/show/eugene + * Tapestry : Framework web + http://tapestry.apache.org/tapestry5.1/ + * Vote CONDORCET : + http://fr.wikipedia.org/wiki/M%C3%A9thode_Condorcet + * Code Lutin : + http://www.codelutin.com + + + +

1 0

r2934 - 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/dto pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll
by fdesbois＠users.chorem.org March 12, 2010

March 12, 2010

Author: fdesbois Date: 2010-03-12 18:18:11 +0100 (Fri, 12 Mar 2010) New Revision: 2934 Log: Ano #143 : Remove call to findByPollAccountId and push more parameters in VoteDTO to avoid multiple db call Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteConverter.java branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/dto/VoteDTO.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/converters/DataVoteConverter.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteConverter.java 2010-03-12 14:31:05 UTC (rev 2933) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteConverter.java 2010-03-12 17:18:11 UTC (rev 2934) @@ -29,6 +29,7 @@ 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.UserAccount; import org.chorem.pollen.business.persistence.Vote; import org.chorem.pollen.business.persistence.VoteDAO; import org.chorem.pollen.business.persistence.VoteToChoice; @@ -96,6 +97,11 @@ } if (eVote.getPollAccount() != null) { voteDTO.setPollAccountId(eVote.getPollAccount().getTopiaId()); + voteDTO.setName(eVote.getPollAccount().getVotingId()); + UserAccount user = eVote.getPollAccount().getUserAccount(); + if (user != null) { + voteDTO.setUserId(user.getTopiaId()); + } } if (eVote.getVotingList() != null) { voteDTO.setVotingListId(eVote.getVotingList().getTopiaId()); Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/dto/VoteDTO.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/dto/VoteDTO.java 2010-03-12 14:31:05 UTC (rev 2933) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/dto/VoteDTO.java 2010-03-12 17:18:11 UTC (rev 2934) @@ -39,6 +39,12 @@ private String pollAccountId = ""; + /** QUICK FIX to have pollAccount votingId **/ + private String name; + + /** QUICK FIX to have pollAccount userId **/ + private String userId; + private String pollId = ""; private String votingListId = ""; @@ -66,6 +72,22 @@ this.id = id; } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + public double getWeight() { return weight; } 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-12 14:31:05 UTC (rev 2933) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-12 17:18:11 UTC (rev 2934) @@ -553,28 +553,37 @@ // parcours des votes pour trouver celui correspondant au votingId // et contrôle du droit de modification + + if (log.isDebugEnabled()) { + log.debug("Nb votes : " + getVotes().size()); + log.debug("Nb votes in poll : " + poll.getNbVotes()); + } + + // FIXME !!!!!! SEEMS TO BE INDEFINITE while (i < getVotes().size() && !modifAllowed) { // account : compte associé au vote courant - String id = getVotes().get(i).getPollAccountId(); - PollAccountDTO account = servicePollAccount.findPollAccountById(id); + //String id = getVotes().get(i).getPollAccountId(); + //PollAccountDTO account = servicePollAccount.findPollAccountById(id); + VoteDTO curr = getVotes().get(i); // si le votant du vote correspond au votingId - if (account.getVotingId().equals(votingId)) { + if (curr.getName().equals(votingId)) { if (logger.isDebugEnabled()) { - logger.debug("vote account: " + account.getId()); + logger.debug("vote name: " + curr.getName()); + logger.debug("vote account: " + curr.getPollAccountId()); logger.debug("voting account: " + pollAccountId); } // si le votant du vote correspond au votant actuel (pollAccountId) if (pollAccountId != null - && pollAccountId.equals(account.getId())) { + && pollAccountId.equals(curr.getPollAccountId())) { modifAllowed = true; } // si l'utilisateur du vote correspond à l'utilisateur actuel (user) if (userExists && user.getId().length() > 0) { - modifAllowed = user.getId().equals(account.getUserId()); + modifAllowed = user.getId().equals(curr.getUserId()); } } @@ -803,11 +812,12 @@ } /** Retourne l'identifiant du votant du vote courant */ + // FIXME !!!!!! DON'T DO A QUERY FOR THAT public String getCurrentVotingId() { - String id = vote.getPollAccountId(); - String votingId = servicePollAccount.findPollAccountById(id) - .getVotingId(); - return votingId; +// String id = vote.getPollAccountId(); +// String votingId = servicePollAccount.findPollAccountById(id) +// .getVotingId(); + return vote.getName(); } /** Validation du champs de saisie du choix (texte). */

1 0

r2933 - 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 pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll
by fdesbois＠users.chorem.org March 12, 2010

March 12, 2010

Author: fdesbois Date: 2010-03-12 15:31:05 +0100 (Fri, 12 Mar 2010) New Revision: 2933 Log: - Loading not optimized for restricted poll (with list) - Must validate the accountUId from url to allow the vote Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePoll.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/ServiceVoteImpl.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/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties Modified: branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePoll.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePoll.java 2010-03-11 17:42:05 UTC (rev 2932) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePoll.java 2010-03-12 14:31:05 UTC (rev 2933) @@ -19,6 +19,7 @@ import java.util.List; import java.util.Map; +import org.chorem.pollen.business.dto.PollAccountDTO; import org.chorem.pollen.business.dto.PollDTO; /** @@ -126,4 +127,16 @@ * @return true si le vote a été ajouté */ public boolean addVoteToPoll(String pollId, String voteId); + + /** + * Return the pollAccount corresponding to the {@code accountUId} for the + * restricted {@code poll}. + * TODO : need JUnit test, must be done for 1.3 + * + * @param accountUId to check the restriction constraint + * @param poll reference + * @return the pollAccount found from poll or null if there is no + * pollAccount in poll restriction for the accountUId in argument + */ + public PollAccountDTO getRestrictedAccount(String accountUId, PollDTO poll); } \ No newline at end of file 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-11 17:42:05 UTC (rev 2932) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2010-03-12 14:31:05 UTC (rev 2933) @@ -25,7 +25,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.business.converters.DataPollAccountConverter; import org.chorem.pollen.business.converters.DataPollConverter; +import org.chorem.pollen.business.dto.PollAccountDTO; import org.chorem.pollen.business.dto.PollDTO; import org.chorem.pollen.business.persistence.PersonToList; import org.chorem.pollen.business.persistence.Poll; @@ -534,4 +536,43 @@ ContextUtil.doFinally(transaction); } } + + @Override + public PollAccountDTO getRestrictedAccount(String accountUId, PollDTO poll) { + TopiaContext transaction = null; + PollAccountDTO result = null; + try { + transaction = rootContext.beginTransaction(); + + if (log.isInfoEnabled()) { + log.info("getRestrictedAccount : accountUId = " + accountUId + + " _ pollUId = " + poll.getPollId()); + } + + // Use PersonToList association entity to find coherence between + // the poll and votingId + List<PersonToList> tmp = transaction.find( + "FROM " + PersonToList.class.getName() + + " WHERE pollAccount.accountId = :accountUId" + + " AND votingList.poll.pollId = :pollUId", + "accountUId", accountUId, + "pollUId", poll.getPollId()); + + if (tmp.size() > 0) { + PollAccount account = tmp.get(0).getPollAccount(); + DataPollAccountConverter converter = + new DataPollAccountConverter(); + converter.setTransaction(transaction); + result = converter.createPollAccountDTO(account); + } + + } catch (Exception eee) { + ContextUtil.doCatch(eee, transaction, + "Unable to retrieve restricted account with accountUId = " + + accountUId + " and poll with uid = " + poll.getPollId()); + } finally { + ContextUtil.doFinally(transaction); + } + return result; + } } \ No newline at end of file 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-11 17:42:05 UTC (rev 2932) +++ branches/pollen-1.2.3-1.2.x/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java 2010-03-12 14:31:05 UTC (rev 2933) @@ -27,10 +27,8 @@ 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; 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-11 17:42:05 UTC (rev 2932) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-03-12 14:31:05 UTC (rev 2933) @@ -58,7 +58,6 @@ import org.chorem.pollen.business.dto.ResultListDTO; import org.chorem.pollen.business.dto.UserDTO; import org.chorem.pollen.business.dto.VoteDTO; -import org.chorem.pollen.business.dto.VotingListDTO; import org.chorem.pollen.business.services.ServiceChoice; import org.chorem.pollen.business.services.ServiceComment; import org.chorem.pollen.business.services.ServicePoll; @@ -461,26 +460,53 @@ // Contrôle de la présence du votant dans les listes de votants // du sondage (si le sondage n'est pas libre) - if (!isFreePoll()) { - restrictedListsForbidden = true; - for (VotingListDTO list : poll.getVotingListDTOs()) { - for (PollAccountDTO account : list.getPollAccountDTOs()) { - if (pollAccount.getVotingId().equals(account.getVotingId())) { - restrictedListsForbidden = false; - pollAccount = servicePollAccount - .findPollAccountById(account.getId()); - pollAccount.setVotingListId(list.getId()); - pollAccount.setWeight(account.getWeight()); - logger.debug("Compte \"" + account.getVotingId() - + "\" présent dans la liste \"" - + list.getName() + "\" (poids=" - + account.getWeight() + ")"); - } +// if (!isFreePoll()) { +// restrictedListsForbidden = true; +// for (VotingListDTO list : poll.getVotingListDTOs()) { +// for (PollAccountDTO account : list.getPollAccountDTOs()) { +// if (pollAccount.getVotingId().equals(account.getVotingId())) { +// restrictedListsForbidden = false; +// pollAccount = servicePollAccount +// .findPollAccountById(account.getId()); +// pollAccount.setVotingListId(list.getId()); +// pollAccount.setWeight(account.getWeight()); +// logger.debug("Compte \"" + account.getVotingId() +// + "\" présent dans la liste \"" +// + list.getName() + "\" (poids=" +// + account.getWeight() + ")"); +// } +// } +// } +// } + + // The calcul of alreadyVoted will be needed for no double votingId + // Carefull, not correct for an anonymous vote + alreadyVoted = serviceVote.hasAlreadyVoted(votingId, poll); + + // Check for restricted poll + if (!alreadyVoted && !isFreePoll()) { + if (getAccountUId() != null) { + // The accountUId must be valid for the poll + PollAccountDTO restrictedAccount = + servicePoll.getRestrictedAccount(getAccountUId(), poll); + + if (restrictedAccount != null) { + // PollAccount is replaced by the good account from db + pollAccount = restrictedAccount; + // Refresh alreadyVoted value depends on pollAccount + alreadyVoted = pollAccount.isHasVoted(); + // Existing account is null is forbidden for a restricted poll + } else { + restrictedListsForbidden = true; } + // Not allowed to vote without an accountUId + } else { + restrictedListsForbidden = true; } + if (restrictedListsForbidden) { - voteForm.recordError(nameField, messages.format( - "restrictedListsForbidden", pollAccount.getVotingId())); + voteForm.recordError(nameField, + messages.get("restrictedListsForbidden")); } } @@ -498,14 +524,7 @@ pollAccount.setUserId(user.getId()); } else { pollAccount.setUserId(""); - } - - // Contrôle si le votant n'a pas déjà voté - if (log.isInfoEnabled()) { - log.info("BUSINESS REQUEST [hasAlreadyVoted]"); - } - alreadyVoted = serviceVote.hasAlreadyVoted( - pollAccount.getVotingId(), poll); + } modifAllowed = isModifAllowed(pollAccount.getVotingId()); if (alreadyVoted && !modifAllowed) { @@ -1084,10 +1103,9 @@ if (poll != null) { // Identification du votant - if (param.split(":", 2).length == 2) { - String accountId = param.split(":", 2)[1]; + if (getAccountUId() != null) { pollAccount = servicePollAccount - .findPollAccountByAccountId(accountId); + .findPollAccountByAccountId(getAccountUId()); pollAccountId = pollAccount.getId(); } @@ -1134,6 +1152,15 @@ } } + private String accountUId; + + public String getAccountUId() { + if (accountUId == null && param.split(":", 2).length == 2) { + accountUId = param.split(":", 2)[1]; + } + return accountUId; + } + /** * Méthode appelée au moment de la désactivation de la page * Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties 2010-03-11 17:42:05 UTC (rev 2932) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties 2010-03-12 14:31:05 UTC (rev 2933) @@ -51,7 +51,7 @@ #messages pollNotFound=No such poll exists. Please make sure that you are using the correct link and copy it completely into your browser's address field. anonymousForbidden=Anonymous vote is forbidden for this poll. Enter a name. -restrictedListsForbidden=The poll is restricted and the name %s is not allowed. +restrictedListsForbidden=The poll is restricted and you are not allowed to vote. Check if you have correctly used the link sent to you by email. alreadyVoted=Someone has already used the name %s to vote. tooManyChoices=The maximal number of choices is %d. not100percent=The sum of the values must be equals to 100. 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-11 17:42:05 UTC (rev 2932) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties 2010-03-12 14:31:05 UTC (rev 2933) @@ -51,7 +51,7 @@ #messages pollNotFound=Il n'y a pas de sondage \u00E0 cette adresse. Veuillez verifier que vous utilisez le lien correcte et copiez-le compl\u00E8tement dans le champ d'adresse de votre navigateur. anonymousForbidden=Le vote anonyme est interdit pour ce sondage. Saisissez un nom. -restrictedListsForbidden=Le sondage est restreint et le nom %s n'est pas autoris\u00E9. +restrictedListsForbidden=Le sondage est restreint et vous n'\u00EAtes pas autoris\u00E9 \u00E0 voter. V\u00E9rifiez que vous avez bien utiliser le lien qui vous a \u00E9t\u00E9 envoy\u00E9. alreadyVoted=Une personne a d\u00E9j\u00E0 vot\u00E9 sous le nom %s. tooManyChoices=Le nombre de choix maximal est de %d. not100percent=La somme des valeurs doit \u00EAtre \u00E9gale \u00E0 100.

1 0

r2932 - in branches/pollen-1.2.3-1.2.x: . pollen-business pollen-ui pollen-votecounting
by fdesbois＠users.chorem.org March 11, 2010

March 11, 2010

Author: fdesbois Date: 2010-03-11 18:42:05 +0100 (Thu, 11 Mar 2010) New Revision: 2932 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/pollen-1.2.3-1.2.x/pollen-business/pom.xml branches/pollen-1.2.3-1.2.x/pollen-ui/pom.xml branches/pollen-1.2.3-1.2.x/pollen-votecounting/pom.xml branches/pollen-1.2.3-1.2.x/pom.xml Modified: branches/pollen-1.2.3-1.2.x/pollen-business/pom.xml =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/pom.xml 2010-03-11 17:42:01 UTC (rev 2931) +++ branches/pollen-1.2.3-1.2.x/pollen-business/pom.xml 2010-03-11 17:42:05 UTC (rev 2932) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.4</version> + <version>1.2.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/pom.xml =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/pom.xml 2010-03-11 17:42:01 UTC (rev 2931) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/pom.xml 2010-03-11 17:42:05 UTC (rev 2932) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.4</version> + <version>1.2.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.2.3-1.2.x/pollen-votecounting/pom.xml =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-votecounting/pom.xml 2010-03-11 17:42:01 UTC (rev 2931) +++ branches/pollen-1.2.3-1.2.x/pollen-votecounting/pom.xml 2010-03-11 17:42:05 UTC (rev 2932) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.4</version> + <version>1.2.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.2.3-1.2.x/pom.xml =================================================================== --- branches/pollen-1.2.3-1.2.x/pom.xml 2010-03-11 17:42:01 UTC (rev 2931) +++ branches/pollen-1.2.3-1.2.x/pom.xml 2010-03-11 17:42:05 UTC (rev 2932) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.4</version> + <version>1.2.5-SNAPSHOT</version> <modules> <module>pollen-ui</module> @@ -345,9 +345,9 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.4</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.4</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.2.4</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

r2931 - in tags: . pollen-1.2.4
by fdesbois＠users.chorem.org March 11, 2010

March 11, 2010

Author: fdesbois Date: 2010-03-11 18:42:01 +0100 (Thu, 11 Mar 2010) New Revision: 2931 Log: [maven-scm] copy for tag pollen-1.2.4 Added: tags/pollen-1.2.4/ Property changes on: tags/pollen-1.2.4 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml Added: svn:mergeinfo +

1 0

r2930 - in branches/pollen-1.2.3-1.2.x: . pollen-business pollen-ui pollen-votecounting
by fdesbois＠users.chorem.org March 11, 2010

March 11, 2010

Author: fdesbois Date: 2010-03-11 18:41:57 +0100 (Thu, 11 Mar 2010) New Revision: 2930 Log: [maven-release-plugin] prepare release pollen-1.2.4 Modified: branches/pollen-1.2.3-1.2.x/pollen-business/pom.xml branches/pollen-1.2.3-1.2.x/pollen-ui/pom.xml branches/pollen-1.2.3-1.2.x/pollen-votecounting/pom.xml branches/pollen-1.2.3-1.2.x/pom.xml Modified: branches/pollen-1.2.3-1.2.x/pollen-business/pom.xml =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-business/pom.xml 2010-03-11 16:46:41 UTC (rev 2929) +++ branches/pollen-1.2.3-1.2.x/pollen-business/pom.xml 2010-03-11 17:41:57 UTC (rev 2930) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.4-SNAPSHOT</version> + <version>1.2.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/pom.xml =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/pom.xml 2010-03-11 16:46:41 UTC (rev 2929) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/pom.xml 2010-03-11 17:41:57 UTC (rev 2930) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.4-SNAPSHOT</version> + <version>1.2.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.2.3-1.2.x/pollen-votecounting/pom.xml =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-votecounting/pom.xml 2010-03-11 16:46:41 UTC (rev 2929) +++ branches/pollen-1.2.3-1.2.x/pollen-votecounting/pom.xml 2010-03-11 17:41:57 UTC (rev 2930) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.4-SNAPSHOT</version> + <version>1.2.4</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: branches/pollen-1.2.3-1.2.x/pom.xml =================================================================== --- branches/pollen-1.2.3-1.2.x/pom.xml 2010-03-11 16:46:41 UTC (rev 2929) +++ branches/pollen-1.2.3-1.2.x/pom.xml 2010-03-11 17:41:57 UTC (rev 2930) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.4-SNAPSHOT</version> + <version>1.2.4</version> <modules> <module>pollen-ui</module> @@ -345,9 +345,9 @@  <scm> - <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> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.4</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.2.4</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.2.4</url> </scm> <repositories>

1 0

r2929 - branches/pollen-1.2.3-1.2.x/pollen-ui/src/test/java/org/chorem/pollen/ui/utils
by echatellier＠users.chorem.org March 11, 2010

March 11, 2010

Author: echatellier Date: 2010-03-11 17:46:41 +0100 (Thu, 11 Mar 2010) New Revision: 2929 Log: Disable test. (send real mail :) ) Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/SendMailTest.java Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/SendMailTest.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/SendMailTest.java 2010-03-11 16:20:23 UTC (rev 2928) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/SendMailTest.java 2010-03-11 16:46:41 UTC (rev 2929) @@ -29,7 +29,7 @@ import org.chorem.pollen.ui.services.Configuration; import org.chorem.pollen.ui.services.ConfigurationImpl; import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.Ignore; /** * Class for send mail storage class. @@ -40,6 +40,7 @@ * Last update : $Date$ * By : $Author$ */ +@Ignore public class SendMailTest { protected static Configuration configuration; @@ -61,7 +62,14 @@ Thread.sleep(3000); } - @Test + /** + * Test to add mail and send mail. + * + * WARNING : This test really send mail, don't set it automatic. + * + * @throws IOException + * @throws InterruptedException + */ public void testAddMail() throws IOException, InterruptedException { List<Map<String, String>> mailList = new ArrayList<Map<String,String>>();

1 0

r2928 - branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll
by echatellier＠users.chorem.org March 11, 2010

March 11, 2010

Author: echatellier Date: 2010-03-11 17:20:23 +0100 (Thu, 11 Mar 2010) New Revision: 2928 Log: Fix accent Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties 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-10 18:08:53 UTC (rev 2927) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties 2010-03-11 16:20:23 UTC (rev 2928) @@ -6,7 +6,7 @@ pollType-label=Type de sondage : normalVote-help=Vote normal : voter pour le ou les choix pr\u00E9f\u00E9r\u00E9s. percentageVote-help=Vote par pourcentage : r\u00E9partir les choix de mani\u00E8re \u00E0 obtenir 100%% au total. -condorcetVote-help=Vote Condorcet : classer les choix par ordre de pr\u00E9f\u00E9rence de 1 \u00C3\u00A0 N (1=pr\u00E9f\u00E9r\u00E9). Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la m\u00EAme valeur. +condorcetVote-help=Vote Condorcet : classer les choix par ordre de pr\u00E9f\u00E9rence de 1 \u00E0 N (1=pr\u00E9f\u00E9r\u00E9). Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la m\u00EAme valeur. numberVote-help=Vote par nombre : La r\u00C3\u00A9ponse est libre, laissez vide ou entrez un nombre entier results=R\u00E9sultats results-help=Voir les r\u00E9sultats

1 0

r2927 - in branches/pollen-1.2.3-1.2.x/pollen-ui/src: main/java/org/chorem/pollen/ui/pages/poll main/java/org/chorem/pollen/ui/services main/java/org/chorem/pollen/ui/utils main/resources test/java/org/chorem/pollen/ui/utils
by echatellier＠users.chorem.org March 10, 2010

March 10, 2010

Author: echatellier Date: 2010-03-10 19:08:53 +0100 (Wed, 10 Mar 2010) New Revision: 2927 Log: #136 : envoi de mail en masse (temporis?\195?\169e, avec reprise au redemarrage) Added: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/SendMail.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/SendMailTest.java Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/pollen.properties Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java 2010-03-10 12:54:05 UTC (rev 2926) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java 2010-03-10 18:08:53 UTC (rev 2927) @@ -17,6 +17,7 @@ package org.chorem.pollen.ui.pages.poll; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -47,7 +48,6 @@ import org.apache.tapestry5.ioc.annotations.Symbol; import org.apache.tapestry5.ioc.services.PropertyAccess; import org.apache.tapestry5.json.JSONObject; -import org.apache.tapestry5.services.Request; import org.apache.tapestry5.upload.services.UploadSymbols; import org.chorem.pollen.business.business.PreventRuleManager; import org.chorem.pollen.business.dto.ChoiceDTO; @@ -75,6 +75,7 @@ import org.chorem.pollen.ui.services.Configuration; import org.chorem.pollen.ui.utils.FeedUtil; import org.chorem.pollen.ui.utils.ImageUtil; +import org.chorem.pollen.ui.utils.SendMail; import org.chorem.pollen.ui.utils.UnitConverter; import org.slf4j.Logger; @@ -355,6 +356,9 @@ private ServicePollAccount servicePollAccount; @Inject private ServiceList serviceList; + + @Inject + private SendMail sendMailService; /** * Méthode appelée lorsqu'on souhaite accéder à l'étape suivante de la @@ -881,11 +885,13 @@ // Mails aux votants for (VotingListDTO list : poll.getVotingListDTOs()) { + + List<Map<String, String>> mailList = new ArrayList<Map<String,String>>(); for (PollAccountDTO account : list.getPollAccountDTOs()) { if (account.getEmail() != null) { String accountVoteURL = voteURL + ":" + account.getAccountId(); - data.put("to", account.getEmail()); + /*data.put("to", account.getEmail()); data.put("title", messages.format("votingEmail_subject", poll.getTitle())); data.put("msg", messages.format("votingEmail_msg", poll @@ -894,9 +900,25 @@ // FIXME call directly MailUtil.sendMail() // skip fill map, get from map... - PreventRuleManager.emailAction(data); + PreventRuleManager.emailAction(data);*/ + + Map<String, String> mailData = new HashMap<String, String>(); + mailData.put("receiver", account.getEmail()); + mailData.put("subject", messages.format("votingEmail_subject",poll.getTitle())); + mailData.put("body", messages.format("votingEmail_msg", poll.getTitle(), account.getVotingId(),accountVoteURL)); + mailList.add(mailData); } } + + // send mail preparation + try { + sendMailService.prepareMails(poll.getId(), mailList); + sendMailService.wakeUp(); + } catch (IOException ex) { + if (log.isErrorEnabled()) { + log.error("Can't prepare send mail on disk, mail won't be send !!!", ex); + } + } } } Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java 2010-03-10 12:54:05 UTC (rev 2926) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java 2010-03-10 18:08:53 UTC (rev 2927) @@ -37,6 +37,7 @@ import org.chorem.pollen.business.services.ServiceResults; import org.chorem.pollen.business.services.ServiceUser; import org.chorem.pollen.business.services.ServiceVote; +import org.chorem.pollen.ui.utils.SendMail; import org.slf4j.Logger; /** @@ -164,7 +165,32 @@ return new BackgroundWorkerImpl(messages, configuration, servicePoll); } + /* + * Contribution au démarrage de services tapestry. + * + * Ajout de SendMail + * + * @param configuration configuration tapestry + * @param conf configuration pollen + * + public static void contributeRegistryStartup(OrderedConfiguration<Runnable> configuration, Configuration conf) { + configuration.add("SendMail", new SendMail(conf)); + }*/ + /** + * Init send mail service. + * + * @param conf + * @return + */ + @EagerLoad + public SendMail buildSendMail(Configuration conf) { + SendMail res = new SendMail(conf); + res.start(); + return res; + } + + /** * Make configuration from a Properties file available as symbols. */ public PropertiesFileSymbolProvider buildConfigPropertiesFileSymbolProvider( Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java 2010-03-10 12:54:05 UTC (rev 2926) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java 2010-03-10 18:08:53 UTC (rev 2927) @@ -33,6 +33,7 @@ public static final String PROP_CONTACT_EMAIL = "adminEmail"; public static final String PROP_NB_VOTES_PER_PAGE = "pollen.ui.nbVotesPerPage"; + public static final String PROP_EMAIL_DIRECTORY = "pollen.emails.directory"; /** * Retourne les propriétés. Added: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/SendMail.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/SendMail.java (rev 0) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/SendMail.java 2010-03-10 18:08:53 UTC (rev 2927) @@ -0,0 +1,249 @@ +/* *##% Pollen + * Copyright (C) 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ + +package org.chorem.pollen.ui.utils; + +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.io.Writer; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.apache.commons.io.FileUtils; +import org.chorem.pollen.business.utils.MailUtil; +import org.chorem.pollen.ui.services.Configuration; +import org.h2.util.IOUtils; +import org.nuiton.util.FileUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import au.com.bytecode.opencsv.CSVReader; +import au.com.bytecode.opencsv.CSVWriter; + +/** + * Mass mail management class. + * + * This class store email to send in a csv file, and send it (one per second) in + * a second time. + * This class can restart to send mail at application restart. + * + * For a mass mail sending to start, following files must be present: + * <ul> + * <li>xxx.emails : CSV file ("email", "subject", "body")</li> + * <li>xxx.index : next index to manage ( inited at 0)</li> + * </ul> + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SendMail extends Thread { + + /** logger. */ + private static final Logger log = LoggerFactory.getLogger(SendMail.class); + + public static final String EXTENSION_MAIL = ".mail"; + public static final String EXTENSION_INDEX = ".index"; + + /** Pollen configuration. */ + protected Configuration configuration; + + /** Mail storage directory. */ + protected File mailStorageDirectory; + + public SendMail(Configuration configuration) { + + this.configuration = configuration; + + // get email directory in configuration + // create it if not exists + String filename = configuration.getProperty(Configuration.PROP_EMAIL_DIRECTORY); + mailStorageDirectory = new File(filename); + if (!mailStorageDirectory.exists()) { + if (mailStorageDirectory.mkdirs()) { + if (log.isDebugEnabled()) { + log.debug("Email storage directory created in : " + mailStorageDirectory.getAbsolutePath()); + } + } + } + } + + /* + * @see java.lang.Runnable#run() + */ + @Override + public void run() { + + // try to find existing files + while (true) { + try { + sendAllMails(); + + // bloque thread until next notify + sleep(); + } + catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Error during SendMail main loop", ex); + } + } + } + } + + protected synchronized void sleep() throws InterruptedException { + wait(); + } + + public synchronized void wakeUp() { + notifyAll(); + } + + /** + * Look for all xx.index file, and restart mail sending on + * non ending mass mail sending. + * + * After execution, delete mail and index file. + * @throws IOException + */ + protected void sendAllMails() throws IOException { + + // don't do for, allways take the first found + // a new one can be created when managing one other + List<File> indexFiles = null; + do { + + // filter is java valid : .*\\.index + indexFiles = FileUtil.find(mailStorageDirectory, ".*\\" + EXTENSION_INDEX, false); + + if (!indexFiles.isEmpty()) { + File indexFile = indexFiles.get(0); + // convert index content to int + String indexContent = FileUtils.readFileToString(indexFile, "UTF-8"); + int index = Integer.parseInt(indexContent); + + // get mail content file + File mailFile = new File(indexFile.getAbsolutePath().replaceAll(EXTENSION_INDEX + "$", EXTENSION_MAIL)); + + if (log.isDebugEnabled()) { + log.debug("Managing mail file : " + mailFile + " (from index " + indexContent + ")"); + } + + Reader indexFileReader = new BufferedReader(new FileReader(mailFile)); + CSVReader cvsReader = new CSVReader(indexFileReader); + + int currentIndex = 0; + String[] currentLine = cvsReader.readNext(); + while (currentLine != null) { + String receiver = currentLine[0]; + String subject = currentLine[1]; + String body = currentLine[2]; + + log.debug("Props = " + configuration.getConf()); + + // index contains next index to treat so == is ok + if (currentIndex >= index) { + MailUtil.sendMail(configuration.getProperty("email_host"), + Integer.parseInt(configuration.getProperty("email_port")), + configuration.getProperty("email_from"), + receiver, subject, body); + + // index contains next index to treat + FileUtils.writeStringToFile(indexFile, String.valueOf(currentIndex + 1)); + + // wait 2 secondes between each mail to not + // load smtp server + try { + Thread.sleep(1000); + } catch (InterruptedException ex) { + if (log.isErrorEnabled()) { + log.error("Can't wait between mail", ex); + } + } + } + else { + if (log.isDebugEnabled()) { + log.debug("Mail to " + receiver + " already sent in a previous execution, skip."); + } + } + + currentIndex++; + currentLine = cvsReader.readNext(); + } + + // delete woth index and mail file + mailFile.delete(); + indexFile.delete(); + } + else { + if (log.isInfoEnabled()) { + log.info("No more index mail index file found, go to sleep a while :)"); + } + } + } while (!indexFiles.isEmpty()); + } + + /** + * Prepare mail list. + * + * TODO : improve configuration reading + * + * @param id + * @param mailData + * @throws IOException + */ + public void prepareMails(String id, List<Map<String, String>> mailData) throws IOException { + + Writer fileWriter = null; + CSVWriter cvsWriter = null; + try { + + // write CSV datas + File emailFile = new File(mailStorageDirectory, id + EXTENSION_MAIL); + fileWriter = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(emailFile))); + cvsWriter = new CSVWriter(fileWriter); + + for (Map<String, String> singleMailData : mailData) { + String[] nextLine = new String[] { + singleMailData.get("receiver"), + singleMailData.get("subject"), + singleMailData.get("body") + }; + cvsWriter.writeNext(nextLine); + } + + // write index (default to 0) + File indexFile = new File(mailStorageDirectory, id + EXTENSION_INDEX); + FileUtil.writeString(indexFile, "0"); + } + finally { + if (cvsWriter != null) { + cvsWriter.close(); + } + IOUtils.closeSilently(fileWriter); + } + + } +} Property changes on: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/SendMail.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/pollen.properties =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/pollen.properties 2010-03-10 12:54:05 UTC (rev 2926) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/main/resources/pollen.properties 2010-03-10 18:08:53 UTC (rev 2927) @@ -45,6 +45,9 @@ ## R\u00C3\u00A9pertoire des flux de syndication (Atom) feedDir=.pollen/feeds +## Repertoire de stockage des mails a envoyer +pollen.emails.directory=.pollen/emails + ## Nombre de votes affiches sur une page pollen.ui.nbVotesPerPage=100 Added: branches/pollen-1.2.3-1.2.x/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/SendMailTest.java =================================================================== --- branches/pollen-1.2.3-1.2.x/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/SendMailTest.java (rev 0) +++ branches/pollen-1.2.3-1.2.x/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/SendMailTest.java 2010-03-10 18:08:53 UTC (rev 2927) @@ -0,0 +1,92 @@ +/* *##% Pollen + * Copyright (C) 2010 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ + +package org.chorem.pollen.ui.utils; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import junit.framework.Assert; + +import org.chorem.pollen.ui.services.Configuration; +import org.chorem.pollen.ui.services.ConfigurationImpl; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Class for send mail storage class. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SendMailTest { + + protected static Configuration configuration; + protected static SendMail sendMail; + + @BeforeClass + public static void init() throws InterruptedException { + + Properties props = new Properties(); + props.setProperty(Configuration.PROP_EMAIL_DIRECTORY, "target" + File.separator + "massmail"); + // FIXME replace literal strings + props.setProperty("email_host", "smtp"); + props.setProperty("email_port", "25"); + props.setProperty("email_from", "pollenreminder(a)codelutin.com"); + + configuration = new ConfigurationImpl(props); + sendMail = new SendMail(configuration); + sendMail.start(); + Thread.sleep(3000); + } + + @Test + public void testAddMail() throws IOException, InterruptedException { + List<Map<String, String>> mailList = new ArrayList<Map<String,String>>(); + + Map<String, String> mailMap = new HashMap<String, String>(); + mailMap.put("receiver", "chatellier+test(a)codelutin.com"); + mailMap.put("subject", "Test 18:00"); + mailMap.put("body", "Test body"); + + Map<String, String> mailMap2 = new HashMap<String, String>(); + mailMap2.put("receiver", "chorlet+test(a)codelutin.com"); + mailMap2.put("subject", "CR, CR CR !!! 18:00"); + mailMap2.put("body", "Des cr, encore des \"CRs\" !!!"); + + mailList.add(mailMap); + mailList.add(mailMap2); + + sendMail.prepareMails("test", mailList); + + Assert.assertTrue(new File(configuration.getProperty(Configuration.PROP_EMAIL_DIRECTORY), "test.mail").exists()); + Assert.assertTrue(new File(configuration.getProperty(Configuration.PROP_EMAIL_DIRECTORY), "test.mail").exists()); + sendMail.wakeUp(); + + // TODO , en 5 secondes, il aura le temps d'envoyer 2 mails ? + Thread.sleep(5000); + Assert.assertFalse(new File(configuration.getProperty(Configuration.PROP_EMAIL_DIRECTORY), "test.mail").exists()); + Assert.assertFalse(new File(configuration.getProperty(Configuration.PROP_EMAIL_DIRECTORY), "test.mail").exists()); + } +} Property changes on: branches/pollen-1.2.3-1.2.x/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/SendMailTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r2926 - in trunk/src/site: . fr/resources fr/rst resources rst
by jcouteau＠users.chorem.org March 10, 2010

March 10, 2010

Author: jcouteau Date: 2010-03-10 13:54:05 +0100 (Wed, 10 Mar 2010) New Revision: 2926 Log: Add doc about importing voting lists Added: trunk/src/site/fr/resources/createVotingList.png trunk/src/site/fr/resources/votingList.png trunk/src/site/fr/rst/importVotersList.rst trunk/src/site/resources/createVotingList.png trunk/src/site/resources/votingList.png trunk/src/site/rst/importVotersList.rst Modified: trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Added: trunk/src/site/fr/resources/createVotingList.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/fr/resources/createVotingList.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/fr/resources/votingList.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/fr/resources/votingList.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/fr/rst/importVotersList.rst =================================================================== --- trunk/src/site/fr/rst/importVotersList.rst (rev 0) +++ trunk/src/site/fr/rst/importVotersList.rst 2010-03-10 12:54:05 UTC (rev 2926) @@ -0,0 +1,63 @@ +=========================== +Créer des listes de votants +=========================== + +:Author: Jean Couteau +:Contact: +:Revision: $Revision: 2738 $ +:Date: $Date: 2009-08-20 17:12:21 +0200 (jeu 20 aoû 2009) $ + +Créer des listes de votants à la main +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Rendez-vous sur Sondages > Listes de votants. Choisissez un nom pour votre liste +de votants et cliquez sur 'Créer'. Votre liste de votants est créée et vide. +Vous pouvez alors ajouter des personnes a cette liste en remplissant noms et +emails et en cliquant sur 'Ajouter'. + +.. image::createVotingList.png + :alt: ajouter des personnes à une liste de votants + +Vous pouvez utiliser votre liste lorsque vous créez des sondages en étant +enregistré. + +Importer une liste de votants depuis un ficier CSV +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Dans le but de gagner du temps lorsque vous créer de grosses listes de votants, +vous pouvez importer votre liste depuis un fichier CSV lorsque vous êtes +enregistré. + +Format du fichier CSV +--------------------- + +Votre fichier CSV n'a pas besoin d'avoir de nom de colonnes, il doit être sous +le format suivant : + + nom,email,poids + +Par exemple :: + + titi,titi(a)dummymail.com,1 + toto,toto(a)dummymail.com,2 + tutu,tutu(a)dummymail.com,1 + +Importer la liste +----------------- + +Rendez-vous sur Sondages > Listes de votants. Choisissez un nom pour votre liste +de votants, sélectionnez votre fichier CSV et cliquez sur 'Créer'. Votre liste +de votants est créée et vous pouvez l'utiliser lorsque vous créez des sondages +en étant enregistré. + +.. image::votingList.png + :alt: Une liste de votants + +Modifier la liste importée +-------------------------- + +Vous pouvez modifier la liste de votant importée en ajoutant des votants, +changeant des addresses emails, des noms ou en enlevant des votants. + +Importer une liste de votants depuis un serveur LDAP +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Added: trunk/src/site/resources/createVotingList.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/createVotingList.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/resources/votingList.png =================================================================== (Binary files differ) Property changes on: trunk/src/site/resources/votingList.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/site/rst/importVotersList.rst =================================================================== --- trunk/src/site/rst/importVotersList.rst (rev 0) +++ trunk/src/site/rst/importVotersList.rst 2010-03-10 12:54:05 UTC (rev 2926) @@ -0,0 +1,53 @@ +=================== +Create voting Lists +=================== + +:Author: Jean Couteau +:Contact: +:Revision: $Revision: 2738 $ +:Date: $Date: 2009-08-20 17:12:21 +0200 (jeu 20 aoû 2009) $ + +Create voting lists by hand +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Go to Polls > Voting lists. You have to choose a name for your voting list and +click on 'Create'. You voting list is created and empty. You can then add people +to that list by filling in name and emails and Clicking on 'Add' + +.. image::createVotingList.png + :alt: add people to a voting list + +You can use your list when you create polls logged in. + +Import voting list from CSV +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +In order to gain time when you want to create big voting lists, you can import +your list from CSV files when you are logged in. + +CSV file format +--------------- + +Your CSV file do not need to have column names, it has to be under the following +format : + + name,email,weight + +For example :: + + titi,titi(a)dummymail.com,1 + toto,toto(a)dummymail.com,2 + tutu,tutu(a)dummymail.com,1 + +Import list +----------- + +Go to Polls > Voting lists. You have to choose a name for your voting list, +select your CSV file and click on 'Create'. You voting list is created and you +can use it when you create polls logged in. + +.. image::votingList.png + :alt: A voting list + +Import voting list from LDAP +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-03-10 11:43:56 UTC (rev 2925) +++ trunk/src/site/site_en.xml 2010-03-10 12:54:05 UTC (rev 2926) @@ -36,6 +36,7 @@ <item name="User" href="user.html"> <item name="Install" href="install.html"/> <item name="Tutorial" href="tutoriel.html"/> + <item name="Import voting lists" href="importVotersList.html"/> <item name="Votecounting methods" href="methods.html"> <item name="Percentage" href="percentage.html"/> <item name="Condorcet" href="condorcet.html"/> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-03-10 11:43:56 UTC (rev 2925) +++ trunk/src/site/site_fr.xml 2010-03-10 12:54:05 UTC (rev 2926) @@ -35,6 +35,7 @@ <item name="Utilisateur" href="user.html"> <item name="Installation" href="install.html"/> <item name="Tutoriel" href="tutoriel.html"/> + <item name="Importer une liste de votants" href="importVotersList.html"/> <item name="Types de dépouillement" href="depouillement.html"> <item name="Pourcentage" href="pourcentage.html"/> <item name="Condorcet" href="condorcet.html"/>

1 0