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

r3386 - in trunk: pollen-services/src/main/java/org/chorem/pollen/services pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-services/src/main/resources/i18n pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json pollen-ui-struts2/src/main/resources/i18n
by tchemit＠users.chorem.org 24 May '12

24 May '12

Author: tchemit Date: 2012-05-24 20:13:06 +0200 (Thu, 24 May 2012) New Revision: 3386 Url: http://chorem.org/repositories/revision/pollen/3386 Log: fixes #568: Adding choices are not displayed fixes #569: Improve data in poll grids Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-05-24 17:15:47 UTC (rev 3385) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-05-24 18:13:06 UTC (rev 3386) @@ -33,10 +33,14 @@ import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.DateUtil; +import java.util.Date; import java.util.List; import java.util.Locale; +import static org.nuiton.i18n.I18n.l_; + /** * @author tchemit <chemit(a)codelutin.com> * @since 1.3 @@ -92,6 +96,32 @@ } } + public String decorateDateTime(Date date) { + String result = null; + if (date != null) { + result = DateUtil.formatDate(date, getDateTimePattern()); + } + return result; + } + + public String decorateDate(Date date) { + String result = null; + if (date != null) { + result = DateUtil.formatDate(date, getDatePattern()); + } + return result; + } + + public String getDateTimePattern() { + String result = l_(serviceContext.getLocale(), "pollen.common.dateTimePattern"); + return result; + } + + public String getDatePattern() { + String result = l_(serviceContext.getLocale(), "pollen.common.datePattern"); + return result; + } + protected <T extends TopiaEntity, D extends TopiaDAO<? super T>> T newInstance(D dao) { try { return (T) dao.newInstance(); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-05-24 17:15:47 UTC (rev 3385) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-05-24 18:13:06 UTC (rev 3386) @@ -64,6 +64,7 @@ import org.chorem.pollen.services.exceptions.UnauthorizedPollAccessException; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.util.beans.Binder; import javax.imageio.ImageIO; import javax.swing.ImageIcon; @@ -76,8 +77,11 @@ import java.net.URL; import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.Map; +import static org.nuiton.i18n.I18n.l_; + public class PollService extends PollenServiceSupport { /** Logger. */ @@ -246,6 +250,62 @@ return result; } + public Map<String, Object> pollToMap(Poll poll, Binder<Poll, Poll> binder) { + + Map<String, Object> map = binder.obtainProperties( + poll, + Poll.PROPERTY_TITLE, + Poll.PROPERTY_POLL_ID, + Poll.PROPERTY_DESCRIPTION + ); + Locale l = serviceContext.getLocale(); + if (poll.getBeginDate() == null) { + map.put(Poll.PROPERTY_BEGIN_DATE, l_(l, "pollen.common.undefined")); + } else { + map.put(Poll.PROPERTY_BEGIN_DATE, decorateDate(poll.getBeginDate())); + } + if (poll.getEndDate() == null) { + map.put(Poll.PROPERTY_END_DATE, l_(l, "pollen.common.undefined")); + } else { + map.put(Poll.PROPERTY_END_DATE, decorateDate(poll.getEndDate())); + } + + String addingchoiceText; + if (poll.isChoiceAddAllowed()) { + + Date beginDate = poll.getBeginChoiceDate(); + Date endDate = poll.getEndChoiceDate(); + + if (beginDate == null && endDate == null) { + + // can always add choices + addingchoiceText = + l_(l, "pollen.common.addingChoicesAlways"); + } else if (beginDate == null) { + // until enddate + addingchoiceText = + l_(l, "pollen.common.addingChoicesTo", + decorateDate(endDate)); + } else if (endDate == null) { + + // from begin date + addingchoiceText = + l_(l, "pollen.common.addingChoicesFrom", + decorateDate(beginDate)); + } else { + addingchoiceText = + l_(l, "pollen.common.addingChoicesContent", + decorateDate(beginDate), + decorateDate(endDate)); + } + } else { + addingchoiceText = l_(l, "pollen.common.unauthorized"); + } + map.put("addingChoices", addingchoiceText); + map.put("id", poll.getTopiaId()); + return map; + } + public Poll createPoll(Poll poll) { PollDAO pollDAO = getDAO(Poll.class); @@ -490,7 +550,7 @@ try { PollDAO pollDao = getDAO(Poll.class); - List<Pair<Poll,PollAccount>> result = + List<Pair<Poll, PollAccount>> result = pollDao.getParticipatedPolls(pager, userToUse); return result; } catch (TopiaException e) { Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-05-24 17:15:47 UTC (rev 3385) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-05-24 18:13:06 UTC (rev 3386) @@ -3,11 +3,19 @@ delete=Delete edit=Edit help=Help +pollen.common.addingChoicesAlways=Always +pollen.common.addingChoicesContent=From %s to %s +pollen.common.addingChoicesFrom=From %s +pollen.common.addingChoicesTo=Until %s pollen.common.anonymous=Anonymous vote +pollen.common.datePattern=MM/dd/yyyy +pollen.common.dateTimePattern=MM/dd/yyyy HH\:mm pollen.common.numberVote-average=Average of numbers pollen.common.numberVote-blank-votes=Number of blank votes pollen.common.numberVote-total=Sum of numbers pollen.common.numberVote-total-votes=Total votes +pollen.common.unauthorized=unauthorized +pollen.common.undefined=undefined pollen.email.createPoll.content=You had just created the new poll\: "%s".\nYou can access to this poll by following the links below.\n\nVote page\: \n%s\nModerate votes page\: \n%s\nEdit page\: \n%s pollen.email.createPoll.subject=[Pollen] Poll creation (%s) pollen.email.createRestrictedPoll.content=You had just created the new poll\: "%s".\nYou can access to this poll by following the links below.\n\nModerate votes page\: \n%s\nEdit page\: \n%s Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-05-24 17:15:47 UTC (rev 3385) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-05-24 18:13:06 UTC (rev 3386) @@ -3,11 +3,19 @@ lastName-label=Nom login-label=Identifiant name-label=Nom +pollen.common.addingChoicesAlways=Toujours +pollen.common.addingChoicesContent=Du %s au %s +pollen.common.addingChoicesFrom=Depuis le %s +pollen.common.addingChoicesTo=Jusqu'au %s pollen.common.anonymous=Vote anonyme +pollen.common.datePattern=dd/MM/yyyy +pollen.common.dateTimePattern=dd/MM/yyyy HH\:mm pollen.common.numberVote-average=Moyenne des nombres pollen.common.numberVote-blank-votes=Nombre de votes blancs pollen.common.numberVote-total=Somme des nombres pollen.common.numberVote-total-votes=Nombre total de votes +pollen.common.unauthorized=Non autorisé +pollen.common.undefined=Non défini pollen.email.createPoll.content=Vous venez de créer le sondage "%1$s".\nVous pouvez y accéder en suivant les liens ci-dessous.\n\nPage de vote \: \n%2$s\nModération des votes \: \n%3$s\nPage de modification \: \n%4$s pollen.email.createPoll.subject=[Pollen] Création d'un sondage (%1$s) pollen.email.createRestrictedPoll.content=Vous venez de créer le sondage "%s".\nVous pouvez y accéder en suivant les liens ci-dessous.\n\nModération des votes \: \n%s\nPage de modification \: \n%s Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-05-24 17:15:47 UTC (rev 3385) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-05-24 18:13:06 UTC (rev 3386) @@ -28,6 +28,7 @@ import org.chorem.pollen.common.PollType; import org.chorem.pollen.entities.PollenBinderHelper; import org.chorem.pollen.services.impl.PollService; +import org.chorem.pollen.ui.actions.DateConverter; import org.nuiton.util.beans.Binder; import java.util.List; @@ -84,21 +85,12 @@ int index = 0; for (Poll poll : pollList) { - Map<String, Object> map = binder.obtainProperties( - poll, - Poll.PROPERTY_TITLE, - Poll.PROPERTY_POLL_ID, - Poll.PROPERTY_DESCRIPTION, - Poll.PROPERTY_BEGIN_DATE, - Poll.PROPERTY_END_DATE - ); - - map.put("id", poll.getTopiaId()); + Map<String, Object> map = pollService.pollToMap(poll, binder); + map.put("voteId", poll.getPollId()); map.put("moderateId", poll.getAdminId()); map.put("resultId", getResultId(poll)); map.put("adminId", poll.getAdminId()); - Set<String> functions = getPollFunctions(poll); map.put("functions", functions); polls[index++] = map; @@ -131,7 +123,7 @@ * Retrieve the id for result page depends on {@code poll}. * It's not necessary to use {@code adminId} if the poll results are public. * But the {@code adminId} is mandatory if the poll is restricted (security). - * + * * @param poll Poll * @return the pollId if results are public or the adminId if not */ Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-05-24 17:15:47 UTC (rev 3385) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-05-24 18:13:06 UTC (rev 3386) @@ -87,20 +87,22 @@ for (Pair<Poll, PollAccount> entry : invitedPolls) { Poll poll = entry.getKey(); - Map<String, Object> map = binder.obtainProperties( - poll, - Poll.PROPERTY_TITLE, - Poll.PROPERTY_POLL_ID, - Poll.PROPERTY_DESCRIPTION, - Poll.PROPERTY_BEGIN_DATE, - Poll.PROPERTY_END_DATE - ); + Map<String, Object> map = pollService.pollToMap(poll, binder); +// Map<String, Object> map = binder.obtainProperties( +// poll, +// Poll.PROPERTY_TITLE, +// Poll.PROPERTY_POLL_ID, +// Poll.PROPERTY_DESCRIPTION, +// Poll.PROPERTY_BEGIN_DATE, +// Poll.PROPERTY_END_DATE +// ); PollAccount account = entry.getValue(); - PollUri pollUri = PollUri.newPollUri(poll.getPollId(), account.getAccountId()); + PollUri pollUri = PollUri.newPollUri(poll.getPollId(), + account.getAccountId()); - map.put("id", poll.getTopiaId()); +// map.put("id", poll.getTopiaId()); map.put("voteId", pollUri.getUri()); map.put("resultId", pollUri.getUri()); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-05-24 17:15:47 UTC (rev 3385) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-05-24 18:13:06 UTC (rev 3386) @@ -88,20 +88,23 @@ for (Pair<Poll, PollAccount> entry : participatedPolls) { Poll poll = entry.getKey(); - Map<String, Object> map = binder.obtainProperties( - poll, - Poll.PROPERTY_TITLE, - Poll.PROPERTY_POLL_ID, - Poll.PROPERTY_DESCRIPTION, - Poll.PROPERTY_BEGIN_DATE, - Poll.PROPERTY_END_DATE - ); + Map<String, Object> map = pollService.pollToMap(poll, binder); +// Map<String, Object> map = binder.obtainProperties( +// poll, +// Poll.PROPERTY_TITLE, +// Poll.PROPERTY_POLL_ID, +// Poll.PROPERTY_DESCRIPTION, +// Poll.PROPERTY_BEGIN_DATE, +// Poll.PROPERTY_END_DATE +// ); + PollAccount account = entry.getValue(); - PollUri pollUri = PollUri.newPollUri(poll.getPollId(), account.getAccountId()); + PollUri pollUri = PollUri.newPollUri(poll.getPollId(), + account.getAccountId()); - map.put("id", poll.getTopiaId()); +// map.put("id", poll.getTopiaId()); // Keep accountId to allow vote update map.put("voteId", pollUri.getUri()); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-05-24 17:15:47 UTC (rev 3385) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-05-24 18:13:06 UTC (rev 3386) @@ -82,16 +82,17 @@ int index = 0; for (Poll poll : pollList) { + Map<String, Object> map = pollService.pollToMap(poll, binder); - Map<String, Object> map = binder.obtainProperties( - poll, - Poll.PROPERTY_TITLE, - Poll.PROPERTY_POLL_ID, - Poll.PROPERTY_DESCRIPTION, - Poll.PROPERTY_BEGIN_DATE, - Poll.PROPERTY_END_DATE - ); - map.put("id", poll.getTopiaId()); +// Map<String, Object> map = binder.obtainProperties( +// poll, +// Poll.PROPERTY_TITLE, +// Poll.PROPERTY_POLL_ID, +// Poll.PROPERTY_DESCRIPTION, +// Poll.PROPERTY_BEGIN_DATE, +// Poll.PROPERTY_END_DATE +// ); +// map.put("id", poll.getTopiaId()); map.put("moderateId", poll.getAdminId()); map.put("resultId", poll.getAdminId()); map.put("adminId", poll.getAdminId()); Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-24 17:15:47 UTC (rev 3385) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-24 18:13:06 UTC (rev 3386) @@ -66,9 +66,7 @@ pollen.common.commentText=Comment pollen.common.comments=Comments about this poll pollen.common.csvImport=CSV import -pollen.common.datePattern=MM/dd/yyyy pollen.common.datePickerPattern=mm/dd/yy -pollen.common.dateTimePattern=MM/dd/yyyy HH\:mm pollen.common.description=Description pollen.common.displayType-group=Results by groups pollen.common.displayType-normal=Results Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-24 17:15:47 UTC (rev 3385) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-24 18:13:06 UTC (rev 3386) @@ -66,9 +66,7 @@ pollen.common.commentText=Commentaire pollen.common.comments=Commentaire à propos du sondage pollen.common.csvImport=Import CSV -pollen.common.datePattern=dd/MM/yyyy pollen.common.datePickerPattern=dd/mm/yy -pollen.common.dateTimePattern=dd/MM/yyyy HH\:mm pollen.common.description=Description pollen.common.displayType-group=Résultats par groupes pollen.common.displayType-normal=Résultats

1 0

r3385 - trunk/pollen-ui-struts2/src/main/resources/i18n
by tchemit＠users.chorem.org 24 May '12

24 May '12

Author: tchemit Date: 2012-05-24 19:15:47 +0200 (Thu, 24 May 2012) New Revision: 3385 Url: http://chorem.org/repositories/revision/pollen/3385 Log: i18n Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-24 17:15:12 UTC (rev 3384) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-24 17:15:47 UTC (rev 3385) @@ -148,7 +148,7 @@ pollen.error.choice.empty=%s mandatory pollen.error.comment.name.empty=Comment name mandatory pollen.error.comment.text.empty=Comment text mandatory -pollen.error.date.format=Date does not match pattern MM/dd/yyyy [hh:mm] (example 12/31/2000 12\:59) +pollen.error.date.format=Date does not match pattern MM/dd/yyyy [hh\:mm] (example 12/31/2000 12\:59) pollen.error.email.invalid=The email doesn't have the good format pollen.error.email.required=You must provide an email pollen.error.favoriteList.already.used=List name already used Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-24 17:15:12 UTC (rev 3384) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-24 17:15:47 UTC (rev 3385) @@ -146,7 +146,7 @@ pollen.error.choice.empty=%s obligatoire pollen.error.comment.name.empty=Nom du commentaire obligatoire pollen.error.comment.text.empty=Texte du commentaire obligatoire -pollen.error.date.format=La date doit être au format jj/MM/aaaa [hh:mm] (exemple 31/12/2000 23\:59) +pollen.error.date.format=La date doit être au format jj/MM/aaaa [hh\:mm] (exemple 31/12/2000 23\:59) pollen.error.email.invalid=Email non valide pollen.error.email.required=Email obligatoire pollen.error.favoriteList.already.used=Nom de liste déjà utilisé

1 0

r3384 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 24 May '12

24 May '12

Author: tchemit Date: 2012-05-24 19:15:12 +0200 (Thu, 24 May 2012) New Revision: 3384 Url: http://chorem.org/repositories/revision/pollen/3384 Log: fixes #567: Wrong link in poll resume Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp 2012-05-24 17:12:47 UTC (rev 3383) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp 2012-05-24 17:15:12 UTC (rev 3384) @@ -65,7 +65,7 @@ </div> <div style="margin-top: 30px;"> <s:text name="pollen.label.pollRegisterPage"/> - <s:a namespace="/user" action="myPolls"> + <s:a namespace="/user" action="createdList"> <s:text name="pollen.common.myPolls"/> </s:a>. </div> \ No newline at end of file

1 0

r3383 - in trunk: pollen-persistence/src/main/java/org/chorem/pollen pollen-persistence/src/main/java/org/chorem/pollen/business/persistence pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json
by tchemit＠users.chorem.org 24 May '12

24 May '12

Author: tchemit Date: 2012-05-24 19:12:47 +0200 (Thu, 24 May 2012) New Revision: 3383 Url: http://chorem.org/repositories/revision/pollen/3383 Log: fixes #566: Toutes les donn?\195?\169es ne sont pas affich?\195?\169es sur les sondages particip?\195?\169s Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-05-24 12:59:21 UTC (rev 3382) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-05-24 17:12:47 UTC (rev 3383) @@ -25,10 +25,12 @@ import com.google.common.base.Function; import com.google.common.collect.Lists; +import org.apache.commons.lang3.tuple.Pair; import org.chorem.pollen.business.persistence.Choice; import org.chorem.pollen.business.persistence.Comment; import org.chorem.pollen.business.persistence.PersonToList; import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.business.persistence.PollAccount; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.business.persistence.Vote; import org.chorem.pollen.business.persistence.VoteToChoice; @@ -43,6 +45,7 @@ import org.nuiton.topia.persistence.TopiaEntity; import java.util.List; +import java.util.Map; /** * Usefull pollen functions. @@ -183,4 +186,10 @@ } }; + public static final Function<Map.Entry<Poll,PollAccount>,Pair<Poll,PollAccount>> MAP_ENTRY_TO_PAIR_FUNCTION = new Function<Map.Entry<Poll, PollAccount>, Pair<Poll, PollAccount>>() { + @Override + public Pair<Poll, PollAccount> apply(Map.Entry<Poll, PollAccount> input) { + return Pair.of(input.getKey(), input.getValue()); + } + }; } Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-05-24 12:59:21 UTC (rev 3382) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-05-24 17:12:47 UTC (rev 3383) @@ -24,9 +24,12 @@ package org.chorem.pollen.business.persistence; import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.PollenFunctions; import org.chorem.pollen.entities.PollenDAOHelper; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; @@ -72,77 +75,28 @@ return result; } - public Map<Poll, PollAccount> getInvitedPolls( + public List<Pair<Poll, PollAccount>> getInvitedPolls( TopiaFilterPagerUtil.FilterPagerBean pager, UserAccount userToUse) throws TopiaException { Preconditions.checkNotNull(pager); Preconditions.checkNotNull(userToUse); - //FIXME Use a query to do this to avoid in memory pagination String email = userToUse.getEmail(); - TopiaQuery countQuery = createQuery("p"); - countQuery.addLeftJoin("p." + Poll.PROPERTY_VOTING_LIST, "v", false); - countQuery.addLeftJoin("v." + VotingList.PROPERTY_POLL_ACCOUNT_PERSON_TO_LIST, "l", false); - countQuery.addEquals("l." + PersonToList.PROPERTY_POLL_ACCOUNT - + "." + PollAccount.PROPERTY_EMAIL, email); - long records = countByQuery(countQuery); - pager.setRecords((int) records); - - TopiaQuery query = TopiaFilterPagerUtil.addPagerToQuery(countQuery, pager); + TopiaQuery query = createQuery("p"). + setSelect("p", "l." + PersonToList.PROPERTY_POLL_ACCOUNT). + addLeftJoin("p." + Poll.PROPERTY_VOTING_LIST, "v", false). + addLeftJoin("v." + VotingList.PROPERTY_POLL_ACCOUNT_PERSON_TO_LIST, "l", false). + addEquals("l." + PersonToList.PROPERTY_POLL_ACCOUNT + + "." + PollAccount.PROPERTY_EMAIL, email); - return findAllWithPollAccounts(query, - "p", - "l." + PersonToList.PROPERTY_POLL_ACCOUNT); - -// List<E> polls = findAll(); -// List<E> allPolls = Lists.newLinkedList(); -// for (E poll : polls) { -// for (VotingList votingList : poll.getVotingList()) { -// for (PersonToList personToList : votingList -// .getPollAccountPersonToList()) { -// if (!personToList.isHasVoted()) { -// PollAccount pollAccount = personToList -// .getPollAccount(); -// -// if (pollAccount != null -// && pollAccount.getEmail() != null -// && pollAccount.getEmail().equals( -// email)) { -// allPolls.add(poll); -// } -// } -// } -// } -// } -// -// int records = allPolls.size(); -// pager.setRecords(records); -// -// List<E> result = TopiaFilterPagerUtil.getPageFromList(allPolls, pager); -// return result; - -// try { -// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); -// TopiaQuery countQuery = dao.createQuery("e"); -// countQuery.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user); -// long records = dao.countByQuery(countQuery); -// pager.setRecords((int) records); -// -// PagerUtil.computeRecordIndexesAndPagesNumber(pager); -// TopiaQuery query = dao.createQuery("e"); -// TopiaFilterPagerUtil.addPagerToQuery(pager, query); -// query.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user); -// -// List<Poll> result = dao.findAllByQuery(query); -// return result; -// } catch (TopiaException e) { -// throw new PollenTechnicalException(e); -// } + List<Pair<Poll, PollAccount>> result = findAllWithPollAccounts( + query, pager); + return result; } - public Map<Poll, PollAccount> getParticipatedPolls( + public List<Pair<Poll, PollAccount>> getParticipatedPolls( TopiaFilterPagerUtil.FilterPagerBean pager, UserAccount userToUse) throws TopiaException { @@ -151,36 +105,37 @@ VoteDAO voteDao = PollenDAOHelper.getVoteDAO(context); - TopiaQuery countQuery = voteDao.createQuery("e"). - addDistinct(). - setSelect("e." + Vote.PROPERTY_POLL). - addWhere("e." + Vote.PROPERTY_POLL_ACCOUNT + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, userToUse); + TopiaQuery query = voteDao.createQuery("e"). + setSelect("e." + Vote.PROPERTY_POLL, "e." + Vote.PROPERTY_POLL_ACCOUNT). + addWhere("e." + Vote.PROPERTY_POLL_ACCOUNT + "." + + PollAccount.PROPERTY_USER_ACCOUNT, + TopiaQuery.Op.EQ, userToUse); - long records = countByQuery(countQuery); - pager.setRecords((int) records); - - TopiaQuery query = TopiaFilterPagerUtil.addPagerToQuery(countQuery, pager); - - return findAllWithPollAccounts(query, - "e." + Vote.PROPERTY_POLL, - "e." + Vote.PROPERTY_POLL_ACCOUNT); + List<Pair<Poll, PollAccount>> result = findAllWithPollAccounts( + query, pager); + return result; } - - protected Map<Poll, PollAccount> findAllWithPollAccounts(TopiaQuery query, - String pollAlias, - String pollAccountAlias) + + protected List<Pair<Poll, PollAccount>> findAllWithPollAccounts(TopiaQuery query, + TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { - // Select both poll and pollAccount - query.setSelect(pollAlias, pollAccountAlias); - List<Object[]> queryResults = getContext().findByQuery(query); - Map<Poll, PollAccount> result = Maps.newLinkedHashMap(); + Map<Poll, PollAccount> mapResult = Maps.newLinkedHashMap(); for (Object[] row : queryResults) { Poll poll = (Poll) row[0]; PollAccount pollAccount = (PollAccount) row[1]; - result.put(poll, pollAccount); + mapResult.put(poll, pollAccount); } + + long records = mapResult.size(); + pager.setRecords((int) records); + TopiaFilterPagerUtil.computeRecordIndexesAndPagesNumber(pager); + List<Map.Entry<Poll, PollAccount>> entries = + Lists.newLinkedList(mapResult.entrySet()); + List<Pair<Poll, PollAccount>> result = + Lists.transform(TopiaFilterPagerUtil.getPageFromList(entries, pager), + PollenFunctions.MAP_ENTRY_TO_PAIR_FUNCTION); return result; } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-05-24 12:59:21 UTC (rev 3382) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-05-24 17:12:47 UTC (rev 3383) @@ -30,6 +30,7 @@ import com.google.common.collect.Lists; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenConfiguration; @@ -452,7 +453,7 @@ } } - public Map<Poll, PollAccount> getInvitedPolls( + public List<Pair<Poll, PollAccount>> getInvitedPolls( TopiaFilterPagerUtil.FilterPagerBean pager, UserAccount user) { @@ -466,7 +467,7 @@ Preconditions.checkNotNull(userToUse); try { PollDAO pollDao = getDAO(Poll.class); - Map<Poll, PollAccount> result = + List<Pair<Poll, PollAccount>> result = pollDao.getInvitedPolls(pager, userToUse); return result; } catch (TopiaException e) { @@ -474,7 +475,7 @@ } } - public Map<Poll, PollAccount> getParticipatedPolls( + public List<Pair<Poll, PollAccount>> getParticipatedPolls( TopiaFilterPagerUtil.FilterPagerBean pager, UserAccount user) { @@ -489,7 +490,7 @@ try { PollDAO pollDao = getDAO(Poll.class); - Map<Poll, PollAccount> result = + List<Pair<Poll,PollAccount>> result = pollDao.getParticipatedPolls(pager, userToUse); return result; } catch (TopiaException e) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-05-24 12:59:21 UTC (rev 3382) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-05-24 17:12:47 UTC (rev 3383) @@ -24,6 +24,7 @@ package org.chorem.pollen.ui.actions.json; import com.google.common.collect.Sets; +import org.apache.commons.lang3.tuple.Pair; import org.chorem.pollen.bean.PollUri; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PollAccount; @@ -31,6 +32,7 @@ import org.chorem.pollen.services.impl.PollService; import org.nuiton.util.beans.Binder; +import java.util.List; import java.util.Map; import java.util.Set; @@ -75,14 +77,14 @@ PollService pollService = newService(PollService.class); - Map<Poll, PollAccount> invitedPolls = pollService.getInvitedPolls(pager, - getPollenUserAccount()); + List<Pair<Poll, PollAccount>> invitedPolls = pollService.getInvitedPolls(pager, + getPollenUserAccount()); polls = new Map[invitedPolls.size()]; Binder<Poll, Poll> binder = PollenBinderHelper.getSimpleTopiaBinder(Poll.class); int index = 0; - for (Map.Entry<Poll, PollAccount> entry : invitedPolls.entrySet()) { + for (Pair<Poll, PollAccount> entry : invitedPolls) { Poll poll = entry.getKey(); Map<String, Object> map = binder.obtainProperties( @@ -95,13 +97,13 @@ ); PollAccount account = entry.getValue(); - + PollUri pollUri = PollUri.newPollUri(poll.getPollId(), account.getAccountId()); map.put("id", poll.getTopiaId()); map.put("voteId", pollUri.getUri()); map.put("resultId", pollUri.getUri()); - + Set<String> functions = getPollFunctions(poll); map.put("functions", functions); polls[index++] = map; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-05-24 12:59:21 UTC (rev 3382) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-05-24 17:12:47 UTC (rev 3383) @@ -24,6 +24,7 @@ package org.chorem.pollen.ui.actions.json; import com.google.common.collect.Sets; +import org.apache.commons.lang3.tuple.Pair; import org.chorem.pollen.bean.PollUri; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PollAccount; @@ -32,6 +33,7 @@ import org.chorem.pollen.services.impl.PollService; import org.nuiton.util.beans.Binder; +import java.util.List; import java.util.Map; import java.util.Set; @@ -76,14 +78,14 @@ PollService pollService = newService(PollService.class); - Map<Poll, PollAccount> participatedPolls = + List<Pair<Poll, PollAccount>> participatedPolls = pollService.getParticipatedPolls(pager, getPollenUserAccount()); polls = new Map[participatedPolls.size()]; Binder<Poll, Poll> binder = PollenBinderHelper.getSimpleTopiaBinder(Poll.class); int index = 0; - for (Map.Entry<Poll, PollAccount> entry : participatedPolls.entrySet()) { + for (Pair<Poll, PollAccount> entry : participatedPolls) { Poll poll = entry.getKey(); Map<String, Object> map = binder.obtainProperties( @@ -94,11 +96,11 @@ Poll.PROPERTY_BEGIN_DATE, Poll.PROPERTY_END_DATE ); - + PollAccount account = entry.getValue(); PollUri pollUri = PollUri.newPollUri(poll.getPollId(), account.getAccountId()); - + map.put("id", poll.getTopiaId()); // Keep accountId to allow vote update @@ -109,7 +111,7 @@ ? pollUri.getPollId() : pollUri.getUri(); map.put("resultId", resultId); - + Set<String> functions = getPollFunctions(poll); map.put("functions", functions); polls[index++] = map;

1 0

r3382 - trunk/pollen-ui-struts2/src/main/webapp/js
by tchemit＠users.chorem.org 24 May '12

24 May '12

Author: tchemit Date: 2012-05-24 14:59:21 +0200 (Thu, 24 May 2012) New Revision: 3382 Url: http://chorem.org/repositories/revision/pollen/3382 Log: refs #154: [Poll] Impossible de choisir l'ordre des choix (images) Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-05-24 09:19:30 UTC (rev 3381) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-05-24 12:59:21 UTC (rev 3382) @@ -527,11 +527,23 @@ var choiceTI = $('[name="' + choicePrefix + choiceNumber + '.thumb"]'); var newChoiceTI = $('[name="' + choicePrefix + newChoiceNumber + '.thumb"]'); - var choiceTIVal = choiceTI.val(); - var newChoiceTIVal = newChoiceTI.val(); + var choiceTIVal = choiceTI.attr("alt"); + var newChoiceTIVal = newChoiceTI.attr("alt"); console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); - choiceTI.val(newChoiceTIVal); - newChoiceTI.val(choiceTIVal); + choiceTI.attr("alt", newChoiceTIVal); + newChoiceTI.attr("alt", choiceTIVal); + + choiceTIVal = choiceTI.attr("title"); + newChoiceTIVal = newChoiceTI.attr("title"); + console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); + choiceTI.attr("title", newChoiceTIVal); + newChoiceTI.attr("title", choiceTIVal); + + choiceTIVal = choiceTI.attr("src"); + newChoiceTIVal = newChoiceTI.attr("src"); + console.info("switch " + choiceTIVal + " to " + newChoiceTIVal); + choiceTI.attr("src", newChoiceTIVal); + newChoiceTI.attr("src", choiceTIVal); } function confirmClose() {

1 0

r3381 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 24 May '12

24 May '12

Author: tchemit Date: 2012-05-24 11:19:30 +0200 (Thu, 24 May 2012) New Revision: 3381 Url: http://chorem.org/repositories/revision/pollen/3381 Log: recomment pager (not ready :() Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp 2012-05-24 09:18:03 UTC (rev 3380) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp 2012-05-24 09:19:30 UTC (rev 3381) @@ -58,7 +58,7 @@ </div> -<div id="polls_pager" style="height:36px;" +<%--div id="polls_pager" style="height:36px;" class="ui-state-default ui-jqgrid-pager ui-corner-bottom" dir="ltr"> <div id="pg_polls_pager" class="ui-pager-control" role="group" align="center"> @@ -101,73 +101,5 @@ </tr> </tbody> </table> - - <%--<table cellspacing="0" cellpadding="0" border="0" class="ui-pg-table"--%> - <%--style="width:100%;table-layout:fixed;" role="row">--%> - <%--<tbody>--%> - <%--<tr>--%> - <%--<td id="polls_pager_left" align="left">--%> - <%--<table cellspacing="0" cellpadding="0" border="0"--%> - <%--class="ui-pg-table navtable"--%> - <%--style="float:left;table-layout:auto;">--%> - <%--<tbody>--%> - <%--<tr></tr>--%> - <%--</tbody>--%> - <%--</table>--%> - <%--</td>--%> - <%--<td id="polls_pager_center" align="center"--%> - <%--style="white-space: pre;">--%> - <%--<table cellspacing="0" cellpadding="0" border="0"--%> - <%--style="table-layout:auto;" class="ui-pg-table">--%> - <%--<tbody>--%> - <%--<tr>--%> - <%--<td id="first_polls_pager"--%> - <%--class="ui-pg-button ui-corner-all"--%> - <%--style="cursor: default; "><span--%> - <%--class="ui-icon ui-icon-seek-first"></span></td>--%> - <%--<td id="prev_polls_pager"--%> - <%--class="ui-pg-button ui-corner-all ui-state-disabled"--%> - <%--style="cursor: default; "><span--%> - <%--class="ui-icon ui-icon-seek-prev"></span></td>--%> - <%--<td class="ui-pg-button ui-state-disabled"--%> - <%--style="width: 4px; cursor: default; "><span--%> - <%--class="ui-separator"></span></td>--%> - <%--<td dir="ltr">Page <input class="ui-pg-input" type="text"--%> - <%--maxlength="7" value="0" role="textbox">--%> - <%--sur <span id="sp_1_polls_pager">1</span></td>--%> - <%--<td class="ui-pg-button ui-state-disabled"--%> - <%--style="width: 4px; cursor: default; "><span--%> - <%--class="ui-separator"></span></td>--%> - <%--<td id="next_polls_pager"--%> - <%--class="ui-pg-button ui-corner-all ui-state-disabled"--%> - <%--style="cursor: default; "><span--%> - <%--class="ui-icon ui-icon-seek-next"></span></td>--%> - <%--<td id="last_polls_pager"--%> - <%--class="ui-pg-button ui-corner-all ui-state-disabled"--%> - <%--style="cursor: default; "><span--%> - <%--class="ui-icon ui-icon-seek-end"></span></td>--%> - <%----%> - <%--</tr>--%> - <%--</tbody>--%> - <%--</table>--%> - <%--</td>--%> - <%--<td id="polls_pager_right" align="right">--%> - <%--<select class="ui-pg-selbox" role="listbox">--%> - <%--<option role="option" value="10" selected="selected">10</option>--%> - <%--<option role="option" value="15">15</option>--%> - <%--<option role="option" value="20">20</option>--%> - <%--<option role="option" value="50">50</option>--%> - <%--<option role="option" value="100">100</option>--%> - <%--</select>--%> - <%--</td>--%> - <%--</tr>--%> - <%--</tbody>--%> - <%--</table>--%> </div> -</div> \ No newline at end of file +</div--%> \ No newline at end of file

1 0

r3380 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json
by tchemit＠users.chorem.org 24 May '12

24 May '12

Author: tchemit Date: 2012-05-24 11:18:03 +0200 (Thu, 24 May 2012) New Revision: 3380 Url: http://chorem.org/repositories/revision/pollen/3380 Log: fixes #565: Date are no more displayed in comments of a poll Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java 2012-05-24 09:14:53 UTC (rev 3379) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java 2012-05-24 09:18:03 UTC (rev 3380) @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import org.chorem.pollen.business.persistence.Comment; -import org.chorem.pollen.business.persistence.PollAccount; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.entities.PollenBinderHelper; import org.chorem.pollen.services.impl.PollCommentService; @@ -98,10 +97,9 @@ Map<String, Object> map = binder.obtainProperties( comment, Comment.PROPERTY_TEXT, - Comment.PROPERTY_POST_DATE + Comment.PROPERTY_POST_DATE, + Comment.PROPERTY_AUTHOR ); - map.put(Comment.PROPERTY_POLL_ACCOUNT + "." + PollAccount.PROPERTY_VOTING_ID, - comment.getPollAccount().getVotingId()); map.put("id", comment.getTopiaId()); Set<String> functions = getCommentFunctions(pollService, comment,

1 0

r3379 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 24 May '12

24 May '12

Author: tchemit Date: 2012-05-24 11:14:53 +0200 (Thu, 24 May 2012) New Revision: 3379 Url: http://chorem.org/repositories/revision/pollen/3379 Log: improve dialog box usage refs #172: [Comment] Pagination des commentaires Added: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp 2012-05-24 09:11:39 UTC (rev 3378) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp 2012-05-24 09:14:53 UTC (rev 3379) @@ -38,7 +38,9 @@ <hr/> - <div class="cleanBoth"> - <s:submit key="pollen.action.delete" align="right"/> + <div align="right"> + <s:submit onclick="return closeConfirmDialog();" theme="simple" + key="pollen.action.cancel"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </s:form> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp 2012-05-24 09:11:39 UTC (rev 3378) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp 2012-05-24 09:14:53 UTC (rev 3379) @@ -27,7 +27,6 @@ <s:form method="POST" namespace="/poll" action="deleteComment"> <s:hidden name="uriId" value='%{uriId}'/> - <s:hidden name="commentId" value='%{comment.topiaId}'/> <s:textfield key='comment.postDate' readonly="true" size="50" @@ -41,7 +40,9 @@ <hr/> - <div class="cleanBoth"> - <s:submit key="pollen.action.delete" align="right"/> + <div align="right"> + <s:submit onclick="return closeConfirmDialog();" theme="simple" + key="pollen.action.cancel"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </s:form> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp 2012-05-24 09:11:39 UTC (rev 3378) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp 2012-05-24 09:14:53 UTC (rev 3379) @@ -37,7 +37,9 @@ <hr/> - <div class="cleanBoth"> - <s:submit key="pollen.action.delete" align="right"/> + <div align="right"> + <s:submit onclick="return closeConfirmDialog();" theme="simple" + key="pollen.action.cancel"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </s:form> \ No newline at end of file Added: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp 2012-05-24 09:14:53 UTC (rev 3379) @@ -0,0 +1,47 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<div> + <s:if test="isDeleteCommentAllowed(#comment)"> + <span class="cmd"> + <s:a href="#" + onclick="return openDeleteCommentDialog('%{#comment.topiaId}');"> + <img src="<s:url value='/img/delete.png'/>" + title="<s:text name="pollen.action.pollCommentDelete"/>" + alt="<s:text name="pollen.action.pollCommentDelete"/>"/> + </s:a> + </span> + </s:if> + <span class="name"><s:property value='%{#comment.author}'/></span> : + <span class="date"> + <s:property value='#comment.postDate'/> + <%--<s:property value='%{formatDateTime(#postDate)}'/>--%> + </span> + + <p> + <s:property value='#comment.text'/> + </p> +</div> \ No newline at end of file Property changes on: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp 2012-05-24 09:14:53 UTC (rev 3379) @@ -0,0 +1,173 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id: vote.jsp 3369 2012-05-18 00:53:19Z tchemit $ + $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2/src/main/webapp/WE… $ + %% + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<link rel="stylesheet" href="<s:url value='/css/pagination.css'/>"/> +<script type="text/javascript" + src="<s:url value='/js/jquery.pagination.js' />"></script> + +<%-- +<input type="text" value="5" name="items_per_page" id="items_per_page" class="numeric"/> +<input type="text" value="10" name="num_display_entries" id="num_display_entries" class="numeric"/> +<input type="text" value="2" name="num_edge_entries" id="num_edge_entries" class="numeric"/> +<input type="text" value="Prev" name="prev_text" id="prev_text"/> +<input type="text" value="Next" name="next_text" id="next_text"/> +--%> +<script type="text/javascript"> + + $(document).ready(function () { + + $('#commentsDiv div:even').addClass('even'); + $('#commentsDiv div:odd').addClass('odd'); + + var optInit = getOptionsFromForm(); + + $("#Pagination").pagination(members.length, optInit); + }); + +</script> +<div id="Pagination" class="pagination"></div> +<div id="commentsDiv"> + <s:iterator value="comments" var="comment" status="status"> + <s:set name="comment" value="%{#comment}"/> + <%@include file="displayPollComment.jsp" %> + </s:iterator> + + +</div> + +<div id="polls_pager" style="height:36px;" + class="ui-state-default ui-jqgrid-pager ui-corner-bottom" dir="ltr"> + <div id="pg_polls_pager" class="ui-pager-control" role="group" align="center"> + + <table cellspacing="0" cellpadding="0" border="0" + style="table-layout:auto;" class="ui-pg-table"> + <tbody> + <tr> + <td id="first_polls_pager" + class="ui-pg-button ui-corner-all" + style="cursor: default; "><span + class="ui-icon ui-icon-seek-first"></span></td> + <td id="prev_polls_pager" + class="ui-pg-button ui-corner-all ui-state-disabled" + style="cursor: default; "><span + class="ui-icon ui-icon-seek-prev"></span></td> + <td class="ui-pg-button ui-state-disabled" + style="width: 4px; cursor: default; "><span + class="ui-separator"></span></td> + <td dir="ltr">Page <input class="ui-pg-input" type="text" + maxlength="7" value="0" role="textbox"> + sur <span id="sp_1_polls_pager">1</span></td> + <td class="ui-pg-button ui-state-disabled" + style="width: 4px; cursor: default; "><span + class="ui-separator"></span></td> + <td id="next_polls_pager" + class="ui-pg-button ui-corner-all ui-state-disabled" + style="cursor: default; "><span + class="ui-icon ui-icon-seek-next"></span></td> + <td id="last_polls_pager" + class="ui-pg-button ui-corner-all ui-state-disabled" + style="cursor: default; "><span + class="ui-icon ui-icon-seek-end"></span></td> + <td dir="ltr"><select class="ui-pg-selbox" role="listbox"> + <option role="option" value="10" selected="selected">10</option> + <option role="option" value="15">15</option> + <option role="option" value="20">20</option> + <option role="option" value="50">50</option> + <option role="option" value="100">100</option> + </select></td> + </tr> + </tbody> + </table> + + <%--<table cellspacing="0" cellpadding="0" border="0" class="ui-pg-table"--%> + <%--style="width:100%;table-layout:fixed;" role="row">--%> + <%--<tbody>--%> + <%--<tr>--%> + <%--<td id="polls_pager_left" align="left">--%> + <%--<table cellspacing="0" cellpadding="0" border="0"--%> + <%--class="ui-pg-table navtable"--%> + <%--style="float:left;table-layout:auto;">--%> + <%--<tbody>--%> + <%--<tr></tr>--%> + <%--</tbody>--%> + <%--</table>--%> + <%--</td>--%> + <%--<td id="polls_pager_center" align="center"--%> + <%--style="white-space: pre;">--%> + <%--<table cellspacing="0" cellpadding="0" border="0"--%> + <%--style="table-layout:auto;" class="ui-pg-table">--%> + <%--<tbody>--%> + <%--<tr>--%> + <%--<td id="first_polls_pager"--%> + <%--class="ui-pg-button ui-corner-all"--%> + <%--style="cursor: default; "><span--%> + <%--class="ui-icon ui-icon-seek-first"></span></td>--%> + <%--<td id="prev_polls_pager"--%> + <%--class="ui-pg-button ui-corner-all ui-state-disabled"--%> + <%--style="cursor: default; "><span--%> + <%--class="ui-icon ui-icon-seek-prev"></span></td>--%> + <%--<td class="ui-pg-button ui-state-disabled"--%> + <%--style="width: 4px; cursor: default; "><span--%> + <%--class="ui-separator"></span></td>--%> + <%--<td dir="ltr">Page <input class="ui-pg-input" type="text"--%> + <%--maxlength="7" value="0" role="textbox">--%> + <%--sur <span id="sp_1_polls_pager">1</span></td>--%> + <%--<td class="ui-pg-button ui-state-disabled"--%> + <%--style="width: 4px; cursor: default; "><span--%> + <%--class="ui-separator"></span></td>--%> + <%--<td id="next_polls_pager"--%> + <%--class="ui-pg-button ui-corner-all ui-state-disabled"--%> + <%--style="cursor: default; "><span--%> + <%--class="ui-icon ui-icon-seek-next"></span></td>--%> + <%--<td id="last_polls_pager"--%> + <%--class="ui-pg-button ui-corner-all ui-state-disabled"--%> + <%--style="cursor: default; "><span--%> + <%--class="ui-icon ui-icon-seek-end"></span></td>--%> + <%----%> + <%--</tr>--%> + <%--</tbody>--%> + <%--</table>--%> + <%--</td>--%> + <%--<td id="polls_pager_right" align="right">--%> + <%--<select class="ui-pg-selbox" role="listbox">--%> + <%--<option role="option" value="10" selected="selected">10</option>--%> + <%--<option role="option" value="15">15</option>--%> + <%--<option role="option" value="20">20</option>--%> + <%--<option role="option" value="50">50</option>--%> + <%--<option role="option" value="100">100</option>--%> + <%--</select>--%> + <%--</td>--%> + <%--</tr>--%> + <%--</tbody>--%> + <%--</table>--%> + </div> +</div> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-05-24 09:11:39 UTC (rev 3378) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-05-24 09:14:53 UTC (rev 3379) @@ -24,7 +24,6 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> <title><s:property value="%{poll.title}"/></title> @@ -34,57 +33,56 @@ <script type="text/javascript" src="<s:url value='/js/gridHelper.js' />"></script> -<s:url id='deleteImg' value='/img/delete.png'/> -<s:set id='deleteTitle'><s:text name="pollen.action.pollCommentDelete"/></s:set> +<s:set id='deleteCommentTitle'> + <s:text name="pollen.title.delete.pollComment"/> +</s:set> +<s:set id='deleteCommentVote'> + <s:text name="pollen.title.delete.pollVote"/> +</s:set> +<s:set id='deleteCommentChoice'> + <s:text name="pollen.title.delete.pollChoice"/> +</s:set> <script type="text/javascript"> - function commentFunctions(cellvalue, options, rowObject) { - - var id = rowObject.id; - - var result = ""; - - if (cellvalue.indexOf('delete') > -1) { - var url = "return openDeleteCommentDialog(\"" + id + "\");"; - result += formatLink(id, url, "${deleteImg}", "Delete", "${deleteTitle}") - } - return result; + function openConfirmDialog(title, url) { + $('.ui-dialog-title').html(title); + var dialog = $("#confirmDialog"); + dialog.html(''); + dialog.load(url); + dialog.dialog('open'); + return false; } - function formatLink(id, baseUrl, image, imageAlt, imageTitle) { - //var url = $.prepareUrl(baseUrl, {commentId:id}); - return "<a href='#' onclick='" + baseUrl + "'><image alt='" + imageAlt + "' title='" + imageTitle + "' src='" + image + "'> </a>"; -// return "<a href='" + url + "'><image alt='" + imageAlt + "' title='" + imageTitle + "' src='" + image + "'> </a>"; + function closeConfirmDialog() { + $('#confirmDialog').dialog('close'); + return false; } function openDeleteCommentDialog(commentId) { - var dialog = $("#deleteCommentDialog"); - var uriId = "<s:property value='%{uriId}'/>"; - var url = $.prepareUrl("<s:url action='confirmDeleteComment' namespace='/poll'/>", - {uriId:uriId, commentId:commentId}); - dialog.load(url); - dialog.dialog('open'); - return false; + return openConfirmDialog( + "<s:property value='%{deleteCommentTitle}'/>", + $.prepareUrl("<s:url action='confirmDeleteComment' namespace='/poll'/>", + { uriId:"<s:property value='%{uriId}'/>", + commentId:commentId}) + ); } function openDeleteVoteDialog(voteId) { - var dialog = $("#deleteVoteDialog"); - var uriId = "<s:property value='%{uriId}'/>"; - var url = $.prepareUrl("<s:url action='confirmDeleteVote' namespace='/poll'/>", - {uriId:uriId, voteId:voteId}); - dialog.load(url); - dialog.dialog('open'); - return false; + return openConfirmDialog( + "<s:property value='%{deleteCommentVote}'/>", + $.prepareUrl("<s:url action='confirmDeleteVote' namespace='/poll'/>", + {uriId:"<s:property value='%{uriId}'/>", + voteId:voteId}) + ); } function openDeleteChoiceDialog(choiceId) { - var dialog = $("#deleteChoiceDialog"); - var uriId = "<s:property value='%{uriId}'/>"; - var url = $.prepareUrl("<s:url action='confirmDeleteChoice' namespace='/poll'/>", - {uriId:uriId, choiceId:choiceId}); - dialog.load(url); - dialog.dialog('open'); - return false; + return openConfirmDialog( + "<s:property value='%{deleteCommentChoice}'/>", + $.prepareUrl("<s:url action='confirmDeleteChoice' namespace='/poll'/>", + {uriId:"<s:property value='%{uriId}'/>", + choiceId:choiceId}) + ); } jQuery(document).ready(function () { @@ -123,7 +121,6 @@ alt="<s:text name="pollen.common.vote.results"/>"/> </s:a> </s:if> - <%--<t:FeedContextLink t:id="feedContext"/>--%> <s:if test="feedFileExisting"> <s:a namespace="/poll" action="getFeed"> <s:param name="pollId" value="poll.pollId"/> @@ -163,14 +160,6 @@ <%--t:currentPage="page" t:noPagerText="prop:noPagerText"/>--%> </s:else> -<sj:dialog id="deleteVoteDialog" height="120" resizable="false" - title="%{getText('pollen.title.delete.pollVote')}" - autoOpen="false" modal="true" width="800"/> - -<sj:dialog id="deleteChoiceDialog" height="100" resizable="false" - title="%{getText('pollen.title.delete.pollChoice')}" - autoOpen="false" modal="true" width="800"/> - <s:form id="voteForm" validate="true"> <s:hidden key="uriId" label=''/> <table id="poll"> @@ -190,7 +179,8 @@ <th> <s:if test="!isDescNull(#choice)"> - <span title='<s:property value="escapeLineBreak(#choice.description)"/>'> + <span + title='<s:property value="escapeLineBreak(#choice.description)"/>'> <s:property value="name"/> </span> </s:if> @@ -199,7 +189,8 @@ </s:else> <s:if test="pollChoiceRunning"> <s:if test="creatorUser"> - <s:a action="deleteChoice" namespace="/poll" onclick="return openDeleteChoiceDialog('%{#choice.topiaId}');"> + <s:a action="deleteChoice" namespace="/poll" + onclick="return openDeleteChoiceDialog('%{#choice.topiaId}');"> <s:param name="choiceId"><s:property value="id"/></s:param> <img src="<s:url value="/img/delete.png"/>" title="<s:text name="pollen.action.deleteChoice"/>" @@ -281,25 +272,28 @@ <s:if test="!isChoiceHidden(#choice)"> <th> <s:if test="normalVoteCounting"> - <s:checkbox name="vote.choiceVoteToChoice[%{#status.index}].voteValue" - value="%{vote.choiceVoteToChoice[#status.index].voteValue}" theme="simple"/> + <s:checkbox + name="vote.choiceVoteToChoice[%{#status.index}].voteValue" + value="%{vote.choiceVoteToChoice[#status.index].voteValue}" + theme="simple"/> </s:if> <s:if test="percentageVoteCounting"> - <s:textfield name="vote.choiceVoteToChoice[%{#status.index}].voteValue" - value="%{vote.choiceVoteToChoice[#status.index].voteValue}" - required="true" size="3" theme="simple"/> - <%--t:validate="required, min=0, max=100"/>%--%> + <s:textfield + name="vote.choiceVoteToChoice[%{#status.index}].voteValue" + value="%{vote.choiceVoteToChoice[#status.index].voteValue}" + required="true" size="3" theme="simple"/> </s:if> <s:if test="condorcetVoteCounting"> - <s:textfield name="vote.choiceVoteToChoice[%{#status.index}].voteValue" - value="%{vote.choiceVoteToChoice[#status.index].voteValue}" - id="condorcetInput" size="3" theme="simple"/> - <%--t:nulls="zero" t:validate="min=0, max=99"/>--%> + <s:textfield + name="vote.choiceVoteToChoice[%{#status.index}].voteValue" + value="%{vote.choiceVoteToChoice[#status.index].voteValue}" + id="condorcetInput" size="3" theme="simple"/> </s:if> <s:if test="numberVoteCounting"> - <s:textfield name="vote.choiceVoteToChoice[%{#status.index}].voteValue" - value="%{vote.choiceVoteToChoice[#status.index].voteValue}" - size="3" theme="simple"/> + <s:textfield + name="vote.choiceVoteToChoice[%{#status.index}].voteValue" + value="%{vote.choiceVoteToChoice[#status.index].voteValue}" + size="3" theme="simple"/> </s:if> </th> </s:if> @@ -414,18 +408,16 @@ <div id="voteError"> <s:fielderror fieldName="pollAccount.votingId"/> <s:fielderror fieldName="vote.choices"/> - <%--<t:errors/>--%> </div> <s:if test="voteAllowed"> <div id="buttons"> <s:if test="poll.anonymousVoteAllowed"> <s:checkbox key="vote.anonymous"/> - <%--<t:label for="anonymousVote"/>--%> <br/> </s:if> - <s:submit action="vote/%{uriId}" key="pollen.action.pollVote" align="center"/> - <%--<input id="submitVote" t:type="Submit" t:value="${message:submitVote}"/>--%> + <s:submit action="vote/%{uriId}" key="pollen.action.pollVote" + align="center"/> </div> </s:if> </s:form> @@ -434,32 +426,34 @@  <s:if test="pollChoiceRunning"> <div id="choiceFormDiv"> - <s:form id="choiceForm" method="POST" namespace="/poll" enctype="multipart/form-data"> + <s:form id="choiceForm" method="POST" namespace="/poll" + enctype="multipart/form-data"> <h4><s:text name="pollen.action.addChoice"/></h4> - <s:if test="textType"> - <s:textfield key="choice.name" + <s:if test="textType"> + <s:textfield key="choice.name" + label="%{getText('pollen.common.choice')}" + required="true"/> + </s:if> + <s:elseif test="dateType"> + <sj:datepicker key="choice.date" label="%{getText('pollen.common.choice')}" + changeMonth="true" changeYear="true" + timepicker="true" + displayFormat="%{getText('pollen.common.datePickerPattern')}" required="true"/> - </s:if> - <s:elseif test="dateType"> - <sj:datepicker key="choice.date" - label="%{getText('pollen.common.choice')}" - changeMonth="true" changeYear="true" - timepicker="true" - displayFormat="%{getText('pollen.common.datePickerPattern')}" - required="true"/> - </s:elseif> - <s:elseif test="imageType"> - <s:file key="choice.location" - label="%{getText('pollen.common.choice')}" - cssClass="nameField" - required="true"/> - </s:elseif> - <br/> - <s:textarea cols="36" key="choice.description" - label="%{getText('pollen.common.description')}"/> - <br/> - <s:submit action="addChoice/%{uriId}" key="pollen.action.addChoice" align="center"/> + </s:elseif> + <s:elseif test="imageType"> + <s:file key="choice.location" + label="%{getText('pollen.common.choice')}" + cssClass="nameField" + required="true"/> + </s:elseif> + <br/> + <s:textarea cols="36" key="choice.description" + label="%{getText('pollen.common.description')}"/> + <br/> + <s:submit action="addChoice/%{uriId}" key="pollen.action.addChoice" + align="center"/> </s:form> </div> </s:if> @@ -468,67 +462,10 @@ <h3><s:text name="pollen.common.comments"/></h3> <div id="commentZone"> - <div id="commentsDiv"> - <s:iterator value="comments" var="comment" status="status"> - <div - <s:if test="#status.even">class="even"</s:if> - <s:else>class="odd"</s:else> - > - <s:if test="isDeleteCommentAllowed(#comment)"> - <span class="cmd"> - <s:a href="#" - onclick="return openDeleteCommentDialog('%{#comment.topiaId}');"> - <img src="<s:url value='/img/delete.png'/>" - title="<s:text name="pollen.action.pollCommentDelete"/>" - alt="<s:text name="pollen.action.pollCommentDelete"/>"/> - </s:a> - </span> - </s:if> - <span class="name"><s:property value='#comment.author'/></span> : - <span class="date"> - <s:property value='%{formatDateTime(postDate)}'/> - </span> - <p> - <s:property value='text'/> - </p> - </div> - </s:iterator> - </div> - <%--div id="commentsDiv"> + <%--Show paginated comments--%> + <%@include file="displayPollComments.jsp" %> - <s:url id="loadPollComments" action="getPollComments" namespace="/json" - escapeAmp="false"> - <s:param name="pollId" value="%{poll.pollId}"/> - </s:url> - - <sjg:grid id="comments" dataType="json" href="%{loadPollComments}" - gridModel="comments" sortable="true" pager="true" - pagerButtons="true" pagerInput="true" navigator="true" - rownumbers="false" autowidth="true" editinline="false" - navigatorEdit="false" navigatorDelete="false" - navigatorSearch="false" navigatorRefresh="false" - navigatorAdd="false" viewrecords="true" sortorder="desc" - sortname="postDate" rowList="10,15,20,50,100" rowNum="10"> - - <sjg:gridColumn name="id" title="id" hidden="true"/> - <sjg:gridColumn name="postDate" - title='%{getText("pollen.common.postDate")}' - sortable="true" formatter="date" width="50" - formatoptions="{newformat : 'd.m.Y H:i', srcformat : 'Y-m-d H:i:s'}"/> - <sjg:gridColumn name="pollAccount.votingId" - title='%{getText("pollen.common.commentName")}' - sortable="true"/> - <sjg:gridColumn name="text" - title='%{getText("pollen.common.commentText")}' - sortable="true"/> - <sjg:gridColumn name="functions" sortable="false" title='' width="10" - formatter="commentFunctions"/> - </sjg:grid> - </div--%> - - <%--<br/>--%> - <div id="commentFormDiv"> <s:form id='addCommentForm' method="POST" namespace="/poll" validate="true"> @@ -545,9 +482,7 @@ </div> - <sj:dialog id="deleteCommentDialog" resizable="false" - title="%{getText('pollen.title.delete.pollComment')}" - autoOpen="false" modal="true" width="800"/> - + <sj:dialog id="confirmDialog" resizable="false" autoOpen="false" modal="true" + width="800"/> </div> </s:if> \ No newline at end of file

1 0

r3378 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll
by tchemit＠users.chorem.org 24 May '12

24 May '12

Author: tchemit Date: 2012-05-24 11:11:39 +0200 (Thu, 24 May 2012) New Revision: 3378 Url: http://chorem.org/repositories/revision/pollen/3378 Log: fix log usage Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-05-24 09:11:22 UTC (rev 3377) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-05-24 09:11:39 UTC (rev 3378) @@ -624,7 +624,9 @@ result = reindexMap(result, maxNumber); int size = result.size(); - log.info("nbTextChoices (from request) = " + size); + if (log.isInfoEnabled()) { + log.info("nbTextChoices (from request) = " + size); + } logChoice(result); return result; } @@ -660,7 +662,9 @@ result = reindexMap(result, maxNumber); int size = result.size(); - log.info("nbDateChoices (from request) = " + size); + if (log.isInfoEnabled()) { + log.info("nbDateChoices (from request) = " + size); + } logChoice(result); return result; } @@ -696,7 +700,9 @@ } result = reindexMap(result, maxNumber); int size = result.size(); - log.info("nbImageChoices (from request) = " + size); + if (log.isInfoEnabled()) { + log.info("nbImageChoices (from request) = " + size); + } logChoice(result); return result; } @@ -739,7 +745,9 @@ result = reindexMap(result, maxNumber); int size = result.size(); - log.info("nbVotingList [" + pollType + "] (from request) = " + size); + if (log.isInfoEnabled()) { + log.info("nbVotingList [" + pollType + "] (from request) = " + size); + } // add personToList maps to session (but just now, since votingList // could have been reindex)

1 0

r3377 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions resources/i18n
by tchemit＠users.chorem.org 24 May '12

24 May '12

Author: tchemit Date: 2012-05-24 11:11:22 +0200 (Thu, 24 May 2012) New Revision: 3377 Url: http://chorem.org/repositories/revision/pollen/3377 Log: fixes #563: Allow simple date in choice list Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java 2012-05-18 14:50:18 UTC (rev 3376) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/DateConverter.java 2012-05-24 09:11:22 UTC (rev 3377) @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.util.StrutsTypeConverter; -import org.nuiton.i18n.I18n; import org.nuiton.util.DateUtil; import java.text.ParseException; @@ -36,20 +35,23 @@ import java.util.Locale; import java.util.Map; +import static org.nuiton.i18n.I18n.l_; + /** * Created: 18/04/12 * * @author fdesbois <desbois(a)codelutin.com> + * @since 1.3 */ public class DateConverter extends StrutsTypeConverter { - + private static final Log log = LogFactory.getLog(DateConverter.class); @Override public Date convertFromString(Map context, String[] values, Class toClass) { String value = values[0]; Date result = convertFromString(value); - return result; + return result; } @Override @@ -58,29 +60,42 @@ String result = convertToString(date); return result; } - + public static String convertToString(Date date) { - String result = DateUtil.formatDate(date, getDatePattern()); + String result = DateUtil.formatDate(date, getDateTimePattern()); return result; } public static Date convertFromString(String value) { Date result = null; if (StringUtils.isNotBlank(value)) { + // try first with a date-time pattern try { - result = DateUtil.parseDate(value, getDatePattern()); + result = DateUtil.parseDate(value, getDateTimePattern()); } catch (ParseException e) { - if (log.isErrorEnabled()) { - log.error("Error parsing date '" + value + "'", e); + + // fall-back, try with a date pattern + try { + result = DateUtil.parseDate(value, getDatePattern()); + } catch (ParseException e1) { + if (log.isErrorEnabled()) { + log.error("Error parsing date '" + value + "'", e1); + } } } } return result; } + private static String getDateTimePattern() { + Locale locale = ActionContext.getContext().getLocale(); + String result = l_(locale, "pollen.common.dateTimePattern"); + return result; + } + private static String getDatePattern() { Locale locale = ActionContext.getContext().getLocale(); - String result = I18n.l_(locale, "pollen.common.datePattern"); + String result = l_(locale, "pollen.common.datePattern"); return result; } } Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-18 14:50:18 UTC (rev 3376) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-24 09:11:22 UTC (rev 3377) @@ -66,8 +66,9 @@ pollen.common.commentText=Comment pollen.common.comments=Comments about this poll pollen.common.csvImport=CSV import -pollen.common.datePattern=MM/dd/yyyy HH\:mm +pollen.common.datePattern=MM/dd/yyyy pollen.common.datePickerPattern=mm/dd/yy +pollen.common.dateTimePattern=MM/dd/yyyy HH\:mm pollen.common.description=Description pollen.common.displayType-group=Results by groups pollen.common.displayType-normal=Results @@ -147,7 +148,7 @@ pollen.error.choice.empty=%s mandatory pollen.error.comment.name.empty=Comment name mandatory pollen.error.comment.text.empty=Comment text mandatory -pollen.error.date.format=Begin date does not match pattern 12/31/2000 12\:59 +pollen.error.date.format=Date does not match pattern MM/dd/yyyy [hh:mm] (example 12/31/2000 12\:59) pollen.error.email.invalid=The email doesn't have the good format pollen.error.email.required=You must provide an email pollen.error.favoriteList.already.used=List name already used Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-18 14:50:18 UTC (rev 3376) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-24 09:11:22 UTC (rev 3377) @@ -66,8 +66,9 @@ pollen.common.commentText=Commentaire pollen.common.comments=Commentaire à propos du sondage pollen.common.csvImport=Import CSV -pollen.common.datePattern=dd/MM/yyyy HH\:mm +pollen.common.datePattern=dd/MM/yyyy pollen.common.datePickerPattern=dd/mm/yy +pollen.common.dateTimePattern=dd/MM/yyyy HH\:mm pollen.common.description=Description pollen.common.displayType-group=Résultats par groupes pollen.common.displayType-normal=Résultats @@ -145,7 +146,7 @@ pollen.error.choice.empty=%s obligatoire pollen.error.comment.name.empty=Nom du commentaire obligatoire pollen.error.comment.text.empty=Texte du commentaire obligatoire -pollen.error.date.format=La date doit être au format 31/12/2000 23\:59 +pollen.error.date.format=La date doit être au format jj/MM/aaaa [hh:mm] (exemple 31/12/2000 23\:59) pollen.error.email.invalid=Email non valide pollen.error.email.required=Email obligatoire pollen.error.favoriteList.already.used=Nom de liste déjà utilisé

1 0