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

r3165 - in branches/pollen-1.2.6-struts2/pollen-persistence/src: main/java/org/chorem/pollen test/resources
by tchemit＠users.chorem.org March 7, 2012

March 7, 2012

Author: tchemit Date: 2012-03-07 17:43:44 +0100 (Wed, 07 Mar 2012) New Revision: 3165 Url: http://chorem.org/repositories/revision/pollen/3165 Log: reuse the siteUrl applicationUrl, safer than using url from request... Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/pollen-fake.properties Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-03-07 11:35:46 UTC (rev 3164) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-03-07 16:43:44 UTC (rev 3165) @@ -37,6 +37,7 @@ import java.io.File; import java.io.IOException; +import java.net.URL; import java.util.Map; import java.util.Properties; @@ -84,6 +85,14 @@ "Could not parse configuration", e); } + // check application url is ok + URL applicationUrl = getApplicationUrl(); + if (applicationUrl == null) { + throw new IllegalStateException( + "No application url defined in configuration, please fill the property '" + + PollenConfigurationOption.APPLICATION_URL.key + "'"); + } + createDirectory(PollenConfigurationOption.EMAIL_DIR); createDirectory(PollenConfigurationOption.FEED_DIR); createDirectory(PollenConfigurationOption.IMG_DIR); @@ -93,6 +102,13 @@ } } + public URL getApplicationUrl() { + URL result = applicationConfig.getOptionAsURL( + PollenConfigurationOption.APPLICATION_URL.key + ); + return result; + } + public ChoiceType getDefaultChoiceType() { ChoiceType result = applicationConfig.getOption( ChoiceType.class, Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-03-07 11:35:46 UTC (rev 3164) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-03-07 16:43:44 UTC (rev 3165) @@ -30,6 +30,7 @@ import org.nuiton.util.Version; import java.io.File; +import java.net.URL; /** * All Pollen configuration options. @@ -40,6 +41,8 @@ public enum PollenConfigurationOption implements ApplicationConfig.OptionDef { /** login for default admin. */ + APPLICATION_URL("siteUrl", "Application url", "", URL.class), + /** login for default admin. */ DATA_DIR("pollen.dataDirectory", "Default directory where to put datas", "${HOME}/.pollen", File.class), /** login for default admin. */ ADMIN_LOGIN("adminLogin", "login for default admin", "admin", String.class), Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties 2012-03-07 11:35:46 UTC (rev 3164) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties 2012-03-07 16:43:44 UTC (rev 3165) @@ -21,17 +21,13 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -# Default to info level output; this is very handy if you eventually use Hibernate as well. -log4j.rootCategory=warn, A1 +log4j.rootCategory=WARN, A1 # A1 is set to be a ConsoleAppender. log4j.appender.A1=org.apache.log4j.ConsoleAppender # A1 uses PatternLayout. log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%d [%p] %c{2} %m%n +log4j.appender.A1.layout.ConversionPattern=%d [%p] %c %m%n -log4j.logger.org.chorem.pollen=debug - -log4j.logger.org.chorem.pollen.business.PollenContextImpl=warn -log4j.logger.org.chorem.pollen.business.services.SendMail=warn +log4j.logger.org.chorem.pollen=INFO Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/pollen-fake.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/pollen-fake.properties 2012-03-07 11:35:46 UTC (rev 3164) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/pollen-fake.properties 2012-03-07 16:43:44 UTC (rev 3165) @@ -33,6 +33,7 @@ topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback topia.service.migration.showSql=true +siteUrl=http://meFake/pollen upImgDir=${testDirectory}/.pollen/uploadedImages feedDir=${testDirectory}/.pollen/feeds pollen.emails.directory=${testDirectory}/.pollen/emails

1 0

r3164 - in branches/pollen-1.2.6-struts2/pollen-persistence/src/main: java/org/chorem/pollen/entities/migration xmi
by tchemit＠users.chorem.org March 7, 2012

March 7, 2012

Author: tchemit Date: 2012-03-07 12:35:46 +0100 (Wed, 07 Mar 2012) New Revision: 3164 Url: http://chorem.org/repositories/revision/pollen/3164 Log: Evolution #480: Change all field in model to primitive type Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.zargo Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java 2012-03-06 10:39:17 UTC (rev 3163) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java 2012-03-07 11:35:46 UTC (rev 3164) @@ -78,11 +78,11 @@ migrateVoteCountingTypes(tx, queries); // change all Boolean properties to boolean - migrateBoolean(tx, queries); + migrateToPrimitiveTypes(tx, queries); } - private void migrateBoolean(TopiaContextImplementor tx, - List<String> queries) throws TopiaException { + private void migrateToPrimitiveTypes(TopiaContextImplementor tx, + List<String> queries) throws TopiaException { migrateBoolean(queries, "useraccount", "administrator"); migrateBoolean(queries, "choice", "validate"); @@ -98,19 +98,38 @@ migrateBoolean(queries, "preventRule", "oneTime"); migrateBoolean(queries, "result", "byGroup"); migrateBoolean(queries, "vote", "anonymous"); + + migrateNumber(queries, "poll", "maxChoiceNb"); + migrateNumber(queries, "preventRule", "sensibility"); + + migrateNumber(queries, "PersonToList", "weight"); + migrateNumber(queries, "VotingList", "weight"); + migrateNumber(queries, "Vote", "weight"); } - public static final String UPDATE_BOOLEAN_VALUE = "UPDATE %1$s SET %2$s = false where %2$s IS NULL"; + public static final String UPDATE_PRIMITIVE_TO_DEFAULT_VALUE = "UPDATE %1$s SET %2$s = %3$s where %2$s IS NULL;"; - public static final String UPDATE_BOOLEAN_CONSTRAINST = "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL"; + public static final String ADD_PRIMITIVE_NOT_NULL_CONSTRAINST = "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL;"; + public static final String ADD_PRIMITIVE_DEFAULT_VALUE = "ALTER TABLE %s ALTER COLUMN %s SET DEFAULT %s;"; + private void migrateBoolean(List<String> queries, String tableName, String field) { - queries.add(String.format(UPDATE_BOOLEAN_VALUE, tableName, field)); - queries.add(String.format(UPDATE_BOOLEAN_CONSTRAINST, tableName, field)); + Object defaultValue = false; + queries.add(String.format(UPDATE_PRIMITIVE_TO_DEFAULT_VALUE, tableName, field, defaultValue)); + queries.add(String.format(ADD_PRIMITIVE_NOT_NULL_CONSTRAINST, tableName, field)); + queries.add(String.format(ADD_PRIMITIVE_DEFAULT_VALUE, tableName, field, defaultValue)); } + private void migrateNumber(List<String> queries, String tableName, String field) { + + Object defaultValue = 0; + queries.add(String.format(UPDATE_PRIMITIVE_TO_DEFAULT_VALUE, tableName, field, defaultValue)); + queries.add(String.format(ADD_PRIMITIVE_NOT_NULL_CONSTRAINST, tableName, field)); + queries.add(String.format(ADD_PRIMITIVE_DEFAULT_VALUE, tableName, field, defaultValue)); + } + private void migrateChoiceTypes(TopiaContextImplementor tx, List<String> queries) throws TopiaException { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.zargo =================================================================== (Binary files differ)

1 0

r3163 - in branches/pollen-1.2.6-struts2: pollen-business/src/main/java/org/chorem/pollen/business/converters pollen-business/src/main/java/org/chorem/pollen/business/services pollen-persistence/src/main/java/org/chorem/pollen/entities/migration pollen-persistence/src/main/xmi pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll
by tchemit＠users.chorem.org March 6, 2012

March 6, 2012

Author: tchemit Date: 2012-03-06 11:39:17 +0100 (Tue, 06 Mar 2012) New Revision: 3163 Url: http://chorem.org/repositories/revision/pollen/3163 Log: Evolution #480: Change all Boolean field in model to boolean Modified: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataChoiceConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollAccountConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPreventRuleConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataResultConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteCountingConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.zargo branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java Modified: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataChoiceConverter.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataChoiceConverter.java 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataChoiceConverter.java 2012-03-06 10:39:17 UTC (rev 3163) @@ -70,7 +70,7 @@ choiceDTO.setHidden(eChoiceName != null && eChoiceName.startsWith(NumberMethod.HIDDEN_PREFIX)); choiceDTO.setDescription(eChoice.getDescription()); - choiceDTO.setValidate(eChoice.getValidate()); + choiceDTO.setValidate(eChoice.isValidate()); if (eChoice.getPoll() != null) { choiceDTO.setPollId(eChoice.getPoll().getTopiaId()); Modified: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollAccountConverter.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollAccountConverter.java 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollAccountConverter.java 2012-03-06 10:39:17 UTC (rev 3163) @@ -133,7 +133,7 @@ //VotingListDTO votingListDTO = votingListConverter.createVotingListDTO(personToList.getVotingList()); dto.setWeight(personToList.getWeight()); - dto.setHasVoted(personToList.getHasVoted()); + dto.setHasVoted(personToList.isHasVoted()); //dto.setVotingListId(votingListDTO.getId()); } } Modified: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java 2012-03-06 10:39:17 UTC (rev 3163) @@ -102,11 +102,11 @@ pollDTO.setBeginDate(ePoll.getBeginDate()); pollDTO.setEndDate(ePoll.getEndDate()); pollDTO.setAnonymous(ePoll.getAnonymous()); - pollDTO.setAnonymousVoteAllowed(ePoll.getAnonymousVoteAllowed()); - pollDTO.setPublicResults(ePoll.getPublicResults()); - pollDTO.setContinuousResults(ePoll.getContinuousResults()); - pollDTO.setChoiceAddAllowed(ePoll.getChoiceAddAllowed()); - pollDTO.setClosed(ePoll.getClosed()); + pollDTO.setAnonymousVoteAllowed(ePoll.isAnonymousVoteAllowed()); + pollDTO.setPublicResults(ePoll.isPublicResults()); + pollDTO.setContinuousResults(ePoll.isContinuousResults()); + pollDTO.setChoiceAddAllowed(ePoll.isChoiceAddAllowed()); + pollDTO.setClosed(ePoll.isClosed()); pollDTO.setMaxChoiceNb(ePoll.getMaxChoiceNb()); pollDTO.setChoiceType(EnumController.getChoiceType(ePoll)); pollDTO.setPollType(EnumController.getPollType(ePoll)); Modified: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPreventRuleConverter.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPreventRuleConverter.java 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPreventRuleConverter.java 2012-03-06 10:39:17 UTC (rev 3163) @@ -70,9 +70,9 @@ preventRuleDTO.setId(preventRule.getTopiaId()); preventRuleDTO.setScope(preventRule.getScope()); preventRuleDTO.setSensibility(preventRule.getSensibility()); - preventRuleDTO.setActive(preventRule.getActive()); - preventRuleDTO.setOneTime(preventRule.getOneTime()); - preventRuleDTO.setRepeated(preventRule.getRepeated()); + preventRuleDTO.setActive(preventRule.isActive()); + preventRuleDTO.setOneTime(preventRule.isOneTime()); + preventRuleDTO.setRepeated(preventRule.isRepeated()); preventRuleDTO.setMethod(preventRule.getMethod()); if (preventRule.getPoll() != null) { Modified: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataResultConverter.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataResultConverter.java 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataResultConverter.java 2012-03-06 10:39:17 UTC (rev 3163) @@ -93,7 +93,7 @@ dto.setHidden(resName != null && resName.startsWith(NumberMethod.HIDDEN_PREFIX)); dto.setValue(res.getResultValue()); - dto.setByGroup(res.getByGroup()); + dto.setByGroup(res.isByGroup()); dto.setChoiceType(EnumController.getChoiceType(ePoll)); dto.setVoteCounting(EnumController.getVoteCountingType(ePoll)); results.add(dto); Modified: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteCountingConverter.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteCountingConverter.java 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteCountingConverter.java 2012-03-06 10:39:17 UTC (rev 3163) @@ -58,11 +58,11 @@ pollDTO.setBeginDate(ePoll.getBeginDate()); pollDTO.setEndDate(ePoll.getEndDate()); pollDTO.setAnonymous(ePoll.getAnonymous()); - pollDTO.setAnonymousVoteAllowed(ePoll.getAnonymousVoteAllowed()); - pollDTO.setPublicResults(ePoll.getPublicResults()); - pollDTO.setContinuousResults(ePoll.getContinuousResults()); - pollDTO.setChoiceAddAllowed(ePoll.getChoiceAddAllowed()); - pollDTO.setClosed(ePoll.getClosed()); + pollDTO.setAnonymousVoteAllowed(ePoll.isAnonymousVoteAllowed()); + pollDTO.setPublicResults(ePoll.isPublicResults()); + pollDTO.setContinuousResults(ePoll.isContinuousResults()); + pollDTO.setChoiceAddAllowed(ePoll.isChoiceAddAllowed()); + pollDTO.setClosed(ePoll.isClosed()); pollDTO.setCreatorId(ePoll.getCreator().getVotingId()); pollDTO.setCreatorEmail(ePoll.getCreator().getEmail()); pollDTO.setMaxChoiceNb(ePoll.getMaxChoiceNb()); Modified: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2012-03-06 10:39:17 UTC (rev 3163) @@ -390,7 +390,7 @@ for (VotingList votingList : poll.getVotingList()) { for (PersonToList personToList : votingList .getPollAccountPersonToList()) { - if (!personToList.getHasVoted()) { + if (!personToList.isHasVoted()) { PollAccount pollAccount = personToList .getPollAccount(); if (pollAccount != null Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java 2012-03-06 10:39:17 UTC (rev 3163) @@ -68,9 +68,6 @@ // } else if (dialect instanceof H2Dialect) { // } - // let's use a primitive boolean - queries.add("update useraccount set administrator = false where administrator is null;"); - // change choice type to use enumeration migrateChoiceTypes(tx, queries); @@ -79,9 +76,41 @@ // change vote counting type to use enumeration migrateVoteCountingTypes(tx, queries); + + // change all Boolean properties to boolean + migrateBoolean(tx, queries); } + private void migrateBoolean(TopiaContextImplementor tx, + List<String> queries) throws TopiaException { + migrateBoolean(queries, "useraccount", "administrator"); + migrateBoolean(queries, "choice", "validate"); + migrateBoolean(queries, "personToList", "hasVoted"); + migrateBoolean(queries, "poll", "closed"); + migrateBoolean(queries, "poll", "choiceAddAllowed"); + migrateBoolean(queries, "poll", "anonymousVoteAllowed"); + migrateBoolean(queries, "poll", "anonymous"); + migrateBoolean(queries, "poll", "publicResults"); + migrateBoolean(queries, "poll", "continuousResults"); + migrateBoolean(queries, "preventRule", "repeated"); + migrateBoolean(queries, "preventRule", "active"); + migrateBoolean(queries, "preventRule", "oneTime"); + migrateBoolean(queries, "result", "byGroup"); + migrateBoolean(queries, "vote", "anonymous"); + } + + public static final String UPDATE_BOOLEAN_VALUE = "UPDATE %1$s SET %2$s = false where %2$s IS NULL"; + + public static final String UPDATE_BOOLEAN_CONSTRAINST = "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL"; + + private void migrateBoolean(List<String> queries, String tableName, String field) { + + queries.add(String.format(UPDATE_BOOLEAN_VALUE, tableName, field)); + queries.add(String.format(UPDATE_BOOLEAN_CONSTRAINST, tableName, field)); + + } + private void migrateChoiceTypes(TopiaContextImplementor tx, List<String> queries) throws TopiaException { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties 2012-03-06 10:39:17 UTC (rev 3163) @@ -26,3 +26,4 @@ model.tagvalue.constantPrefix=PROPERTY_ model.tagvalue.java.lang.String=text model.tagvalue.version=1.2.6 +model.tagvalue.doNotGenerateBooleanGetMethods=true Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.zargo =================================================================== (Binary files differ) Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java 2012-03-06 10:39:17 UTC (rev 3163) @@ -195,7 +195,7 @@ dto.setHidden(resName != null && resName.startsWith(NumberMethod.HIDDEN_PREFIX)); dto.setValue(res.getResultValue()); - dto.setByGroup(res.getByGroup()); + dto.setByGroup(res.isByGroup()); dto.setChoiceType(poll.getChoiceType()); dto.setVoteCountingType(poll.getVoteCountingType()); results.add(dto); Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-03-06 10:39:17 UTC (rev 3163) @@ -120,19 +120,19 @@ PollDAO pollDAO = getDAO(Poll.class); Poll result = create(pollDAO); - result.setAnonymous(poll.getAnonymous()); - result.setAnonymousVoteAllowed(poll.getAnonymousVoteAllowed()); + result.setAnonymous(poll.isAnonymous()); + result.setAnonymousVoteAllowed(poll.isAnonymousVoteAllowed()); result.setBeginChoiceDate(poll.getBeginChoiceDate()); result.setBeginDate(poll.getBeginDate()); result.setChoiceType(poll.getChoiceType()); - result.setContinuousResults(poll.getContinuousResults()); + result.setContinuousResults(poll.isContinuousResults()); result.setDescription(poll.getDescription()); result.setEndDate(poll.getEndDate()); result.setEndChoiceDate(poll.getEndChoiceDate()); result.setPollId(poll.getPollId()); result.setPollType(poll.getPollType()); result.setMaxChoiceNb(poll.getMaxChoiceNb()); - result.setPublicResults(poll.getPublicResults()); + result.setPublicResults(poll.isPublicResults()); result.setTitle(poll.getTitle()); result.setVoteCountingType(poll.getVoteCountingType()); @@ -155,10 +155,10 @@ for (PreventRule preventRule : poll.getPreventRule()) { PreventRule preventRuleCreated = create(preventRuleDAO); - preventRuleCreated.setActive(preventRule.getActive()); + preventRuleCreated.setActive(preventRule.isActive()); preventRuleCreated.setMethod(preventRule.getMethod()); - preventRuleCreated.setOneTime(preventRule.getOneTime()); - preventRuleCreated.setRepeated(preventRule.getRepeated()); + preventRuleCreated.setOneTime(preventRule.isOneTime()); + preventRuleCreated.setRepeated(preventRule.isRepeated()); preventRuleCreated.setScope(preventRule.getScope()); preventRuleCreated.setSensibility(preventRule.getSensibility()); result.addPreventRule(preventRule); @@ -185,7 +185,7 @@ for (PersonToList personToList : votingList.getPollAccountPersonToList()) { PersonToList personToListCreated = create(personToListDAO); - personToListCreated.setHasVoted(personToList.getHasVoted()); + personToListCreated.setHasVoted(personToList.isHasVoted()); personToListCreated.setWeight(personToList.getWeight()); votingListCreated.addPollAccountPersonToList(personToListCreated); @@ -215,7 +215,7 @@ Choice choiceCreated = create(choiceDAO); choiceCreated.setDescription(choice.getDescription()); choiceCreated.setName(choice.getName()); - choiceCreated.setValidate(choice.getValidate()); + choiceCreated.setValidate(choice.isValidate()); result.addChoice(choiceCreated); if (choiceType == ChoiceType.IMAGE) { @@ -314,7 +314,7 @@ for (VotingList votingList : poll.getVotingList()) { for (PersonToList personToList : votingList .getPollAccountPersonToList()) { - if (!personToList.getHasVoted()) { + if (!personToList.isHasVoted()) { PollAccount pollAccount = personToList .getPollAccount(); @@ -512,12 +512,12 @@ result.setBeginChoiceDate(poll.getBeginChoiceDate()); result.setBeginDate(poll.getBeginDate()); result.setEndDate(poll.getEndDate()); - result.setAnonymous(poll.getAnonymous()); - result.setAnonymousVoteAllowed(poll.getAnonymousVoteAllowed()); - result.setPublicResults(poll.getPublicResults()); - result.setContinuousResults(poll.getContinuousResults()); - result.setChoiceAddAllowed(poll.getChoiceAddAllowed()); - result.setClosed(poll.getClosed()); + result.setAnonymous(poll.isAnonymous()); + result.setAnonymousVoteAllowed(poll.isAnonymousVoteAllowed()); + result.setPublicResults(poll.isPublicResults()); + result.setContinuousResults(poll.isContinuousResults()); + result.setChoiceAddAllowed(poll.isChoiceAddAllowed()); + result.setClosed(poll.isClosed()); result.setCreatorId(poll.getCreator().getVotingId()); result.setCreatorEmail(poll.getCreator().getEmail()); result.setMaxChoiceNb(poll.getMaxChoiceNb()); Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-03-06 10:39:17 UTC (rev 3163) @@ -163,7 +163,7 @@ List<Vote> results = new ArrayList<Vote>(); try { // No need to load votes for an anonymous poll - if (poll.getAnonymous()) { + if (poll.isAnonymous()) { return results; } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-03-06 10:39:17 UTC (rev 3163) @@ -103,8 +103,7 @@ Set<String> result = Sets.newHashSet(); result.add("vote"); result.add("result"); - Boolean closed = poll.getClosed(); - if (closed == null || !closed) { + if (!poll.isClosed()) { // poll is not closed result.add("edit"); Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-03-06 10:39:17 UTC (rev 3163) @@ -104,8 +104,7 @@ Set<String> result = Sets.newHashSet(); result.add("vote"); result.add("result"); - Boolean closed = poll.getClosed(); - if (closed == null || !closed) { + if (!poll.isClosed()) { // poll is not closed result.add("edit"); Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-03-06 10:39:17 UTC (rev 3163) @@ -201,7 +201,7 @@ Date currentTime = serviceContext.getCurrentTime(); - accountFieldDisplayed = !poll.getAnonymous() || isRestrictedPoll() || isGroupPoll(); + accountFieldDisplayed = !poll.isAnonymous() || isRestrictedPoll() || isGroupPoll(); boolean choicestarted = poll.getBeginChoiceDate() == null || poll.getBeginChoiceDate().before(currentTime); boolean choiceended = poll.getEndChoiceDate() != null && poll.getEndChoiceDate().before(currentTime); @@ -210,10 +210,9 @@ //TODO Move this is poll entity pollChoiceOrVoteStarted = pollChoiceStarted || isPollStarted(); - pollChoiceRunning = poll.getChoiceAddAllowed() && pollChoiceStarted; + pollChoiceRunning = poll.isChoiceAddAllowed() && pollChoiceStarted; - pollRunning = !(poll.getClosed() != null && poll.getClosed()) && - isPollStarted() && !isPollFinished(); + pollRunning = !poll.isClosed() && isPollStarted() && !isPollFinished(); //TODO Deal the case of the not loggued poll (using the pollAccountId creatorUser = getPollenSession().getUserAccount() != null && @@ -327,7 +326,7 @@ } // Génération d'un identifiant de vote (si le sondage est libre et anonyme) - if (poll.getAnonymous()) { + if (poll.isAnonymous()) { anonymousVote = true; if (isFreePoll()) { getPollAccount().setVotingId( @@ -437,7 +436,7 @@ if (poll == null) { addActionError(_("pollen.error.poll.notfound")); } else { - if (poll.getClosed() != null && poll.getClosed()) { + if (poll.isClosed()) { addActionMessage(_("pollen.information.pollClosed")); } else if (!isPollStarted()) { addActionMessage(_("pollen.information.pollNotStarted")); Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-03-05 23:39:29 UTC (rev 3162) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-03-06 10:39:17 UTC (rev 3163) @@ -170,7 +170,7 @@ DateFormat.SHORT, DateFormat.SHORT, getLocale())); - if (poll.getPublicResults()) { + if (poll.isPublicResults()) { userAllowed = true; } else if (StringUtils.isNotEmpty(accountId)) { @@ -182,7 +182,7 @@ if (!userAllowed) { addActionError(_("pollen.error.userNotAllowed")); - } else if (!poll.getClosed()) { + } else if (!poll.isClosed()) { addActionMessage(_("pollen.error.pollNotClosed")); loadResults(); } else {

1 0

r3162 - in branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main: resources/config webapp/WEB-INF/jsp
by tchemit＠users.chorem.org March 5, 2012

March 5, 2012

Author: tchemit Date: 2012-03-06 00:39:29 +0100 (Tue, 06 Mar 2012) New Revision: 3162 Url: http://chorem.org/repositories/revision/pollen/3162 Log: fix urls Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-03-05 23:26:09 UTC (rev 3161) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-03-05 23:39:29 UTC (rev 3162) @@ -66,8 +66,9 @@ </action>  - <action name="edit" + <action name="modification/*" class="org.chorem.pollen.ui.actions.poll.Edit"> + <param name="uriId">{1}</param> <result name="input">/WEB-INF/jsp/poll/edit.jsp</result> <result>/WEB-INF/jsp/poll/resume.jsp</result> </action> @@ -88,29 +89,33 @@ </action>  - <action name="clone" + <action name="clone/*" class="org.chorem.pollen.ui.actions.poll.Clone"> + <param name="uriId">{1}</param> <result name="input">/WEB-INF/jsp/poll/clone.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> </action>  - <action name="export" + <action name="export/*" class="org.chorem.pollen.ui.actions.poll.Export"> + <param name="uriId">{1}</param> <result name="input">/WEB-INF/jsp/poll/export.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> </action>  - <action name="close" + <action name="close/*" class="org.chorem.pollen.ui.actions.poll.Close"> + <param name="uriId">{1}</param> <result name="input">/WEB-INF/jsp/poll/close.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> </action>  - <action name="delete" + <action name="delete/*" class="org.chorem.pollen.ui.actions.poll.Delete"> + <param name="uriId">{1}</param> <result name="input">/WEB-INF/jsp/poll/delete.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> </action> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-03-05 23:26:09 UTC (rev 3161) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-03-05 23:39:29 UTC (rev 3162) @@ -37,23 +37,23 @@ <s:url id='resultImg' value='/img/count.png'/> <s:set id='resultTitle'><s:text name="pollen.action.pollResult"/></s:set> -<s:url id="editUrl" action="edit" namespace="/poll" method="input"/> +<s:url id="editUrl" action="modification/" namespace="/poll" method="input"/> <s:url id='editImg' value='/img/edit.png'/> <s:set id='editTitle'><s:text name="pollen.action.pollEdit"/></s:set> -<s:url id="closeUrl" action="close" namespace="/poll" method="input"/> +<s:url id="closeUrl" action="close/" namespace="/poll" method="input"/> <s:url id='closeImg' value='/img/close.png'/> <s:set id='closeTitle'><s:text name="pollen.action.pollClose"/></s:set> -<s:url id="exportUrl" action="export" namespace="/poll" method="input"/> +<s:url id="exportUrl" action="export/" namespace="/poll" method="input"/> <s:url id='exportImg' value='/img/export.png'/> <s:set id='exportTitle'><s:text name="pollen.action.pollExport"/></s:set> -<s:url id="cloneUrl" action="clone" namespace="/poll" method="input"/> +<s:url id="cloneUrl" action="clone/" namespace="/poll" method="input"/> <s:url id='cloneImg' value='/img/copy.png'/> <s:set id='cloneTitle'><s:text name="pollen.action.pollClone"/></s:set> -<s:url id="deleteUrl" action="delete" namespace="/poll" method="input"/> +<s:url id="deleteUrl" action="delete/" namespace="/poll" method="input"/> <s:url id='deleteImg' value='/img/delete.png'/> <s:set id='deleteTitle'><s:text name="pollen.action.pollDelete"/></s:set> @@ -65,37 +65,34 @@ var result = ""; + if (rowObject['voteId']) { + id = rowObject['voteId']; + } + if (cellvalue.indexOf('vote') > -1) { - if (rowObject['voteId']) { - id = rowObject['voteId']; - } - result += formatLink(null, "${voteUrl}"+id, "${voteImg}", "Vote", "${voteTitle}") + result += formatLink("${voteUrl}" + id, "${voteImg}", "Vote", "${voteTitle}") } if (cellvalue.indexOf('result') > -1) { - result += formatLink(null, "${resultUrl}"+id, "${resultImg}", "Result", "${resultTitle}") + result += formatLink("${resultUrl}" + id, "${resultImg}", "Result", "${resultTitle}") } if (cellvalue.indexOf('edit') > -1) { - result += formatLink(id, "${editUrl}", "${editImg}", "Edit", "${editTitle}") + result += formatLink("${editUrl}" + id, "${editImg}", "Edit", "${editTitle}") } if (cellvalue.indexOf('close') > -1) { - result += formatLink(id, "${closeUrl}", "${closeImg}", "Close", "${closeTitle}") + result += formatLink("${closeUrl}" + id, "${closeImg}", "Close", "${closeTitle}") } if (cellvalue.indexOf('export') > -1) { - result += formatLink(id, "${exportUrl}", "${exportImg}", "Export", "${exportTitle}") + result += formatLink("${exportUrl}" + id, "${exportImg}", "Export", "${exportTitle}") } if (cellvalue.indexOf('clone') > -1) { - result += formatLink(id, "${cloneUrl}", "${cloneImg}", "Clone", "${cloneTitle}") + result += formatLink("${cloneUrl}" + id, "${cloneImg}", "Clone", "${cloneTitle}") } if (cellvalue.indexOf('delete') > -1) { - result += formatLink(id, "${deleteUrl}", "${deleteImg}", "Delete", "${deleteTitle}") + result += formatLink("${deleteUrl}" + id, "${deleteImg}", "Delete", "${deleteTitle}") } return result; } - function formatLink(id, baseUrl, image, imageAlt, imageTitle) { - var url = baseUrl; - if (id) { - url = $.prepareUrl(baseUrl, {pollId:id}); - } + function formatLink(url, image, imageAlt, imageTitle) { return "<a href='" + url + "'><image alt='" + imageAlt + "' title='" + imageTitle + "' src='" + image + "'> </a>"; } </script>

1 0

r3161 - in branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui java/org/chorem/pollen/ui/actions/poll java/org/chorem/pollen/ui/interceptors resources resources/config resources/i18n webapp/WEB-INF webapp/WEB-INF/jsp webapp/WEB-INF/jsp/poll webapp/css
by tchemit＠users.chorem.org March 5, 2012

March 5, 2012

Author: tchemit Date: 2012-03-06 00:26:09 +0100 (Tue, 06 Mar 2012) New Revision: 3161 Url: http://chorem.org/repositories/revision/pollen/3161 Log: Ajout de la page de cr?\195?\169ation d'un sondage Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/choiceHelper.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/dateChoice.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/imageChoice.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/textChoice.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/pollCreation.css Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-03-05 23:25:37 UTC (rev 3160) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-03-05 23:26:09 UTC (rev 3161) @@ -23,10 +23,13 @@ */ package org.chorem.pollen.ui; +import com.google.common.collect.Maps; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.business.persistence.UserAccount; +import java.util.Map; + /** * User session to put in servlet session. * @@ -41,6 +44,9 @@ /** User loggued account (if anonymous, then userAccount is null). */ private UserAccount userAccount; + /** To push dynamic data which should be consumed in a page scope. */ + private Map<String, Object> dynamicData; + public UserAccount getUserAccount() { return userAccount; } @@ -48,4 +54,24 @@ public void setUserAccount(UserAccount userAccount) { this.userAccount = userAccount; } + + public Map<String, Object> getDynamicData() { + if (dynamicData == null) { + dynamicData = Maps.newHashMap(); + } + return dynamicData; + } + + public void putDynamicData(String token, Object data) { + getDynamicData().put(token, data); + } + + public <T> T getDynamicData(String token) { + Object result = getDynamicData().get(token); + return (T) result; + } + + public void removeDynamicData(String token) { + getDynamicData().remove(token); + } } Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java 2012-03-05 23:26:09 UTC (rev 3161) @@ -0,0 +1,105 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.chorem.pollen.business.persistence.Choice; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +import java.util.Map; + +/** + * To generate the display for a text choice. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public abstract class AbstractDisplayChoice extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + /** Where to find dynamic data (says choices in this case). */ + protected String tokenId; + + /** Number of choice to display. */ + protected int choiceNumber; + + /** + * Choice to display in ui (come from dynamic data if exists, or fresh + * created one). + */ + protected Choice choice; + + public void setTokenId(String tokenId) { + this.tokenId = tokenId; + } + + public void setChoiceNumber(int choiceNumber) { + this.choiceNumber = choiceNumber; + } + + public Choice getChoice() { + return choice; + } + + public int getChoiceNumber() { + return choiceNumber; + } + + protected abstract Choice createEmptyChoice(); + + @Override + public String execute() throws Exception { + if (StringUtils.isNotEmpty(tokenId)) { + + Map<Integer, Choice> choices = + getPollenSession().getDynamicData(tokenId); + + if (choices != null) { + + // get choices from datas + choice = choices.get(choiceNumber); + + if (choice != null) { + + // remove this choice from session + choices.remove(choiceNumber); + } + } + + if (MapUtils.isEmpty(choices)) { + + // remove it from session + getPollenSession().removeDynamicData(tokenId); + } + } + + if (choice == null) { + choice = createEmptyChoice(); + } + return SUCCESS; + } + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-03-05 23:25:37 UTC (rev 3160) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-03-05 23:26:09 UTC (rev 3161) @@ -437,7 +437,7 @@ if (poll == null) { addActionError(_("pollen.error.poll.notfound")); } else { - if (poll.getClosed()) { + if (poll.getClosed() != null && poll.getClosed()) { addActionMessage(_("pollen.information.pollClosed")); } else if (!isPollStarted()) { addActionMessage(_("pollen.information.pollNotStarted")); Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java 2012-03-05 23:25:37 UTC (rev 3160) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java 2012-03-05 23:26:09 UTC (rev 3161) @@ -23,9 +23,17 @@ */ package org.chorem.pollen.ui.actions.poll; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.opensymphony.xwork2.Preparable; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.interceptor.ParameterAware; +import org.chorem.pollen.bean.PollImageChoice; import org.chorem.pollen.business.persistence.Choice; import org.chorem.pollen.business.persistence.ChoiceImpl; import org.chorem.pollen.business.persistence.Poll; @@ -37,8 +45,14 @@ import org.chorem.pollen.services.impl.PollService; import org.chorem.pollen.ui.actions.PollenActionSupport; +import java.io.File; +import java.net.URL; +import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Creates a new poll. @@ -46,17 +60,29 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.2.6 */ -public class Create extends PollenActionSupport implements Preparable { +public class Create extends PollenActionSupport implements Preparable, ParameterAware { private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Log log = LogFactory.getLog(Create.class); + + public static final Pattern TEXT_CHOICE_NAME_PATTERN = + Pattern.compile("textChoice_(\\d+).name"); + + public static final Pattern DATE_CHOICE_NAME_PATTERN = + Pattern.compile("dateChoice_(\\d+).name"); + + public static final Pattern IMAGE_CHOICE_NAME_PATTERN = + Pattern.compile("imageChoice_(\\d+).name"); + protected Poll poll; - protected Map<Integer, String> pollTypes; + protected Map<String, String> pollTypes; - protected Map<Integer, String> voteCountingTypes; + protected Map<String, String> voteCountingTypes; - protected Map<Integer, String> choiceTypes; + protected Map<String, String> choiceTypes; protected boolean notification; @@ -68,15 +94,34 @@ protected int notificationNumber; - /** Nombre de choix affichés initialement. */ - private int nbChoices = 5; + private String textChoiceTokenId; - private List<Choice> textChoices; + private String dateChoiceTokenId; - private List<Choice> dateChoices; + private String imageChoiceTokenId; - private List<Choice> imageChoices; + private int nbTextChoices; + private int nbDateChoices; + + private int nbImageChoices; + + /** Uploaded images (for choice type poll). */ + private List<File> imageChoice; + + /** Uploaded images content type (for choice type poll). */ + private List<String> imageChoiceContentType; + + /** Uploaded images name (from use desktop) (for choice type poll). */ + private List<String> imageChoiceFileName; + + /** + * All the parameters send by request used to build back choices of the + * poll. + */ + private Map<String, String[]> parameters; + + @Override public String getPageLogo() { return "Creation"; } @@ -89,15 +134,39 @@ return poll; } - public Map<Integer, String> getPollTypes() { + public int getNbTextChoices() { + return nbTextChoices; + } + + public String getTextChoiceTokenId() { + return textChoiceTokenId; + } + + public int getNbDateChoices() { + return nbDateChoices; + } + + public String getDateChoiceTokenId() { + return dateChoiceTokenId; + } + + public int getNbImageChoices() { + return nbImageChoices; + } + + public String getImageChoiceTokenId() { + return imageChoiceTokenId; + } + + public Map<String, String> getPollTypes() { return pollTypes; } - public Map<Integer, String> getVoteCountingTypes() { + public Map<String, String> getVoteCountingTypes() { return voteCountingTypes; } - public Map<Integer, String> getChoiceTypes() { + public Map<String, String> getChoiceTypes() { return choiceTypes; } @@ -141,81 +210,411 @@ this.notificationNumber = notificationNumber; } - public int getNbChoices() { - return nbChoices; + public List<File> getImageChoice() { + if (imageChoice == null) { + imageChoice = Lists.newArrayList(); + } + return imageChoice; } - public List<Choice> getTextChoices() { - if (textChoices == null) { - textChoices = Lists.newLinkedList(); + public void setImageChoice(int index, File imageChoice) { + addtoList(getImageChoice(), index, imageChoice); + } + + public List<String> getImageChoiceContentType() { + if (imageChoiceContentType == null) { + imageChoiceContentType = Lists.newArrayList(); } - return textChoices; + return imageChoiceContentType; } - public Choice getTextChoices(int index) { - return getChoices(getTextChoices(), index); + public List<String> getImageChoiceFileName() { + if (imageChoiceFileName == null) { + imageChoiceFileName = Lists.newArrayList(); + } + return imageChoiceFileName; } - public Choice getDateChoices(int index) { - return getChoices(getDateChoices(), index); + public void setImageChoiceContentType(int index, String imageChoiceContentType) { + addtoList(getImageChoiceContentType(), index, imageChoiceContentType); } - public Choice getImageChoices(int index) { - return getChoices(getImageChoices(), index); + public void setImageChoiceFileName(int index, String imageChoiceFileName) { + addtoList(getImageChoiceFileName(), index, imageChoiceFileName); } - public List<Choice> getDateChoices() { - if (dateChoices == null) { - dateChoices = Lists.newLinkedList(); + @Override + public void prepare() throws Exception { + + pollTypes = decorateToName(PollType.values()); + choiceTypes = decorateToName(ChoiceType.values()); + voteCountingTypes = decorateToName(VoteCountingType.values()); + + //TODO tchemit-2012-03-05 use a default value from configuration + nbTextChoices = nbDateChoices = nbImageChoices = 5; + + String tokenSuffix = getServiceContext().createPollenUrlId(); + + textChoiceTokenId = DisplayTextChoice.CHOICE_TOKEN + "_" + + tokenSuffix; + + dateChoiceTokenId = DisplayDateChoice.CHOICE_TOKEN + "_" + + tokenSuffix; + + imageChoiceTokenId = DisplayImageChoice.CHOICE_TOKEN + "_" + + tokenSuffix; + + ChoiceType pollChoiceType = getPoll().getChoiceType(); + + if (log.isInfoEnabled()) { + log.info("choice type " + pollChoiceType); } - return dateChoices; + + Map<Integer, Choice> choices = null; + String tokenId = null; + + switch (pollChoiceType) { + case TEXT: + choices = buildTextChoices(5); + tokenId = textChoiceTokenId; + break; + case DATE: + choices = buildDateChoices(5); + tokenId = dateChoiceTokenId; + break; + case IMAGE: + choices = buildImageChoices(5); + tokenId = imageChoiceTokenId; + break; + } + getPollenSession().putDynamicData(tokenId, choices); } - public List<Choice> getImageChoices() { - if (imageChoices == null) { - imageChoices = Lists.newLinkedList(); + @Override + public void validate() { + + Preconditions.checkNotNull(poll); + + // poll must have a title + if (StringUtils.isEmpty(poll.getTitle())) { + addFieldError("poll.title", _("poll.error.poll.required.title")); } - return imageChoices; + + // validate choices + Map<Integer, Choice> orderedChoices = getOrderedChoices(); + + if (MapUtils.isEmpty(orderedChoices)) { + + // poll must have at least one choice + addFieldError("poll.choices", + _("poll.error.poll.required.one.choice")); + } else { + + // check there is no choice with same name + boolean duplicateNameDetected = false; + Set<String> names = Sets.newHashSet(); + for (Choice choice : orderedChoices.values()) { + String choiceName = choice.getName(); + if (!names.add(choiceName)) { + duplicateNameDetected = true; + break; + } + } + if (duplicateNameDetected) { + addFieldError("poll.choices", + _("poll.error.poll.detected.duplicate.choice.name")); + } + } + + // validate security stuff + } @Override public String execute() throws Exception { + Map<Integer, Choice> orderedChoices = getOrderedChoices(); + + List<Choice> choices = Lists.newLinkedList(); + + for (Integer index : orderedChoices.keySet()) { + Choice choice = orderedChoices.get(index); + poll.addChoice(choice); + } + PollService service = newService(PollService.class); -// try { -// Poll basicPoll = service.createBasicPoll(poll); -// -// return SUCCESS; -// } catch (TopiaException e) { -// -// } + poll = service.createPoll(poll); - // back to input + getTransaction().commitTransaction(); + + // remove all stuff from session + getPollenSession().removeDynamicData(textChoiceTokenId); + getPollenSession().removeDynamicData(dateChoiceTokenId); + getPollenSession().removeDynamicData(imageChoiceTokenId); + + addActionMessage(_("poll.info.poll.created")); return SUCCESS; } + public String getPollVoteUrl() { + URL applicationUrl = getApplicationUrl(); + StringBuilder url = new StringBuilder(applicationUrl.toString()); + + url.append("/poll/votefor/").append(poll.getPollId()); + + if (poll.getPollType() != PollType.FREE) { + url.append(':').append(poll.getCreator().getAccountId()); + } + return url.toString(); + } + + public String getPollEditUrl() { + URL applicationUrl = getApplicationUrl(); + StringBuilder url = new StringBuilder(applicationUrl.toString()); + + url.append("/poll/modification/").append(poll.getPollId()); + url.append(':').append(poll.getCreator().getAccountId()); + return url.toString(); + } + @Override - public void prepare() throws Exception { + public void setParameters(Map<String, String[]> parameters) { + this.parameters = parameters; + } - pollTypes = decorate(PollType.values()); - choiceTypes = decorate(ChoiceType.values()); - voteCountingTypes = decorate(VoteCountingType.values()); + private Map<Integer, Choice> getOrderedChoices() { + Map<Integer, Choice> orderedChoices = null; + switch (poll.getChoiceType()) { + + case TEXT: + orderedChoices = getPollenSession().getDynamicData( + textChoiceTokenId); + + break; + case DATE: + orderedChoices = getPollenSession().getDynamicData( + dateChoiceTokenId); + break; + case IMAGE: + orderedChoices = getPollenSession().getDynamicData( + imageChoiceTokenId); + break; + } + return orderedChoices; } - private <E extends Enum<E> & I18nAble> Map<Integer, String> decorate(E... values) { - Map<Integer, String> result = Maps.newLinkedHashMap(); - for (E value : values) { - result.put(value.ordinal(), getText(value.getI18nKey())); + private Map<Integer, Choice> buildTextChoices(int nbDefault) { + Map<Integer, Choice> result = Maps.newTreeMap(); + + int maxNumber = 0; + + for (String paramName : parameters.keySet()) { + + Matcher matcher = TEXT_CHOICE_NAME_PATTERN.matcher(paramName); + if (matcher.matches()) { + + // found a text choice name + + String paramValue = getNonEmptyParameterValue(paramName); + if (paramValue != null) { + + // can keep this none empty text choice name + + Integer choiceNumber = Integer.valueOf(matcher.group(1)); + if (choiceNumber > maxNumber) { + maxNumber = choiceNumber; + } + Choice choice = new ChoiceImpl(); + createChoice(choice, "textChoice_" + choiceNumber, + paramValue); + result.put(choiceNumber, choice); + } + } } + result = reindexChoices(result, maxNumber); + + int size = result.size(); + nbTextChoices = Math.max(nbDefault, size); + log.info("nbTextChoices (from request) = " + size); + logChoice(result); return result; } - private Choice getChoices(List<Choice> choices, int index) { - while (choices.size() < index) { - choices.add(new ChoiceImpl()); + private Map<Integer, Choice> buildDateChoices(int nbDefault) { + Map<Integer, Choice> result = Maps.newTreeMap(); + + int maxNumber = 0; + for (String paramName : parameters.keySet()) { + + Matcher matcher = DATE_CHOICE_NAME_PATTERN.matcher(paramName); + if (matcher.matches()) { + + // found a text choice name + + String paramValue = getNonEmptyParameterValue(paramName); + if (paramValue != null) { + + // can keep this none empty text choice name + + Integer choiceNumber = Integer.valueOf(matcher.group(1)); + if (choiceNumber > maxNumber) { + maxNumber = choiceNumber; + } + Choice choice = new ChoiceImpl(); + createChoice(choice, + "dateChoice_" + choiceNumber, + paramValue); + result.put(choiceNumber, choice); + } + } } - return choices.get(index); + result = reindexChoices(result, maxNumber); + + int size = result.size(); + nbDateChoices = Math.max(nbDefault, size); + log.info("nbDateChoices (from request) = " + size); + logChoice(result); + return result; } + + private Map<Integer, Choice> buildImageChoices(int nbDefault) { + Map<Integer, Choice> result = Maps.newTreeMap(); + + // push back in parameters stuff from uploaded files + int index = 0; + + for (String fileName : getImageChoiceFileName()) { + if (fileName != null) { + parameters.put("imageChoice_" + index + ".name", new String[]{fileName}); + parameters.put("imageChoice_" + index + ".location", new String[]{getImageChoice().get(index).getAbsolutePath()}); + } + index++; + } + + int maxNumber = 0; + for (String paramName : parameters.keySet()) { + + Matcher matcher = IMAGE_CHOICE_NAME_PATTERN.matcher(paramName); + if (matcher.matches()) { + + // found a text choice name + + String paramValue = getNonEmptyParameterValue(paramName); + if (paramValue != null) { + + // can keep this none empty text choice name + + Integer choiceNumber = Integer.valueOf(matcher.group(1)); + if (choiceNumber > maxNumber) { + maxNumber = choiceNumber; + } + PollImageChoice choice = new PollImageChoice(); + createImageChoice(choice, + "imageChoice_" + choiceNumber, + paramValue); + + result.put(choiceNumber, choice); + } + } + } + result = reindexChoices(result, maxNumber); + int size = result.size(); + nbImageChoices = Math.max(nbDefault, size); + log.info("nbImageChoices (from request) = " + size); + logChoice(result); + return result; + } + + private void logChoice(Map<Integer, Choice> result) { + for (Map.Entry<Integer, Choice> e : result.entrySet()) { + Integer choiceId = e.getKey(); + Choice choice = e.getValue(); + if (log.isInfoEnabled()) { + log.info("Choice [" + choiceId + "] = " + + choice.getName() + " -- " + + choice.getDescription()); + } + } + } + + private Choice createImageChoice(PollImageChoice choice, + String prefix, String name) { + createChoice(choice, prefix, name); + String locationName = prefix + ".location"; + String location = getNonEmptyParameterValue(locationName); + choice.setLocation(location); + if (log.isInfoEnabled()) { + log.info("image location [" + name + "] =" + location); + } + return choice; + } + + private Choice createChoice(Choice choice, String prefix, String name) { + String descriptionName = prefix + ".description"; + String topiaIdName = prefix + ".topiaId"; + String description = getNonEmptyParameterValue(descriptionName); + String topiaId = getNonEmptyParameterValue(topiaIdName); + choice.setName(name); + choice.setDescription(description); + choice.setTopiaId(topiaId); + return choice; + } + + + private Map<Integer, Choice> reindexChoices(Map<Integer, Choice> result, + int maxNumber) { + Map<Integer, Choice> result2; + + if (maxNumber != result.size() - 1) { + + // means there is a hole inside the result (a empty choice was + // submitted) + + // le'ts remove this + List<Integer> numbers = Lists.newArrayList(result.keySet()); + + Collections.sort(numbers); + + result2 = Maps.newTreeMap(); + int i = 0; + for (Integer number : numbers) { + Choice choice = result.get(number); + result2.put(i++, choice); + } + } else { + result2 = result; + } + return result2; + } + + private <O> void addtoList(List<O> list, int index, O object) { + + while (list.size() < index) { + list.add(null); + } + list.add(index, object); + } + + + private String getNonEmptyParameterValue(String paramName) { + String[] paramValues = parameters.get(paramName); + String result = null; + if (paramValues.length == 1) { + String paramValue = paramValues[0]; + if (StringUtils.isNotEmpty(paramValue)) { + result = paramValue; + } + } + return result; + } + + private <E extends Enum<E> & I18nAble> Map<String, String> decorateToName(E... values) { + Map<String, String> result = Maps.newLinkedHashMap(); + for (E value : values) { + result.put(value.name(), getText(value.getI18nKey())); + } + return result; + } } Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java 2012-03-05 23:26:09 UTC (rev 3161) @@ -0,0 +1,48 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.business.persistence.Choice; +import org.chorem.pollen.business.persistence.ChoiceImpl; + +/** + * To generate the display for a date choice. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class DisplayDateChoice extends AbstractDisplayChoice { + + private static final long serialVersionUID = 1L; + + public static final String CHOICE_TOKEN = "dateChoice"; + + @Override + protected Choice createEmptyChoice() { + Choice result = new ChoiceImpl(); + result.setName(""); + result.setDescription(""); + return result; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java 2012-03-05 23:26:09 UTC (rev 3161) @@ -0,0 +1,49 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.bean.PollImageChoice; +import org.chorem.pollen.business.persistence.Choice; + +/** + * To generate the display for a image choice. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class DisplayImageChoice extends AbstractDisplayChoice { + + private static final long serialVersionUID = 1L; + + public static final String CHOICE_TOKEN = "imageChoice"; + + @Override + protected Choice createEmptyChoice() { + PollImageChoice result = new PollImageChoice(); + result.setName(""); + result.setDescription(""); + result.setLocation(""); + return result; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java 2012-03-05 23:26:09 UTC (rev 3161) @@ -0,0 +1,48 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.business.persistence.Choice; +import org.chorem.pollen.business.persistence.ChoiceImpl; + +/** + * To generate the display for a text choice. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class DisplayTextChoice extends AbstractDisplayChoice { + + private static final long serialVersionUID = 1L; + + public static final String CHOICE_TOKEN = "textChoice"; + + @Override + protected Choice createEmptyChoice() { + Choice result = new ChoiceImpl(); + result.setName(""); + result.setDescription(""); + return result; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java 2012-03-05 23:26:09 UTC (rev 3161) @@ -0,0 +1,205 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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% + */ +package org.chorem.pollen.ui.interceptors; + +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.ActionProxy; +import com.opensymphony.xwork2.ValidationAware; +import com.opensymphony.xwork2.util.LocalizedTextUtil; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper; +import org.apache.struts2.interceptor.FileUploadInterceptor; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Overrides the default file upload interceptor to be able to match uploaded + * files in specific fields. + * + * We want to put upload files in a list (field is file for example) and then + * fileName in another list but the default interceptor does not accept this + * since it suffix the filename field with FileName... + * + * TODO tchemit 2012-03-05 submit a patch to struts guys to avoid this fork. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class PollenFileUploadInterceptor extends FileUploadInterceptor { + private static final long serialVersionUID = 1L; + + + protected final Pattern FILENAME_PATTERN = Pattern.compile("(.+)\\[(.+)\\]"); + + @Override + public String intercept(ActionInvocation invocation) throws Exception { + ActionContext ac = invocation.getInvocationContext(); + + HttpServletRequest request = (HttpServletRequest) ac.get(ServletActionContext.HTTP_REQUEST); + + if (!(request instanceof MultiPartRequestWrapper)) { + if (LOG.isDebugEnabled()) { + ActionProxy proxy = invocation.getProxy(); + LOG.debug(getTextMessage("struts.messages.bypass.request", new Object[]{proxy.getNamespace(), proxy.getActionName()}, ac.getLocale())); + } + + return invocation.invoke(); + } + + ValidationAware validation = null; + + Object action = invocation.getAction(); + + if (action instanceof ValidationAware) { + validation = (ValidationAware) action; + } + + MultiPartRequestWrapper multiWrapper = (MultiPartRequestWrapper) request; + + if (multiWrapper.hasErrors()) { + for (String error : multiWrapper.getErrors()) { + if (validation != null) { + validation.addActionError(error); + } + + if (LOG.isWarnEnabled()) { + LOG.warn(error); + } + } + } + + // bind allowed Files + Enumeration fileParameterNames = multiWrapper.getFileParameterNames(); + while (fileParameterNames != null && fileParameterNames.hasMoreElements()) { + // get the value of this input tag + String inputName = (String) fileParameterNames.nextElement(); + + // get the content type + String[] contentType = multiWrapper.getContentTypes(inputName); + + if (isNonEmpty(contentType)) { + // get the name of the file from the input tag + String[] fileName = multiWrapper.getFileNames(inputName); + + if (isNonEmpty(fileName)) { + // get a File object for the uploaded File + File[] files = multiWrapper.getFiles(inputName); + if (files != null && files.length > 0) { + List<File> acceptedFiles = new ArrayList<File>(files.length); + List<String> acceptedContentTypes = new ArrayList<String>(files.length); + List<String> acceptedFileNames = new ArrayList<String>(files.length); + + Matcher matcher1 = FILENAME_PATTERN.matcher(inputName); + + String contentTypeName; + String fileNameName; + if (matcher1.matches()) { + String prefix = matcher1.group(1); + String suffix = matcher1.group(2); + contentTypeName = prefix + "ContentType[" + suffix + "]"; + fileNameName = prefix + "FileName[" + suffix + "]"; + } else { + contentTypeName = inputName + "ContentType"; + fileNameName = inputName + "FileName"; + } + + + for (int index = 0; index < files.length; index++) { + if (acceptFile(action, files[index], fileName[index], contentType[index], inputName, validation, ac.getLocale())) { + acceptedFiles.add(files[index]); + acceptedContentTypes.add(contentType[index]); + acceptedFileNames.add(fileName[index]); + } + } + + if (!acceptedFiles.isEmpty()) { + Map<String, Object> params = ac.getParameters(); + + params.put(inputName, acceptedFiles.toArray(new File[acceptedFiles.size()])); + params.put(contentTypeName, acceptedContentTypes.toArray(new String[acceptedContentTypes.size()])); + params.put(fileNameName, acceptedFileNames.toArray(new String[acceptedFileNames.size()])); + } + } + } else { + if (LOG.isWarnEnabled()) { + LOG.warn(getTextMessage(action, "struts.messages.invalid.file", new Object[]{inputName}, ac.getLocale())); + } + } + } else { + if (LOG.isWarnEnabled()) { + LOG.warn(getTextMessage(action, "struts.messages.invalid.content.type", new Object[]{inputName}, ac.getLocale())); + } + } + } + + // invoke action + return invocation.invoke(); + } + + private static final String DEFAULT_MESSAGE = "no.message.found"; + +// private PatternMatcher matcher; +// +// @Inject +// public void setMatcher(PatternMatcher matcher) { +// this.matcher = matcher; +// } + + private boolean isNonEmpty(Object[] objArray) { + boolean result = false; + for (int index = 0; index < objArray.length && !result; index++) { + if (objArray[index] != null) { + result = true; + } + } + return result; + } + + private String getTextMessage(String messageKey, Object[] args, Locale locale) { + return getTextMessage(null, messageKey, args, locale); + } + + private String getTextMessage(Object action, String messageKey, Object[] args, Locale locale) { + if (args == null || args.length == 0) { + if (action != null && useActionMessageBundle) { + return LocalizedTextUtil.findText(action.getClass(), messageKey, locale); + } + return LocalizedTextUtil.findText(this.getClass(), messageKey, locale); + } else { + if (action != null && useActionMessageBundle) { + return LocalizedTextUtil.findText(action.getClass(), messageKey, locale, DEFAULT_MESSAGE, args); + } + return LocalizedTextUtil.findText(this.getClass(), messageKey, locale, DEFAULT_MESSAGE, args); + } + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-03-05 23:25:37 UTC (rev 3160) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-03-05 23:26:09 UTC (rev 3161) @@ -44,14 +44,32 @@ <action name="create" class="org.chorem.pollen.ui.actions.poll.Create"> <result name="input">/WEB-INF/jsp/poll/create.jsp</result> - <result>/WEB-INF/jsp/home.jsp</result> + <result>/WEB-INF/jsp/poll/resume.jsp</result> </action> +  + <action name="displayTextChoice" + class="org.chorem.pollen.ui.actions.poll.DisplayTextChoice"> + <result>/WEB-INF/jsp/poll/textChoice.jsp</result> + </action> + +  + <action name="displayDateChoice" + class="org.chorem.pollen.ui.actions.poll.DisplayDateChoice"> + <result>/WEB-INF/jsp/poll/dateChoice.jsp</result> + </action> + +  + <action name="displayImageChoice" + class="org.chorem.pollen.ui.actions.poll.DisplayImageChoice"> + <result>/WEB-INF/jsp/poll/imageChoice.jsp</result> + </action> +  <action name="edit" class="org.chorem.pollen.ui.actions.poll.Edit"> <result name="input">/WEB-INF/jsp/poll/edit.jsp</result> - <result>/WEB-INF/jsp/home.jsp</result> + <result>/WEB-INF/jsp/poll/resume.jsp</result> </action>  Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-03-05 23:25:37 UTC (rev 3160) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-03-05 23:26:09 UTC (rev 3161) @@ -1,11 +1,17 @@ poll.common.aboutPoll=About the poll poll.common.comments=Comments about this poll +poll.common.myPolls=My polls poll.common.select.choiceType=Select the type of choice poll.common.select.userFavoriteList=List poll.common.vote.results=Results poll.common.vote.results-help=Display results poll.common.vote.return=Back to poll poll.common.vote.return-help=Back to poll +poll.error.poll.detected.duplicate.choice.name=Choices must be unique. +poll.error.poll.required.one.choice=You must provide at least one choice. +poll.error.poll.required.title=You must provide a title for the poll +poll.info.poll.created=Poll created +poll.info.poll.updated=Poll modified pollen.action.addChoice=Add choice pollen.action.addComment=Add a comment pollen.action.backToFavoriteLists=Back to favorite lists @@ -26,6 +32,9 @@ pollen.action.editVote=Modifier le vote pollen.action.login=Log me In pollen.action.modify=Modify +pollen.action.pollChoiceDelete=Delete this choice +pollen.action.pollChoiceDown=Descendre ce choix +pollen.action.pollChoiceUp=Monter ce choix pollen.action.pollClone=Copy the poll to create a new one pollen.action.pollClose=Close the poll pollen.action.pollCommentDelete=Supprimer le commentaire @@ -41,6 +50,7 @@ pollen.common.beginChoiceDate=Begin choice date pollen.common.beginDate=Begin date pollen.common.bugReport=Bug report +pollen.common.by=by pollen.common.chartType-pie=Pie pollen.common.chartType-pie3d=Pie 3D pollen.common.chartType-ring=Ring @@ -51,6 +61,7 @@ pollen.common.description=Description pollen.common.displayType-group=Results by groups pollen.common.displayType-normal=Results +pollen.common.editAction=Edit pollen.common.email=Em@il pollen.common.endChoiceDate=end choice date pollen.common.endDate=End date @@ -88,6 +99,7 @@ pollen.common.userSupport=User support pollen.common.victories=Winners\: pollen.common.victory=Winner\: +pollen.common.voteAction=Vote pollen.common.voteCounting-label=Vote Counting\: pollen.common.voteCountingType=Response type pollen.common.voteCountingTypeHelp.condorcet=Condorcet vote\: rank choices by preference order from 1 to N (1\=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. @@ -157,6 +169,9 @@ pollen.information.user.updated=User %s updated. pollen.information.your.are.loggued=You are logged. pollen.label.contact.administrator=Send an email to an administrator +pollen.label.pollEditPage=The link below leads to the page to modify your poll. Save it to be able to modify your poll later if you need it or to close it \: +pollen.label.pollRegisterPage=If you are a logged user, you can find these links on the page +pollen.label.pollVotePage=The link below leads to the page to vote for your poll. Save it and send it to the people that you want to vote \: pollen.legend.login=Login pollen.menu.admin=Administration pollen.menu.createPoll=Create a poll Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-03-05 23:25:37 UTC (rev 3160) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-03-05 23:26:09 UTC (rev 3161) @@ -1,11 +1,17 @@ poll.common.aboutPoll=A propos du sondage poll.common.comments=Commentaire à propos du sondage +poll.common.myPolls=Mes sondages poll.common.select.choiceType=Sélectionner le type de choix poll.common.select.userFavoriteList=Liste poll.common.vote.results=Résultats poll.common.vote.results-help=Voir les résultats poll.common.vote.return=Retour au sondage poll.common.vote.return-help=Retour au sondage +poll.error.poll.detected.duplicate.choice.name=Les choix doivent être uniques. +poll.error.poll.required.one.choice=Vous devez saisir au moins un choix. +poll.error.poll.required.title=Vous devez fournir un titre pour le sondage +poll.info.poll.created=Sondage créé +poll.info.poll.updated=Sondage mise à jour pollen.action.addChoice=Ajouter un choix pollen.action.addComment=Ajouter un commentaire pollen.action.backToFavoriteLists=Retour à la liste des favoris @@ -26,6 +32,9 @@ pollen.action.editVote=Modifier le vote pollen.action.login=M'identifier pollen.action.modify=Modifier +pollen.action.pollChoiceDelete=Supprimer ce choix +pollen.action.pollChoiceDown=Descendre ce choix +pollen.action.pollChoiceUp=Monter ce choix pollen.action.pollClone=Créer un nouveau sondage à partir de celui-ci pollen.action.pollClose=Fermer le sondage pollen.action.pollCommentDelete=Supprimer le commentaire @@ -41,6 +50,7 @@ pollen.common.beginChoiceDate=Date de début des choix pollen.common.beginDate=Date de début pollen.common.bugReport=Rapport de bug +pollen.common.by=par pollen.common.chartType-pie=Camembert pollen.common.chartType-pie3d=Camembert 3D pollen.common.chartType-ring=Anneau @@ -51,6 +61,7 @@ pollen.common.description=Description pollen.common.displayType-group=Résultats par groupes pollen.common.displayType-normal=Résultats +pollen.common.editAction=Editer pollen.common.email=Em@il pollen.common.endChoiceDate=Date de fin des choix pollen.common.endDate=Date de fin @@ -89,6 +100,7 @@ pollen.common.userSupport=Support utilisateur pollen.common.victories=Gagnants \: pollen.common.victory=Gagnant \: +pollen.common.voteAction=Vote pollen.common.voteCountingType=Type de Réponse pollen.common.voteCountingTypeHelp.condorcet=Vote Condorcet \: classer les choix par ordre de préférence de 1 à N (1\=préféré). Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur. pollen.common.voteCountingTypeHelp.normal=Vote normal \: voter pour le ou les choix préférés. @@ -158,6 +170,9 @@ pollen.information.user.updated=L'utilisateur %s a été mis à jour. pollen.information.your.are.loggued=Vous êtes connecté. pollen.label.contact.administrator=Contacter un administrateur +pollen.label.pollEditPage=Le lien ci-dessous mène à la page de modification du sondage. Enregistrez-le pour pouvoir modifier votre sondage au besoin ou le clore \: +pollen.label.pollRegisterPage=Si vous êtes un utilisateur identifié, vous pouvez retrouver ces liens dans la page +pollen.label.pollVotePage=Le lien ci-dessous mène à la page de vote. Enregistrez-le et envoyez-le à ceux que vous voulez voir voter \: pollen.legend.login=Login pollen.menu.admin=Administration pollen.menu.createPoll=Créer un sondage @@ -189,3 +204,4 @@ pollen.title.pollsParticipatedList.legend=Liste des sondages pour lesquels vous avez voté pollen.title.register=S'enregistrer pollen.title.usersList=Gestion des utilisateurs +title=Création d'un sondage Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-03-05 23:25:37 UTC (rev 3160) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-03-05 23:26:09 UTC (rev 3161) @@ -64,6 +64,9 @@ <interceptor name="paramRemover" class="com.opensymphony.xwork2.interceptor.ParameterRemoverInterceptor"/> + <interceptor name="pollenFileUpload" + class="org.chorem.pollen.ui.interceptors.PollenFileUploadInterceptor"/> + <interceptor name="checkUserLoggued" class="org.chorem.pollen.ui.interceptors.CheckUserIsLogguedInterceptor"> <param name="loginAction">/notLoggued</param> @@ -104,20 +107,21 @@ <interceptor-ref name="i18n"/> <interceptor-ref name="checkbox"/> <interceptor-ref name="multiselect"/> + <interceptor-ref name="pollenFileUpload"/> <interceptor-ref name="params"> <param name="excludeParams">dojo\..*,^struts\..*</param> </interceptor-ref> <interceptor-ref name="servletConfig"/> <interceptor-ref name="staticParams"/> + <interceptor-ref name="prepare"/> <interceptor-ref name="chain"/> <interceptor-ref name="modelDriven"/> - <interceptor-ref name="fileUpload"/>  <interceptor-ref name="actionMappingParams"/> - <interceptor-ref name="params"> - <param name="excludeParams">dojo\..*,^struts\..*</param> - </interceptor-ref> +  +  +  <interceptor-ref name="conversionError"/> <interceptor-ref name="validation"> <param name="excludeMethods">input,back,cancel,browse</param> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-03-05 23:25:37 UTC (rev 3160) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-03-05 23:26:09 UTC (rev 3161) @@ -30,6 +30,7 @@ <pattern>/config-browser/*</pattern> <pattern>/json/*</pattern> <pattern>/poll/confirmDelete*</pattern> + <pattern>/poll/display*</pattern> <pattern>/io/*</pattern> </excludes> Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/choiceHelper.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/choiceHelper.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/choiceHelper.jsp 2012-03-05 23:26:09 UTC (rev 3161) @@ -0,0 +1,191 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + 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 language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<script type="text/javascript"> + + var choiceText = '<s:text name="pollen.common.choice"/>'; + + function getFirstChoice(containerId) { + var result = 65535; + + getAllChoices(containerId).each(function () { + var currentChoiceNumber = $(this).data('choiceNumber'); + if (currentChoiceNumber < result) { + result = currentChoiceNumber; + } + }); + return result; + } + + function getLastChoice(containerId) { + var result = 0; + getAllChoices(containerId).each(function () { + var currentChoiceNumber = $(this).data('choiceNumber'); + if (currentChoiceNumber > result) { + result = currentChoiceNumber; + } + }); + return result; + } + + function getAllChoices(containerId) { + return $("div[id^='" + containerId + "_']"); + } + + function updateUpdownActions(containerId) { + + var firstChoice = getFirstChoice(containerId); + var lastChoice = getLastChoice(containerId); + + getAllChoices(containerId).each(function (index) { + + var currentChoiceNumber = $(this).data('choiceNumber'); + + var labelWidget = $('#' + containerId + "_label_" + currentChoiceNumber); + labelWidget.html(choiceText + ' ' + (index+1)); + + /*var upWidget = $('#' + containerId + "_up_" + currentChoiceNumber); + if (firstChoice == currentChoiceNumber) { + // hide up + upWidget.addClass('hidden'); + } else { + //show up + upWidget.removeClass('hidden'); + } + + var downWidget = $('#' + containerId + "_down_" + currentChoiceNumber); + if (lastChoice == currentChoiceNumber) { + // hide down + downWidget.addClass('hidden'); + } else { + //show down + downWidget.removeClass('hidden'); + }*/ + }); + + } + + function loadChoice(containerId, url, choiceNumber, nbChoices, tokenId) { + if (choiceNumber == -1) { + + // to add a new choice + // get new choiceNumber + + choiceNumber = 1 + getLastChoice(containerId); + } + $.ajax( + { + url:url, + data:{ tokenId:tokenId, choiceNumber:choiceNumber }, + async:false, + dataType:"html", + success:function (data, textStatus) { + var container = $("#" + containerId); + container.append(data); + // store choiceNumber and choiceType + var choice = $("#" + containerId + "_" + choiceNumber); + choice.data('choiceType', containerId); + choice.data('choiceNumber', choiceNumber); + if (choiceNumber == nbChoices) { + + updateUpdownActions(containerId); + // end it can show it + var classes = container.attr("class"); + if (classes.indexOf("thischoice") > -1) { + // show it + container.removeClass('hidden'); + } + } + if (!tokenId) { + updateUpdownActions(containerId); + } + } + }); + } + + function addTextChoice(choiceNumber, nbChoices, tokenId) { + loadChoice( + 'choicesTEXT', + '<s:url namespace="/poll" action="displayTextChoice"/>', + choiceNumber, nbChoices, tokenId + ); + } + + function addDateChoice(choiceNumber, nbChoices, tokenId) { + loadChoice( + 'choicesDATE', + '<s:url namespace="/poll" action="displayDateChoice"/>', + choiceNumber, nbChoices, tokenId + ); + } + + function addImageChoice(choiceNumber, nbChoices, tokenId) { + loadChoice( + 'choicesIMAGE', + '<s:url namespace="/poll" action="displayImageChoice"/>', + choiceNumber, nbChoices, tokenId + ); + } + + function addNewChoice() { + var type = $('[name="poll.choiceType"][checked="checked"]').val(); + if ("TEXT" == type) { + addTextChoice(-1, -1); + } else if ("DATE" == type) { + addDateChoice(-1, -1); + } else if ("IMAGE" == type) { + addImageChoice(-1, -1); + } + return false; + } + + function deleteChoice(choiceId) { + var choice = $('#' + choiceId); + var containerId = choice.data('choiceType'); + choice.remove(); + updateUpdownActions(containerId); + return false; + } + + function upChoice(choiceId) { + var choice = $('#' + choiceId); + var containerId = choice.data('choiceType'); + var choiceNumber = choice.data('choiceNumber'); + console.info("will up [" + containerId + "-" + choiceNumber + "]"); + updateUpdownActions(containerId); + return false; + } + + function downChoice(choiceId) { + var choice = $('#' + choiceId); + var containerId = choice.data('choiceType'); + var choiceNumber = choice.data('choiceNumber'); + console.info("will down [" + containerId + "-" + choiceNumber + "]"); + updateUpdownActions(containerId); + return false; + } +</script> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/choiceHelper.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-03-05 23:25:37 UTC (rev 3160) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-03-05 23:26:09 UTC (rev 3161) @@ -26,6 +26,9 @@ <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <link rel="stylesheet" type="text/css" href="<s:url value='/css/pollCreation.css'/>"/> + +<%@include file="/WEB-INF/jsp/choiceHelper.jsp" %> + <script type="text/javascript"> jQuery(document).ready(function () { @@ -74,27 +77,48 @@ $('[name="poll.publicResults"]').prop('checked', val); }); - function changeChoicetype(type) { + function changeChoiceType(type) { $('.choices').addClass('hidden'); + $('.choices').removeClass('thischoice'); $('#choices' + type).removeClass('hidden'); + $('#choices' + type).addClass('thischoice'); + $('[name="poll.choiceType"]').attr('checked', false); + $('[name="poll.choiceType"][value="' + type + '"]').attr('checked', 'checked'); } $('[name="poll.choiceType"]').change(function (event) { - changeChoicetype($(this).val()); + changeChoiceType($(this).val()); }); - $('[name="poll.pollType"][value="<s:property value="%{poll.pollType.ordinal()}"/>"]').prop('checked', true); - $('[name="poll.voteCountingType"][value="<s:property value="%{poll.voteCountingType.ordinal()}"/>"]').prop('checked', true); + $('[name="poll.pollType"][value="<s:property value="%{poll.pollType.name()}"/>"]').attr('checked', 'checked'); + $('[name="poll.voteCountingType"][value="<s:property value="%{poll.voteCountingType.name()}"/>"]').attr('checked', 'checked'); - var choiceType = '<s:property value="%{poll.choiceType.ordinal()}"/>'; - $('[name="poll.choiceType"][value="' + choiceType + '"]').prop('checked', true); - changeChoicetype(choiceType); + changeChoiceType('<s:property value="%{poll.choiceType.name()}"/>'); + + // before loading all choices let's hide everything, it will be shown later + $('.choices').addClass('hidden'); + + // text choices loading + <s:iterator begin="1" end="nbTextChoices" status="status"> + addTextChoice(<s:property value='%{#status.index}'/>, <s:property value="nbTextChoices - 1"/>, '<s:property value="textChoiceTokenId" />'); + </s:iterator> + + // date choices loading + <s:iterator begin="1" end="nbDateChoices" status="status"> + addDateChoice(<s:property value='%{#status.index}'/>, <s:property value="nbDateChoices - 1"/>, '<s:property value="dateChoiceTokenId" />'); + </s:iterator> + + // image choices loading + <s:iterator begin="1" end="nbImageChoices" status="status"> + addImageChoice(<s:property value='%{#status.index}'/>, <s:property value="nbImageChoices - 1"/>, '<s:property value="imageChoiceTokenId" />'); + </s:iterator> }); </script> <title><s:text name="pollen.title.createPoll"/></title> <h1 class="title${pageLogo}"><s:text name="pollen.title.createPoll"/></h1> -<s:form method="POST" id="registerForm" namespace="/poll"> +<s:form method="POST" id="registerForm" namespace="/poll" + enctype="multipart/form-data"> <sj:tabbedpanel id="formTabs"> @@ -110,6 +134,7 @@ required="true" size="80"/> <s:textarea key="poll.description" rows="3" cols="54" label="%{getText('pollen.common.description')}"/> + <s:hidden key="poll.pollId" label=''/> </fieldset> <br/> @@ -127,72 +152,14 @@ <s:radio key='poll.choiceType' list="choiceTypes" label='' theme="simple"/> <hr/> + <s:fielderror fieldName="poll.choices"/> - <div id="choices0" class="choices"> - <s:iterator begin="0" end="nbChoices" status="status"> - <s:set name="tprefix">textChoices[<s:property - value="#status.index"/>].</s:set> - <div class="fleft choiceName"> - <s:label for="%{#tprefix}name" key="pollen.common.choice" - theme="simple"/> - <s:textfield cssClass="nameField" id='%{#tprefix}name' - key="%{#tprefix}name" label='' theme="simple"/> - - - <s:label for="%{#tprefix}description" - key="pollen.common.description" theme="simple"/> - </div> - <div class="fleft"> - <s:textarea cols="30" id="%{#tprefix}description" - key="%{#tprefix}description" label='' theme="simple"/> - </div> - <div class="cleanBoth"></div> - </s:iterator> - </div> - - <div id="choices1" class="choices"> - <s:iterator begin="0" end="nbChoices" status="status"> - <s:set name="dprefix">dateChoices.<s:property - value="#status.index"/>.</s:set> - <div class="fleft choiceName"> - <s:label for="%{#dprefix}name" key="pollen.common.choice" - theme="simple"/> - <sj:datepicker id='%{#dprefix}name' key="%{#dprefix}name" - changeMonth="true" changeYear="true" - labelSeparator="" theme="simple" label="" - timepicker="true"/> - - - <s:label for="%{#dprefix}description" - key="pollen.common.description" theme="simple"/> - </div> - <div class="fleft"> - <s:textarea cols="30" id="%{#dprefix}description" - key="%{#dprefix}description" label='' theme="simple"/> - </div> - <div class="cleanBoth"></div> - </s:iterator> - </div> - <div id="choices2" class="choices"> - <s:iterator begin="0" end="nbChoices" status="status"> - <s:set name="iprefix">imageChoices[<s:property - value="#status.index"/>].</s:set> - <div class="fleft choiceName"> - <s:label for="%{#iprefix}name" key="pollen.common.choice" - theme="simple"/> - <s:file id='%{#iprefix}name' key="%{#iprefix}name" - label='' theme="simple" cssClass="nameField"/> - - - <s:label for="%{#iprefix}description" - key="pollen.common.description" theme="simple"/> - </div> - <div class="fleft"> - <s:textarea cols="30" id="%{#iprefix}description" - key="%{#iprefix}description" label='' theme="simple"/> - </div> - <div class="cleanBoth"></div> - </s:iterator> - </div> + <div id="choicesTEXT" class="choices"></div> + <div id="choicesDATE" class="choices"></div> + <div id="choicesIMAGE" class="choices"></div> <hr/> - <s:submit key="pollen.action.addChoice" align="center"/> + <s:submit key="pollen.action.addChoice" align="center" + onclick="return addNewChoice();"/> </fieldset> @@ -202,10 +169,11 @@ <fieldset> <legend><s:text name="pollen.fieldset.poll.you"/></legend> - <s:textfield key="poll.creator.name" + <s:textfield key="poll.creator.votingId" size="80" label="%{getText('pollen.common.login')}"/> - <s:textfield key="poll.creator.email" + <s:textfield key="poll.creator.email" size="80" label="%{getText('pollen.common.email')}"/> + <s:hidden key="poll.creator.accountId" label=''/> </fieldset> <br/> @@ -275,4 +243,4 @@ <br/> <s:submit action="create" key="pollen.action.createPoll" align="center"/> -</s:form> +</s:form> \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/dateChoice.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/dateChoice.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/dateChoice.jsp 2012-03-05 23:26:09 UTC (rev 3161) @@ -0,0 +1,70 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + 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 language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<s:set name="prefix">dateChoice_<s:property value="choiceNumber"/></s:set> +<s:set id='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> +<s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> +<s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> +<div id='choicesDATE_<s:property value="choiceNumber"/>'> + <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> + <div class="fleft choiceName"> + <s:label for="%{#prefix}.name" id="choicesDATE_label_%{choiceNumber}" + theme="simple" value=''/> + <sj:datepicker id='%{#prefix}.name' key="%{#prefix}.name" changeMonth="true" + changeYear="true" labelSeparator="" theme="simple" label="" + timepicker="true" value="%{choice.name}"/> + - + <s:label for="%{#prefix}.description" key="pollen.common.description" + theme="simple"/> + </div> + <div class="fleft"> + <s:textarea cols="30" id="%{#prefix}.description" + key="%{#prefix}.description" label='' theme="simple" + value="%{choice.description}"/> + </div> + <span> + <s:a href='#' onclick="return deleteChoice('choicesDATE_%{choiceNumber}')"> + <image alt='<s:property value="deleteTitle"/>' + title='<s:property value="deleteTitle"/>' + src="<s:url value='/img/delete.png'/>"></image> + </s:a> + <%--s:a id='choicesDATE_down_%{choiceNumber}' + cssClass="hidden" href='#' + onclick="return downChoice('choicesDATE_%{choiceNumber}')"> + <image alt='<s:property value="downTitle"/>' + title='<s:property value="downTitle"/>' + src="<s:url value='/img/1downarrow.png'/>"></image> + </s:a> + <s:a id='choicesDATE_up_%{choiceNumber}' href='#' cssClass="hidden" + onclick="return upChoice('choicesDATE_%{choiceNumber}')"> + <image alt='<s:property value="upTitle"/>' + title='<s:property value="upTitle"/>' + src="<s:url value='/img/1uparrow.png'/>"></image> + </s:a--%> + </span> + <div class="cleanBoth"></div> +</div> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/dateChoice.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/imageChoice.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/imageChoice.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/imageChoice.jsp 2012-03-05 23:26:09 UTC (rev 3161) @@ -0,0 +1,84 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + 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 language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<s:set name="prefix">imageChoice_<s:property value="choiceNumber"/></s:set> +<s:set name="prefix2">imageChoice[<s:property value="choiceNumber"/>]</s:set> +<s:set id='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> +<s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> +<s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> +<div id='choicesIMAGE_<s:property value="choiceNumber"/>'> + <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> + <div class="fleft choiceName"> + <s:label for="%{#prefix}.name" id="choicesIMAGE_label_%{choiceNumber}" + theme="simple" value=''/> + <s:if test="choice.name != ''"> + + <%--Uploaded image--%> + <s:hidden id="%{#prefix}.name" name="%{#prefix}.name" + value="%{choice.name}" label='' theme="simple"/> + + <s:hidden id="%{#prefix}.location" name="%{#prefix}.location" + value="%{choice.location}" label='' theme="simple"/> + + <s:label label='' theme="simple" cssClass="nameField" + value="%{choice.name}" readonly="true"/> + </s:if> + <s:else> + <%--New image--%> + <s:file key='%{#prefix2}' label='' theme="simple" cssClass="nameField"/> + </s:else> + - + <s:label for="%{#prefix}.description" key="pollen.common.description" + theme="simple"/> + </div> + <div class="fleft"> + <s:textarea cols="30" id="%{#prefix}.description" + key="%{#prefix}.description" + label='' theme="simple" value="%{choice.description}"/> + </div> + <span> + <s:a href='#' onclick="return deleteChoice('choicesIMAGE_%{choiceNumber}')"> + <image alt='<s:property value="deleteTitle"/>' + title='<s:property value="deleteTitle"/>' + src="<s:url value='/img/delete.png'/>"></image> + </s:a> + <%--s:a id='choicesIMAGE_down_%{choiceNumber}' + cssClass="hidden" href='#' + onclick="return downChoice('choicesIMAGE_%{choiceNumber}')"> + <image alt='<s:property value="downTitle"/>' + title='<s:property value="downTitle"/>' + src="<s:url value='/img/1downarrow.png'/>"></image> + </s:a> + <s:a id='choicesIMAGE_up_%{choiceNumber}' href='#' cssClass="hidden" + onclick="return upChoice('choicesIMAGE_%{choiceNumber}')"> + <image alt='<s:property value="upTitle"/>' + title='<s:property value="upTitle"/>' + src="<s:url value='/img/1uparrow.png'/>"></image> + </s:a--%> + </span> + + <div class="cleanBoth"></div> +</div> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/imageChoice.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp 2012-03-05 23:26:09 UTC (rev 3161) @@ -0,0 +1,58 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + 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 language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<h1 class="titleCreation"><s:property value="poll.title"/></h1> + +<h3><s:property value="poll.title"/> <s:text name="pollen.common.by"/> + <s:property value="poll.creator.votingId"/></h3> + +<div style="margin-top: 10px;"> + <img src="<s:url value='/img/vote.png'/>" + alt="<s:text name='pollen.common.voteAction'/>" + style="margin-right: 18px;"/> + <s:text name='pollen.label.pollVotePage'/> + <br/> + <s:set name="voteUrl" value="%{pollVoteUrl}"/> + <s:a href="%{voteUrl}" cssStyle="margin-left:50px;"> + <s:property value="voteUrl"/> + </s:a> +</div> +<div style="margin-top: 10px;"> + <img src="<s:url value='/img/edit.png'/>" + alt="<s:text name='pollen.common.editAction'/>" + style="margin-right: 20px;"/> + <s:text name='pollen.label.pollEditPage'/> + <br/> + <s:set name="editUrl" value="%{pollEditUrl}"/> + <s:a href="%{editUrl}" cssStyle="margin-left:50px;"> + <s:property value="editUrl"/> + </s:a> +</div> +<div style="margin-top: 30px;"> + <s:text name="pollen.label.pollRegisterPage"/> + <s:a namespace="/user" action="myPolls"> + <s:text name="poll.common.myPolls"/> + </s:a>. +</div> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/textChoice.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/textChoice.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/textChoice.jsp 2012-03-05 23:26:09 UTC (rev 3161) @@ -0,0 +1,68 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + 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 language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<s:set name="prefix">textChoice_<s:property value="choiceNumber"/></s:set> +<s:set id='deleteTitle'><s:text name="pollen.action.pollChoiceDelete"/></s:set> +<s:set id='upTitle'><s:text name="pollen.action.pollChoiceUp"/></s:set> +<s:set id='downTitle'><s:text name="pollen.action.pollChoiceDown"/></s:set> +<div id='choicesTEXT_<s:property value="choiceNumber"/>'> + <s:hidden key='%{#prefix}.topiaId' value='%{choice.topiaId}' label=''/> + <div class="fleft choiceName"> + <s:label for="%{#prefix}.name" id="choicesTEXT_label_%{choiceNumber}" + theme="simple" value=''/> + <s:textfield cssClass="nameField" id='%{#prefix}.name' key="%{#prefix}.name" + label='' theme="simple" value="%{choice.name}"/> + - + <s:label for="%{#prefix}.description" key="pollen.common.description" + theme="simple"/> + </div> + <div class="fleft"> + <s:textarea cols="30" id="%{#prefix}.description" + key="%{#prefix}.description" + label='' theme="simple" value="%{choice.description}"/> + </div> + <span> + <s:a href='#' onclick="return deleteChoice('choicesTEXT_%{choiceNumber}')"> + <image alt='<s:property value="deleteTitle"/>' + title='<s:property value="deleteTitle"/>' + src="<s:url value='/img/delete.png'/>"></image> + </s:a> + <%--s:a id='choicesTEXT_down_%{choiceNumber}' + cssClass="hidden" href='#' + onclick="return downChoice('choicesTEXT_%{choiceNumber}')"> + <image alt='<s:property value="downTitle"/>' + title='<s:property value="downTitle"/>' + src="<s:url value='/img/1downarrow.png'/>"></image> + </s:a> + <s:a id='choicesTEXT_up_%{choiceNumber}' href='#' cssClass="hidden" + onclick="return upChoice('choicesTEXT_%{choiceNumber}')"> + <image alt='<s:property value="upTitle"/>' + title='<s:property value="upTitle"/>' + src="<s:url value='/img/1uparrow.png'/>"></image> + </s:a--%> + </span> + <div class="cleanBoth"></div> +</div> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/textChoice.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/pollCreation.css =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-03-05 23:25:37 UTC (rev 3160) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-03-05 23:26:09 UTC (rev 3161) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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% + */ #pollCreationZone { width: 550px; margin: auto;

1 0

r3160 - in branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen: bean services/impl
by tchemit＠users.chorem.org March 5, 2012

March 5, 2012

Author: tchemit Date: 2012-03-06 00:25:37 +0100 (Tue, 06 Mar 2012) New Revision: 3160 Url: http://chorem.org/repositories/revision/pollen/3160 Log: ajout methode pour cr?\195?\169er un sondage + ajout bean pour choix d'une image Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java 2012-03-05 23:25:37 UTC (rev 3160) @@ -0,0 +1,47 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * 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% + */ +package org.chorem.pollen.bean; + +import org.chorem.pollen.business.persistence.ChoiceImpl; + +/** + * Extends the basic choice to keep location of uploaded image + * (during poll creation). + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class PollImageChoice extends ChoiceImpl { + private static final long serialVersionUID = 1L; + + protected String location; + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-03-02 18:52:12 UTC (rev 3159) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-03-05 23:25:37 UTC (rev 3160) @@ -25,23 +25,30 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.bean.PollImageChoice; import org.chorem.pollen.business.persistence.Choice; import org.chorem.pollen.business.persistence.ChoiceDAO; import org.chorem.pollen.business.persistence.Comment; import org.chorem.pollen.business.persistence.PersonToList; +import org.chorem.pollen.business.persistence.PersonToListDAO; 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.PreventRule; +import org.chorem.pollen.business.persistence.PreventRuleDAO; 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; import org.chorem.pollen.business.persistence.VotingList; +import org.chorem.pollen.business.persistence.VotingListDAO; +import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.services.PollenServiceSupport; import org.chorem.pollen.services.exceptions.PollChoiceNotFoundException; import org.chorem.pollen.services.exceptions.PollNotFoundException; @@ -57,7 +64,14 @@ import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.web.struts2.FilterPagerUtil; +import javax.imageio.ImageIO; +import javax.swing.ImageIcon; +import java.awt.Graphics2D; +import java.awt.Image; +import java.awt.RenderingHints; +import java.awt.image.BufferedImage; import java.io.File; +import java.io.IOException; import java.util.List; public class PollService extends PollenServiceSupport { @@ -86,10 +100,11 @@ // Initialize creator as an admin for the poll PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); PollAccount creator = newInstance(pollAccountDAO); + creator.setAccountId(serviceContext.createPollenUrlId()); // creator.setAdmin(true); if (user != null) { // Link the creator with the user -// creator.setName(user.getDisplayName()); + creator.setVotingId(user.getDisplayName()); creator.setEmail(user.getEmail()); creator.setUserAccount(user); } @@ -100,6 +115,129 @@ return result; } + public Poll createPoll(Poll poll) { + + PollDAO pollDAO = getDAO(Poll.class); + Poll result = create(pollDAO); + + result.setAnonymous(poll.getAnonymous()); + result.setAnonymousVoteAllowed(poll.getAnonymousVoteAllowed()); + result.setBeginChoiceDate(poll.getBeginChoiceDate()); + result.setBeginDate(poll.getBeginDate()); + result.setChoiceType(poll.getChoiceType()); + result.setContinuousResults(poll.getContinuousResults()); + result.setDescription(poll.getDescription()); + result.setEndDate(poll.getEndDate()); + result.setEndChoiceDate(poll.getEndChoiceDate()); + result.setPollId(poll.getPollId()); + result.setPollType(poll.getPollType()); + result.setMaxChoiceNb(poll.getMaxChoiceNb()); + result.setPublicResults(poll.getPublicResults()); + result.setTitle(poll.getTitle()); + result.setVoteCountingType(poll.getVoteCountingType()); + + // create creator + PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); + PollAccount creatorCreated = create(pollAccountDAO); + PollAccount creator = poll.getCreator(); + creatorCreated.setVotingId(creator.getVotingId()); + creatorCreated.setEmail(creator.getEmail()); + creatorCreated.setUserAccount(creator.getUserAccount()); + creatorCreated.setAccountId(creator.getAccountId()); + + result.setCreator(creatorCreated); + + if (!poll.isPreventRuleEmpty()) { + + // create prevent rules + + PreventRuleDAO preventRuleDAO = getDAO(PreventRule.class); + for (PreventRule preventRule : poll.getPreventRule()) { + + PreventRule preventRuleCreated = create(preventRuleDAO); + preventRuleCreated.setActive(preventRule.getActive()); + preventRuleCreated.setMethod(preventRule.getMethod()); + preventRuleCreated.setOneTime(preventRule.getOneTime()); + preventRuleCreated.setRepeated(preventRule.getRepeated()); + preventRuleCreated.setScope(preventRule.getScope()); + preventRuleCreated.setSensibility(preventRule.getSensibility()); + result.addPreventRule(preventRule); + } + } + + if (!poll.isVotingListEmpty()) { + + // create voting list + + VotingListDAO votingListDAO = getDAO(VotingList.class); + PersonToListDAO personToListDAO = getDAO(PersonToList.class); + + for (VotingList votingList : poll.getVotingList()) { + VotingList votingListCreated = create(votingListDAO); + + votingListCreated.setName(votingList.getName()); + votingListCreated.setWeight(votingList.getWeight()); + + if (!votingList.isPollAccountPersonToListEmpty()) { + + // create poll account of the voting list + + for (PersonToList personToList : votingList.getPollAccountPersonToList()) { + + PersonToList personToListCreated = create(personToListDAO); + personToListCreated.setHasVoted(personToList.getHasVoted()); + personToListCreated.setWeight(personToList.getWeight()); + votingListCreated.addPollAccountPersonToList(personToListCreated); + + PollAccount pollAccount = personToList.getPollAccount(); + PollAccount pollAccountCreated = create(pollAccountDAO); + pollAccountCreated.setAccountId(pollAccount.getAccountId()); + pollAccountCreated.setEmail(pollAccount.getEmail()); + pollAccountCreated.setUserAccount(pollAccount.getUserAccount()); + pollAccountCreated.setVotingId(pollAccount.getVotingId()); + + personToListCreated.setPollAccount(pollAccountCreated); + } + } + result.addVotingList(votingListCreated); + } + } + + if (!poll.isChoiceEmpty()) { + + // create choices + + ChoiceType choiceType = result.getChoiceType(); + + ChoiceDAO choiceDAO = getDAO(Choice.class); + + for (Choice choice : poll.getChoice()) { + Choice choiceCreated = create(choiceDAO); + choiceCreated.setDescription(choice.getDescription()); + choiceCreated.setName(choice.getName()); + choiceCreated.setValidate(choice.getValidate()); + result.addChoice(choiceCreated); + + if (choiceType == ChoiceType.IMAGE) { + + // copy image where it belong and generate the thumb + + PollImageChoice imageChoice = (PollImageChoice) choice; + + try { + saveImages(result, imageChoice); + } catch (IOException e) { + throw new PollenTechnicalException( + "Could not create image choice", e); + } + + + } + } + } + + return result; + } /* private void addFeedEntry() { PollAccountDTO creator = servicePollAccount.findPollAccountById(poll.getCreatorId()); @@ -271,660 +409,6 @@ } - /* - @Override - public List<PollDTO> findParticipatedPolls(String userId) { - TopiaContext transaction = null; - List<PollDTO> results = null; - UserAccountDAO userDAO = null; - try { - transaction = rootContext.beginTransaction(); - - userDAO = PollenModelDAOHelper.getUserAccountDAO(transaction); - UserAccount user = userDAO.findByTopiaId(userId); - - Set<Poll> pollEntities = new HashSet<Poll>(); - for (PollAccount pollAccount : user.getPollAccount()) { - for (Vote vote : pollAccount.getVote()) { - pollEntities.add(vote.getPoll()); - } - } - - converter.setTransaction(transaction); - results = converter - .createPollDTOs(new ArrayList<Poll>(pollEntities)); - - transaction.commitTransaction(); - - if (log.isDebugEnabled()) { - log.debug("Entities found: " - + ((results == null) ? "null" : results.size())); - } - - return results; - } catch (Exception e) { - ContextUtil.doCatch(e, transaction); - return null; - } finally { - ContextUtil.doFinally(transaction); - } - } - - @Override - public List<PollDTO> findInvitedPolls(String userId) { - TopiaContext transaction = null; - List<PollDTO> results = null; - UserAccountDAO userDAO = null; - try { - transaction = rootContext.beginTransaction(); - - userDAO = PollenModelDAOHelper.getUserAccountDAO(transaction); - UserAccount user = userDAO.findByTopiaId(userId); - - pollDAO = PollenModelDAOHelper.getPollDAO(transaction); - List<Poll> polls = pollDAO.findAll(); - - Set<Poll> pollEntities = new HashSet<Poll>(); - for (Poll poll : polls) { - for (VotingList votingList : poll.getVotingList()) { - for (PersonToList personToList : votingList - .getPollAccountPersonToList()) { - if (!personToList.getHasVoted()) { - PollAccount pollAccount = personToList - .getPollAccount(); - if (pollAccount != null - && pollAccount.getEmail() != null - && pollAccount.getEmail().equals( - user.getEmail())) { - pollEntities.add(poll); - } - } - } - } - } - - converter.setTransaction(transaction); - results = converter - .createPollDTOs(new ArrayList<Poll>(pollEntities)); - - transaction.commitTransaction(); - - if (log.isDebugEnabled()) { - log.debug("Entities found: " - + ((results == null) ? "null" : results.size())); - } - - return results; - } catch (Exception e) { - ContextUtil.doCatch(e, transaction); - return null; - } finally { - ContextUtil.doFinally(transaction); - } - } - */ - - -// -// /** -// * Build a new Poll instance based on existing {@code poll} (copy) -// * -// * @param poll Build a new Poll instance based on existing {@code poll} (copy) -// * @return Build a new Poll instance based on existing {@code poll} (copy) -// */ -// public Poll getNewPoll(Poll poll) { -// Poll result = new PollImpl(); -// TopiaEntityBinder<Poll> binder = PollenBinderHelper.getSimpleTopiaBinder(Poll.class); -// //TODO-fdesbois-2010-07-13 : add test and check if exluding only those properties is realistic -// binder.copyExcluding(poll, result, -// Poll.PROPERTY_POLL_ID, -// Poll.PROPERTY_CLOSED, -// Poll.PROPERTY_RESULT, -// Poll.PROPERTY_POLL_ACCOUNT -// ); -// // Copy of participants only for no free poll -// if (poll.getType().isRestrictedOrGroup()) { -// result.setPollAccount(poll.getPollAccount()); -// } -// return result; -// } -// -// public Poll createPoll(Poll poll, -// Collection<ParticipantList> lists) throws PollAlreadyExistException { -// try { -// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); -// -// if (dao.existByNaturalId(poll.getUid())) { -// throw new PollAlreadyExistException(); -// } -// -// // Create newPoll and copy simple properties from poll source -// Poll newPoll = createBasicPoll(poll); -// -// // Create accounts only for non free poll -// if (!newPoll.getType().isFree()) { -// // Create accounts depends on pollType and lists argument -// List<PollAccount> accounts = -// createPollAccounts(newPoll.getType(), lists); -// newPoll.setPollAccount(accounts); -// } -// -// // Create newPoll choices -// List<Choice> choices = createPollChoices(poll.getChoice()); -// -// newPoll.setChoice(choices); -// -// dao.update(newPoll); -// -// return newPoll; -// } catch (TopiaException e) { -// throw new PollenTechnicalException(e); -// } -// } -// -// public Poll updatePoll(Poll poll) throws PollAlreadyClosedException { -// try { -// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); -// -// // Updating a Poll : -// // - TITLE -// // - DESCRIPTION -// // - BEGIN/END DATE -// // - CHOICE_ADD_ALLOWED -// // - BEGIN/END ADD CHOICE DATE -// // - MAX_CHOICE_NB -// // - CONTINUOUS_RESULTS -// // - PUBLIC_RESULTS -// // - ANONYMOUS_VOTE_ALLOWED -// -// // Anonymous change is not supported (need to manage accounts) -// // PollType change is not supported (need to manage accounts) -// // VoteCounting change is not supported (need to manage existing votes) -// -// // Comments, Results, Choices and Accounts will not be updated here -// -// // Update only for not started poll : -// // - VOTE_COUNTING -// // - CHOICE_TYPE -// // - CHOICES -// -// Poll pollToUpdate = dao.findByTopiaId(poll.getTopiaId()); -// -// // Can't update a closed poll -// if (pollToUpdate.isClosed()) { -// throw new PollAlreadyClosedException(); -// } -// -// TopiaEntityBinder<Poll> binder = -// PollenBinderHelper.getSimpleTopiaBinder(Poll.class); -// -// // Idea, if we can use Embeddable object for Hibernate, Options will be a good use case -// binder.copy(poll, pollToUpdate, -// Poll.PROPERTY_TITLE, -// Poll.PROPERTY_DESCRIPTION, -// Poll.PROPERTY_BEGIN_DATE, -// Poll.PROPERTY_END_DATE, -// Poll.PROPERTY_ANONYMOUS_VOTE_ALLOWED, -// Poll.PROPERTY_CHOICE_ADD_ALLOWED, -// Poll.PROPERTY_BEGIN_CHOICE_DATE, -// Poll.PROPERTY_END_CHOICE_DATE, -// Poll.PROPERTY_CONTINUOUS_RESULTS, -// Poll.PROPERTY_PUBLIC_RESULTS, -// Poll.PROPERTY_MAX_CHOICE_NB -// ); -// -// // if not started -// if (!pollToUpdate.isStarted()) { -// -// log.debug("Poll is not started, update voteCounting and choices"); -// -// // Update voteCounting is simple when poll have no vote -// pollToUpdate.setVoteCounting(poll.getVoteCounting()); -// -// // Override choices if type has changed, otherwise the choice entity will automatically be updated -// if (!pollToUpdate.getChoiceType().equals(poll.getChoiceType())) { -// pollToUpdate.setChoiceType(poll.getChoiceType()); -// -// ChoiceDAO choiceDAO = PollenDAOHelper.getChoiceDAO(getTransaction()); -// // Clear previous choices, will properly delete orphans -// pollToUpdate.getChoice().clear(); -// // Create new choices and add them to the poll -// for (Choice choice : poll.getChoice()) { -// Choice newChoice = pollToUpdate.addNewChoice(choice.getName(), choice.getDescription()); -// choiceDAO.create(newChoice); -// } -// } -// } -// -// // If continuous results is now activated, execute a voteCounting -// if (!pollToUpdate.isContinuousResults() && -// poll.isContinuousResults()) { -// // TODO-fdesbois-2011-07-13 : execute vote counting -// } -// -// Poll result = dao.update(pollToUpdate); -// return result; -// } catch (TopiaException e) { -// throw new PollenTechnicalException(e); -// } -// } -// -// public void deletePoll(Poll poll) { -// try { -// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); -// dao.delete(poll); -// //FIXME tchemit-20120124 Remove any other sotrages relatives to this poll (images choices for example). -// } catch (TopiaException e) { -// throw new PollenTechnicalException(e); -// } -// } -// -// public void deleteChoice(Choice choice) { -// try { -// ChoiceDAO dao = PollenDAOHelper.getChoiceDAO(getTransaction()); -// dao.delete(choice); -// //FIXME tchemit-20120124 Remove any other sotrages relatives to this poll (images choices for example). -// } catch (TopiaException e) { -// throw new PollenTechnicalException(e); -// } -// } -// -// //FIXME tchemit-20120123 Replace the filter by a simple PagerBean -// public List<UserPoll> getPolls(EntityFilter filter) { -// try { -// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); -// -// PollenQueryHelper.PollAccountProperty participantProperty = -// PollenQueryHelper.newPollAccountChildProperty(); -// -// // Filter can be apply on userAccount as reference -// TopiaQuery query = dao.createQueryFindAllByUser(filter); -// -// query.addSelect(participantProperty.$alias()); -// -// log.debug("Query : " + query); -// -// List<UserPoll> results = retrieveUserPolls(query); -// -// return results; -// } catch (TopiaException e) { -// throw new PollenTechnicalException(e); -// } -// } -// -// //FIXME tchemit-20120123 Replace the filter by a simple PagerBean -// public List<Comment> getComments(EntityFilter filter) { -// try { -// CommentDAO dao = PollenDAOHelper.getCommentDAO(getTransaction()); -// -//// String pollAlias = PollenQueryHelper.ALIAS_POLL; -//// String pollCommentProperty = -//// TopiaQuery.getProperty(pollAlias, Poll.PROPERTY_COMMENT); -//// String commentAlias = PollenQueryHelper.ALIAS_COMMENT; -// -// PollenQueryHelper.PollProperty pollProperty = -// PollenQueryHelper.newPollProperty(); -// PollenQueryHelper.CommentProperty commentProperty = -// PollenQueryHelper.newCommentProperty(); -// -// filter.checkReference(Poll.class, true); -// filter.setReferenceProperty(pollProperty.$alias()); -// -// TopiaQuery query = PollenQueryHelper.createQuery(pollProperty). -// setSelect(commentProperty.$alias()). -// addJoin(pollProperty.comment(), commentProperty.$alias(), false). -// addFilter(filter); -// -// List<Comment> comments = dao.findAllByQuery(query); -// return comments; -// } catch (TopiaException e) { -// throw new PollenTechnicalException(e); -// } -// } -// -// public ParticipantList getNewPollList() { -// PollAccount result = new PollAccountImpl(); -// result.setList(true); -// result.setChild(new ArrayList<PollAccount>()); -// return result; -// } -// -// public Participant getNewPollParticipant() { -// PollAccount result = new PollAccountImpl(); -// result.setWeight(1.); -// return result; -// } -// -// //FIXME tchemit-20120123 Remove the fetch system we don't need it with our transaction management -// public Poll getPoll(String pollUid, String... properties) throws PollNotFoundException { -// try { -// // Property is used to control the alias and dependencies inside the query -// PollenQueryHelper.PollProperty pollProperty = -// PollenQueryHelper.newPollProperty(); -// -// // Need to control the alias for fetching, add it to each property -// String[] fetchProperties = new String[properties.length]; -// for (int i = 0; i < properties.length; i++) { -// // This will clean properties for fetching -// fetchProperties[i] = pollProperty.$property(properties[i]); -// } -// -// // Create the query using default alias for Poll -// TopiaQuery query = PollenQueryHelper.createQuery(pollProperty). -// addFetch(fetchProperties). -// addEquals(pollProperty.uid(), pollUid); -// -// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); -// Poll result = dao.findByQuery(query); -// if (result == null) { -// throw new PollNotFoundException(); -// } -// return result; -// } catch (TopiaException e) { -// throw new PollenTechnicalException(e); -// } -// } -// -// //FIXME tchemit-20120123 Should check userAccount and pollUid exist ? -// public boolean canAdminPoll(String accountUid, String pollUid) { -// try { -// PollenQueryHelper.PollProperty pollProperty = -// PollenQueryHelper.newPollProperty(); -// -// TopiaQuery query = PollenQueryHelper.createQuery(pollProperty). -// addEquals(pollProperty.uid(), pollUid). -// addEquals(pollProperty.creatorProperty().uid(), accountUid); -// -// -// // Note a boolean admin exist in PollAccount, maybe -// // find the account in lists -// -// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); -// boolean result = dao.existByQuery(query); -// return result; -// } catch (TopiaException e) { -// throw new PollenTechnicalException(e); -// } -// } -// -// public int getNbTotalPolls() { -// try { -// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); -// Long result = dao.count(); -// return result.intValue(); -// } catch (TopiaException e) { -// throw new PollenTechnicalException(e); -// } -// } -// -// //FIXME tchemit-20120123 Remove this from dao, remove EntityFilter... -// public int getNbPollsByUser(UserAccount user) { -// try { -// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); -// -// EntityFilter filter = new TopiaFilter(); -// filter.setReference(user); -// TopiaQuery query = dao.createQueryFindAllByUser(filter); -// -// int result = dao.countByQuery(query); -// -// return result; -// } catch (TopiaException e) { -// throw new PollenTechnicalException(e); -// } -// } -// -// public List<Poll> getRunningPolls() { -// try { -// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); -// -// // isRunning : isStarted() && !isFinished() && !isClosed() -// -// Date now = serviceContext.getCurrentTime(); -// -// TopiaQuery query = dao.createQuery(). -// addWhere(Poll.PROPERTY_BEGIN_DATE, TopiaQuery.Op.LE, now). -// addWhere(Poll.PROPERTY_END_DATE, TopiaQuery.Op.GE, now). -// addEquals(Poll.PROPERTY_CLOSED, Boolean.FALSE). -// addOrderDesc(Poll.TOPIA_CREATE_DATE); -// -// List<Poll> result = dao.findAllByQuery(query); -// -// return result; -// } catch (TopiaException e) { -// throw new PollenTechnicalException(e); -// } -// } -// -// public Choice createChoice(Poll poll, Choice choice) { -// try { -// ChoiceDAO dao = PollenDAOHelper.getChoiceDAO(getTransaction()); -// -// Choice choiceCreated = dao.create( -// Choice.PROPERTY_NAME, choice.getName(), -// Choice.PROPERTY_DESCRIPTION, choice.getDescription(), -// Choice.PROPERTY_TYPE, choice.getType() -// ); -// -// PollDAO pollDAO = PollenDAOHelper.getPollDAO(getTransaction()); -// -// Poll pollToUpdate = pollDAO.findByTopiaId(poll.getTopiaId()); -// -// pollToUpdate.addChoice(choiceCreated); -// -// pollDAO.update(pollToUpdate); -// -// return choiceCreated; -// } catch (TopiaException e) { -// throw new PollenTechnicalException(e); -// } -// } -// -// public Choice getNewChoice(Poll poll) { -// Choice result = new ChoiceImpl(); -// result.setType(poll.getChoiceType()); -// return result; -// } -// -// public void setPollClosed(Poll poll, boolean closed) throws Exception { -// try { -// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); -// -// Poll pollToUpdate = dao.findByTopiaId(poll.getTopiaId()); -// pollToUpdate.setClosed(closed); -// -// dao.update(pollToUpdate); -// } catch (TopiaException e) { -// throw new PollenTechnicalException(e); -// } -// } -// -// public Poll createBasicPoll(Poll source) -// throws TopiaException { -// try { -// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); -// -// PollAccountDAO accountDAO = -// PollenDAOHelper.getPollAccountDAO(getTransaction()); -// -// // Create newPoll and copy simple properties from poll source -// Poll result = dao.create(source.getUid()); -// -// // Copy all properties instead of Uid (already set at creation), -// // Closed (not used in this case) and Creator (managed separately) -// PollenBinderHelper.getSimpleTopiaBinder(Poll.class). -// copyExcluding(source, result, -// Poll.PROPERTY_UID, -// Poll.PROPERTY_CLOSED, -// Poll.PROPERTY_CREATOR); -// -// // Create creator and set him to the poll -// PollAccount creator = accountDAO.create( -// serviceContext.createPollenUrlId()); -// -// PollenBinderHelper.getSimpleTopiaBinder(PollAccount.class). -// copy(source.getCreator(), creator, -// PollAccount.PROPERTY_NAME, -// PollAccount.PROPERTY_EMAIL, -//// PollAccount.WEIGHT, -// PollAccount.PROPERTY_ADMIN, -// PollAccount.PROPERTY_USER_ACCOUNT); -// accountDAO.update(creator); -// -// result.setCreator(creator); -// return result; -// } catch (TopiaException e) { -// throw new PollenTechnicalException(e); -// } -// } -// -// public void validatePoll(Poll poll) { -// -// Date currentTime = serviceContext.getCurrentTime(); -// -// if (poll.getBeginDate() == null) { -// poll.setBeginDate(currentTime); -// } -// -// if (poll.getEndDate() != null) { -// Preconditions.checkArgument(poll.getEndDate().before(poll.getBeginDate())); -// } -// -// // Add choices if allowed after creation -// if (poll.isChoiceAddAllowed()) { -// -// // Initialize beginChoiceDate if needed -// if (poll.getBeginChoiceDate() == null) { -// poll.setBeginChoiceDate(currentTime); -// } -// -// // Check beginChoiceDate -// if (poll.getEndDate() != null) { -// Preconditions.checkArgument(poll.getBeginChoiceDate().before(poll.getEndDate())); -// } -// -// // Check endChoiceDate -// if (poll.getEndChoiceDate() != null) { -// Preconditions.checkArgument(poll.getEndChoiceDate().after(poll.getBeginChoiceDate())); -// } -// } -// } -// -// protected List<PollAccount> createPollAccounts(PollType type, -// Collection<ParticipantList> lists) -// throws TopiaException, IllegalArgumentException { -// -// List<PollAccount> results = new ArrayList<PollAccount>(); -// -// PollAccountDAO accountDAO = -// PollenDAOHelper.getPollAccountDAO(getTransaction()); -// -// switch (type) { -// case RESTRICTED: -// if (CollectionUtils.isEmpty(lists)) { -// throw new IllegalArgumentException("lists can't be empty" + -// " for restricted poll"); -// } -// // Create accounts only on first participant list -// results = createPersonAccounts(accountDAO, -// lists.iterator().next()); -// break; -// case GROUP: -// if (CollectionUtils.isEmpty(lists)) { -// throw new IllegalArgumentException("lists can't be empty" + -// " for group poll"); -// } -// -// for (ParticipantList list : lists) { -// // Create the accountList -// PollAccount accountList = accountDAO.create( -// serviceContext.createPollenUrlId()); -// accountList.setList(true); -// accountList.setName(list.getName()); -// -// // Create account children -// List<PollAccount> accounts = -// createPersonAccounts(accountDAO, list); -// accountList.setChild(accounts); -// -// // Add the accountList to the results -// results.add(accountList); -// } -// } -// return results; -// } -// -// protected List<PollAccount> createPersonAccounts(PollAccountDAO dao, -// ParticipantList list) -// throws TopiaException { -// -// List<PollAccount> results = new ArrayList<PollAccount>(); -// -// for (Participant participant : list.getParticipants()) { -// String accountUid = serviceContext.createPollenUrlId(); -// PollAccount account = dao.create(accountUid); -// account.setName(participant.getName()); -// account.setEmail(participant.getEmail()); -// account.setWeight(participant.getWeight()); -// dao.update(account); -// results.add(account); -// } -// return results; -// } -// -// protected List<Choice> createPollChoices(List<Choice> source) -// throws TopiaException { -// -// ChoiceDAO dao = PollenDAOHelper.getChoiceDAO(getTransaction()); -// -// List<Choice> results = new ArrayList<Choice>(); -// -// for (Choice choice : source) { -// Choice newChoice = dao.create(); -// PollenBinderHelper.getSimpleTopiaBinder(Choice.class). -// copy(choice, newChoice); -// results.add(newChoice); -// } -// return results; -// } -// -// //FIXME tchemit-20120123 : help me to destroy this :( -// protected List<UserPoll> retrieveUserPolls(TopiaQuery query) -// throws TopiaException { -// -// List<UserPoll> results = new ArrayList<UserPoll>(); -// -// Map<String, UserPoll> pollsCache = -// new HashMap<String, UserPoll>(); -// -// -// List<Object[]> queryResults = getTransaction().findByQuery(query); -// for (Object[] row : queryResults) { -// Poll poll = (Poll) row[0]; -// PollAccount account = (PollAccount) row[1]; -// if (log.isDebugEnabled()) { -// log.debug("account : " + account.getUid() + " : " + -// account.getName() + -// " list(" + account.isList() + ")" + -// " admin(" + account.isAdmin() + ")" + -// " for poll " + poll.getTitle()); -// } -// -// UserPoll userPoll = pollsCache.get(poll.getTopiaId()); -// -// if (userPoll == null) { -// userPoll = new UserPoll(); -// userPoll.setPoll(poll); -// results.add(userPoll); -// pollsCache.put(poll.getTopiaId(), userPoll); -// } -// -// userPoll.addAccount(account); -// } -// -// return results; -// } - public Poll getPollByPollId(String pollId) { Preconditions.checkNotNull(pollId); @@ -1132,12 +616,65 @@ File imageDirectory = getConfiguration().getImageDirectory(); File pollDirectory = new File(imageDirectory, pollId); - if (thumb) { - choiceId = "thumb_" + choiceId; + choiceId = THUMB_PREFIX + choiceId; } File result = new File(pollDirectory, choiceId); return result; } + + public static final String THUMB_PREFIX = "thumb_"; + + + /** + * Sauvegarde des images d'un choix de type image. + * + * @param poll le sondage contenant le choix + * @param choice le choix à sauvegarder. + * @throws IOException si un problème IO lors de la copie ou génération de la miniature + */ + public void saveImages(Poll poll, PollImageChoice choice) throws IOException { + + String location = choice.getLocation(); + + File pollChoiceImage = getPollChoiceImageFile(poll.getPollId(), choice.getName(), false); + File pollChoiceImageThumb = getPollChoiceImageFile(poll.getPollId(), choice.getName(), true); + + FileUtils.copyFile(new File(location), pollChoiceImage); + createThumbnail(pollChoiceImage, pollChoiceImageThumb, 100); + } + + /** + * Création d'une miniature. + * + * @param img L'image à miniaturiser. + * @param thumbCopied le chemin complet vers la miniature. + * @param width La largeur de la miniature. + * @throws IOException if could not create thumb image + */ + protected static void createThumbnail(File img, + File thumbCopied, + int width) throws IOException { + + ImageIcon ii = new ImageIcon(img.getAbsolutePath()); + Image image = ii.getImage(); + double imageRatio = (double) image.getHeight(null) + / (double) image.getWidth(null); + int height = (int) (width * imageRatio); + + BufferedImage thumbImage = new BufferedImage(width, height, + BufferedImage.TYPE_INT_RGB); + Graphics2D graphics2D = thumbImage.createGraphics(); + graphics2D.setRenderingHint(RenderingHints.KEY_INTERPOLATION, + RenderingHints.VALUE_INTERPOLATION_BILINEAR); + graphics2D.drawImage(image, 0, 0, width, height, null); + + ImageIO.write(thumbImage, "jpg", thumbCopied); + + if (log.isDebugEnabled()) { + log.debug("Thumbnail created: " + thumbCopied.getName() + " (size=" + + thumbCopied.length() + ")"); + } + } }

1 0

r3159 - in branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/poll resources/i18n webapp/WEB-INF/jsp/poll webapp/css
by tchemit＠users.chorem.org March 2, 2012

March 2, 2012

Author: tchemit Date: 2012-03-02 19:52:12 +0100 (Fri, 02 Mar 2012) New Revision: 3159 Url: http://chorem.org/repositories/revision/pollen/3159 Log: debut de la page de cr?\195?\169ation Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/pollCreation.css Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java 2012-03-02 18:51:13 UTC (rev 3158) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java 2012-03-02 18:52:12 UTC (rev 3159) @@ -23,8 +23,11 @@ */ package org.chorem.pollen.ui.actions.poll; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.opensymphony.xwork2.Preparable; +import org.chorem.pollen.business.persistence.Choice; +import org.chorem.pollen.business.persistence.ChoiceImpl; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.common.ChoiceType; @@ -34,6 +37,7 @@ import org.chorem.pollen.services.impl.PollService; import org.chorem.pollen.ui.actions.PollenActionSupport; +import java.util.List; import java.util.Map; /** @@ -64,6 +68,15 @@ protected int notificationNumber; + /** Nombre de choix affichés initialement. */ + private int nbChoices = 5; + + private List<Choice> textChoices; + + private List<Choice> dateChoices; + + private List<Choice> imageChoices; + public String getPageLogo() { return "Creation"; } @@ -128,6 +141,43 @@ this.notificationNumber = notificationNumber; } + public int getNbChoices() { + return nbChoices; + } + + public List<Choice> getTextChoices() { + if (textChoices == null) { + textChoices = Lists.newLinkedList(); + } + return textChoices; + } + + public Choice getTextChoices(int index) { + return getChoices(getTextChoices(), index); + } + + public Choice getDateChoices(int index) { + return getChoices(getDateChoices(), index); + } + + public Choice getImageChoices(int index) { + return getChoices(getImageChoices(), index); + } + + public List<Choice> getDateChoices() { + if (dateChoices == null) { + dateChoices = Lists.newLinkedList(); + } + return dateChoices; + } + + public List<Choice> getImageChoices() { + if (imageChoices == null) { + imageChoices = Lists.newLinkedList(); + } + return imageChoices; + } + @Override public String execute() throws Exception { @@ -142,7 +192,7 @@ // } // back to input - return INPUT; + return SUCCESS; } @Override @@ -161,4 +211,11 @@ } return result; } + + private Choice getChoices(List<Choice> choices, int index) { + while (choices.size() < index) { + choices.add(new ChoiceImpl()); + } + return choices.get(index); + } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-03-02 18:51:13 UTC (rev 3158) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-03-02 18:52:12 UTC (rev 3159) @@ -6,6 +6,7 @@ poll.common.vote.results-help=Display results poll.common.vote.return=Back to poll poll.common.vote.return-help=Back to poll +pollen.action.addChoice=Add choice pollen.action.addComment=Add a comment pollen.action.backToFavoriteLists=Back to favorite lists pollen.action.create=Create @@ -43,6 +44,7 @@ pollen.common.chartType-pie=Pie pollen.common.chartType-pie3d=Pie 3D pollen.common.chartType-ring=Ring +pollen.common.choice=Choice pollen.common.commentName=Name pollen.common.commentText=Comment pollen.common.csvImport=CSV import @@ -79,7 +81,7 @@ pollen.common.pollOption.publicResults=Public results pollen.common.pollOption.reminder=Send reminder emails pollen.common.pollOption.reminderHourCountdown=Hours before end -pollen.common.pollType=Poll type +pollen.common.pollType=Who can vote ? pollen.common.postDate=Comment date pollen.common.results=Results\: pollen.common.title=Title @@ -87,7 +89,7 @@ pollen.common.victories=Winners\: pollen.common.victory=Winner\: pollen.common.voteCounting-label=Vote Counting\: -pollen.common.voteCountingType=Counting type +pollen.common.voteCountingType=Response type pollen.common.voteCountingTypeHelp.condorcet=Condorcet vote\: rank choices by preference order from 1 to N (1\=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. pollen.common.voteCountingTypeHelp.normal=Normal vote\: vote for your favorite choice. pollen.common.voteCountingTypeHelp.number=Voting by number\: The answer is free, leave blank or enter a integer. Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-03-02 18:51:13 UTC (rev 3158) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-03-02 18:52:12 UTC (rev 3159) @@ -6,6 +6,7 @@ poll.common.vote.results-help=Voir les résultats poll.common.vote.return=Retour au sondage poll.common.vote.return-help=Retour au sondage +pollen.action.addChoice=Ajouter un choix pollen.action.addComment=Ajouter un commentaire pollen.action.backToFavoriteLists=Retour à la liste des favoris pollen.action.create=Créer @@ -43,6 +44,7 @@ pollen.common.chartType-pie=Camembert pollen.common.chartType-pie3d=Camembert 3D pollen.common.chartType-ring=Anneau +pollen.common.choice=Choix pollen.common.commentName=Nom pollen.common.commentText=Commentaire pollen.common.csvImport=Import CSV @@ -80,14 +82,14 @@ pollen.common.pollOption.publicResults=Résultats publics pollen.common.pollOption.reminder=Envoyer des emails de rappel pollen.common.pollOption.reminderHourCountdown=heures avant la fin du sondage -pollen.common.pollType=Type de sondage +pollen.common.pollType=Qui peut voter ? pollen.common.postDate=Date du commentaire pollen.common.results=Résultats \: pollen.common.title=Titre pollen.common.userSupport=Support utilisateur pollen.common.victories=Gagnants \: pollen.common.victory=Gagnant \: -pollen.common.voteCountingType=Type de dépouillement +pollen.common.voteCountingType=Type de Réponse pollen.common.voteCountingTypeHelp.condorcet=Vote Condorcet \: classer les choix par ordre de préférence de 1 à N (1\=préféré). Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur. pollen.common.voteCountingTypeHelp.normal=Vote normal \: voter pour le ou les choix préférés. pollen.common.voteCountingTypeHelp.number=Vote par nombre \: La réponse est libre, laissez vide ou entrez un nombre entier @@ -170,6 +172,8 @@ pollen.menu.preferences=Mon compte pollen.menu.register=Inscrivez-vous pollen.menu.userFavoriteLists=Listes de votants +pollen.tab.poll.general=Informations +pollen.tab.poll.options=Options pollen.title.createPoll=Nouveau sondage pollen.title.delete.pollChoice=Confirmer la suppresion d'un choix pollen.title.delete.pollComment=Confirmer la suppresion d'un commentaire Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-03-02 18:51:13 UTC (rev 3158) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-03-02 18:52:12 UTC (rev 3159) @@ -24,10 +24,12 @@ <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<link rel="stylesheet" type="text/css" + href="<s:url value='/css/pollCreation.css'/>"/> <script type="text/javascript"> jQuery(document).ready(function () { - $('[name="poll.choiceAddAllowed"]').change(function(event) { + $('[name="poll.choiceAddAllowed"]').change(function (event) { var val = $(this).prop('checked'); if (val) { $('#addChoiceAddAllowedPanel').show(); @@ -36,7 +38,7 @@ } }); - $('[name="limitChoice"]').change(function(event) { + $('[name="limitChoice"]').change(function (event) { var val = $(this).prop('checked'); if (val) { $('#maxChoiceNbPanel').show(); @@ -45,7 +47,7 @@ } }); - $('[name="reminder"]').change(function(event) { + $('[name="reminder"]').change(function (event) { var val = $(this).prop('checked'); if (val) { $('#reminderPanel').show(); @@ -54,7 +56,7 @@ } }); - $('[name="notification"]').change(function(event) { + $('[name="notification"]').change(function (event) { var val = $(this).prop('checked'); if (val) { $('#notificationPanel').show(); @@ -63,75 +65,214 @@ } }); - $('[name="poll.anonymous"]').change(function(event) { + $('[name="poll.anonymous"]').change(function (event) { var val = $(this).prop('checked'); $('[name="poll.anonymousVoteAllowed"]').prop('checked', val); }); - $('[name="poll.continuousResults"]').change(function(event) { + $('[name="poll.continuousResults"]').change(function (event) { var val = $(this).prop('checked'); $('[name="poll.publicResults"]').prop('checked', val); }); + + function changeChoicetype(type) { + $('.choices').addClass('hidden'); + $('#choices' + type).removeClass('hidden'); + } + + $('[name="poll.choiceType"]').change(function (event) { + changeChoicetype($(this).val()); + }); + $('[name="poll.pollType"][value="<s:property value="%{poll.pollType.ordinal()}"/>"]').prop('checked', true); + $('[name="poll.voteCountingType"][value="<s:property value="%{poll.voteCountingType.ordinal()}"/>"]').prop('checked', true); + + var choiceType = '<s:property value="%{poll.choiceType.ordinal()}"/>'; + $('[name="poll.choiceType"][value="' + choiceType + '"]').prop('checked', true); + changeChoicetype(choiceType); }); </script> <title><s:text name="pollen.title.createPoll"/></title> <h1 class="title${pageLogo}"><s:text name="pollen.title.createPoll"/></h1> -<s:form method="POST" key="registerForm" namespace="/poll"> +<s:form method="POST" id="registerForm" namespace="/poll"> - <fieldset> - <legend><s:text name="pollen.fieldset.poll.you"/></legend> - <s:textfield key="poll.creator.name" label="%{getText('pollen.common.login')}" required="true"/> - <s:textfield key="poll.creator.email" label="%{getText('pollen.common.email')}"/> - </fieldset> + <sj:tabbedpanel id="formTabs"> - <fieldset> - <legend><s:text name="pollen.fieldset.poll.general"/></legend> + <sj:tab id="tabGeneral" target="tgeneral" key="pollen.tab.poll.general"/> + <sj:tab id="tabOptions" target="toptions" key="pollen.tab.poll.options"/> - <s:textfield key="poll.title" label="%{getText('pollen.common.title')}" required="true"/> - <s:textfield key="poll.description" label="%{getText('pollen.common.description')}"/> - <sj:datepicker key="poll.beginDate" label="%{getText('pollen.common.beginDate')}" displayFormat="dd/mm/yy"/> - <sj:datepicker key="poll.endDate" label="%{getText('pollen.common.endDate')}" displayFormat="dd/mm/yy"/> - <s:radio key='poll.pollType' list="pollTypes" label='%{getText("pollen.common.pollType")}' /> - <s:radio key='poll.voteCountingType' list="voteCountingTypes" label='%{getText("pollen.common.voteCountingType")}' /> - </fieldset> + <div id="tgeneral"> - <fieldset> - <legend><s:text name="pollen.fieldset.poll.options"/></legend> + <fieldset> + <%--<legend><s:text name="pollen.common.voteCountingType"/></legend>--%> - <s:checkbox key="poll.anonymous" label="%{getText('pollen.common.pollOption.anonymous')}" /> - <s:checkbox key="poll.anonymousVoteAllowed" label="%{getText('pollen.common.pollOption.anonymousVoteAllowed')}" /> - <s:checkbox key="poll.continuousResults" label="%{getText('pollen.common.pollOption.continuousResults')}" /> - <s:checkbox key="poll.publicResults" label="%{getText('pollen.common.pollOption.publicResults')}" /> - <s:checkbox key="poll.choiceAddAllowed" label="%{getText('pollen.common.pollOption.choiceAddAllowed')}" /> - <div id='addChoiceAddAllowedPanel' class="hidden"> - <sj:datepicker key="poll.beginChoiceDate" label="%{getText('pollen.common.beginChoiceDate')}" displayFormat="dd/mm/yy"/> - <sj:datepicker key="poll.endChoiceDate" label="%{getText('pollen.common.endChoiceDate')}" displayFormat="dd/mm/yy"/> + <s:textfield key="poll.title" label="%{getText('pollen.common.title')}" + required="true" size="80"/> + <s:textarea key="poll.description" rows="3" cols="54" + label="%{getText('pollen.common.description')}"/> + </fieldset> + + <br/> + + <fieldset> + <legend><s:text name="pollen.common.voteCountingType"/></legend> + <s:radio key='poll.voteCountingType' list="voteCountingTypes" + label='' theme="simple"/> + + </fieldset> + <br/> + + <fieldset> + <legend><s:text name="pollen.fieldset.poll.choices"/></legend> + <s:radio key='poll.choiceType' list="choiceTypes" + label='' theme="simple"/> + <hr/> + + <div id="choices0" class="choices"> + <s:iterator begin="0" end="nbChoices" status="status"> + <s:set name="tprefix">textChoices[<s:property + value="#status.index"/>].</s:set> + <div class="fleft choiceName"> + <s:label for="%{#tprefix}name" key="pollen.common.choice" + theme="simple"/> + <s:textfield cssClass="nameField" id='%{#tprefix}name' + key="%{#tprefix}name" label='' theme="simple"/> + - + <s:label for="%{#tprefix}description" + key="pollen.common.description" theme="simple"/> + </div> + <div class="fleft"> + <s:textarea cols="30" id="%{#tprefix}description" + key="%{#tprefix}description" label='' theme="simple"/> + </div> + <div class="cleanBoth"></div> + </s:iterator> + </div> + + <div id="choices1" class="choices"> + <s:iterator begin="0" end="nbChoices" status="status"> + <s:set name="dprefix">dateChoices.<s:property + value="#status.index"/>.</s:set> + <div class="fleft choiceName"> + <s:label for="%{#dprefix}name" key="pollen.common.choice" + theme="simple"/> + <sj:datepicker id='%{#dprefix}name' key="%{#dprefix}name" + changeMonth="true" changeYear="true" + labelSeparator="" theme="simple" label="" + timepicker="true"/> + - + <s:label for="%{#dprefix}description" + key="pollen.common.description" theme="simple"/> + </div> + <div class="fleft"> + <s:textarea cols="30" id="%{#dprefix}description" + key="%{#dprefix}description" label='' theme="simple"/> + </div> + <div class="cleanBoth"></div> + </s:iterator> + </div> + <div id="choices2" class="choices"> + <s:iterator begin="0" end="nbChoices" status="status"> + <s:set name="iprefix">imageChoices[<s:property + value="#status.index"/>].</s:set> + <div class="fleft choiceName"> + <s:label for="%{#iprefix}name" key="pollen.common.choice" + theme="simple"/> + <s:file id='%{#iprefix}name' key="%{#iprefix}name" + label='' theme="simple" cssClass="nameField"/> + - + <s:label for="%{#iprefix}description" + key="pollen.common.description" theme="simple"/> + </div> + <div class="fleft"> + <s:textarea cols="30" id="%{#iprefix}description" + key="%{#iprefix}description" label='' theme="simple"/> + </div> + <div class="cleanBoth"></div> + </s:iterator> + </div> + <hr/> + <s:submit key="pollen.action.addChoice" align="center"/> + + </fieldset> + </div> - <s:checkbox key="limitChoice" label="%{getText('pollen.common.pollOption.limitChoice')}" /> - <div id='maxChoiceNbPanel' class="hidden"> - <s:textfield key="poll.maxChoiceNb" label="%{getText('pollen.common.pollOption.maxChoiceNb')}"/> - </div> - <s:checkbox key="notification" label="%{getText('pollen.common.pollOption.notification')}" /> - <div id='notificationPanel' class="hidden"> - <s:textfield key="notificationNumber" - label="%{getText('pollen.common.pollOption.notificationNumber')}" /> + + <div id="toptions"> + + <fieldset> + <legend><s:text name="pollen.fieldset.poll.you"/></legend> + <s:textfield key="poll.creator.name" + label="%{getText('pollen.common.login')}"/> + <s:textfield key="poll.creator.email" + label="%{getText('pollen.common.email')}"/> + </fieldset> + + <br/> + + <fieldset> + <legend><s:text name="pollen.fieldset.poll.options"/></legend> + + <s:checkbox key="poll.anonymous" + label="%{getText('pollen.common.pollOption.anonymous')}"/> + <s:checkbox key="poll.anonymousVoteAllowed" + label="%{getText('pollen.common.pollOption.anonymousVoteAllowed')}"/> + <s:checkbox key="poll.continuousResults" + label="%{getText('pollen.common.pollOption.continuousResults')}"/> + <s:checkbox key="poll.publicResults" + label="%{getText('pollen.common.pollOption.publicResults')}"/> + <s:checkbox key="poll.choiceAddAllowed" + label="%{getText('pollen.common.pollOption.choiceAddAllowed')}"/> + <div id='addChoiceAddAllowedPanel' class="hidden"> + <sj:datepicker key="poll.beginChoiceDate" + label="%{getText('pollen.common.beginChoiceDate')}" + displayFormat="dd/mm/yy"/> + <sj:datepicker key="poll.endChoiceDate" + label="%{getText('pollen.common.endChoiceDate')}" + displayFormat="dd/mm/yy"/> + </div> + <s:checkbox key="limitChoice" + label="%{getText('pollen.common.pollOption.limitChoice')}"/> + <div id='maxChoiceNbPanel' class="hidden"> + <s:textfield key="poll.maxChoiceNb" + label="%{getText('pollen.common.pollOption.maxChoiceNb')}"/> + </div> + <s:checkbox key="notification" + label="%{getText('pollen.common.pollOption.notification')}"/> + <div id='notificationPanel' class="hidden"> + <s:textfield key="notificationNumber" + label="%{getText('pollen.common.pollOption.notificationNumber')}"/> + </div> + <s:checkbox key="reminder" + label="%{getText('pollen.common.pollOption.reminder')}"/> + <div id='reminderPanel' class="hidden"> + <s:textfield key="reminderHourCountdown" + label="%{getText('pollen.common.pollOption.reminderHourCountdown')}"/> + </div> + + </fieldset> + + <br/> + + <fieldset> + <legend><s:text name="pollen.fieldset.poll.general"/></legend> + + <sj:datepicker key="poll.beginDate" + label="%{getText('pollen.common.beginDate')}" + displayFormat="dd/mm/yy"/> + <sj:datepicker key="poll.endDate" + label="%{getText('pollen.common.endDate')}" + displayFormat="dd/mm/yy"/> + <s:radio key='poll.pollType' list="pollTypes" + label='%{getText("pollen.common.pollType")}'/> + + </fieldset> + </div> - <s:checkbox key="reminder" label="%{getText('pollen.common.pollOption.reminder')}" /> - <div id='reminderPanel' class="hidden"> - <s:textfield key="reminderHourCountdown" - label="%{getText('pollen.common.pollOption.reminderHourCountdown')}" /> - </div> - </fieldset> + </sj:tabbedpanel> - <fieldset> - <legend><s:text name="pollen.fieldset.poll.choices"/></legend> - <s:select key="poll.choiceType" label='%{getText("poll.common.select.choiceType")}' - list="choiceTypes" headerKey="" headerValue=""/> - </fieldset> - <br/> <s:submit action="create" key="pollen.action.createPoll" align="center"/> </s:form> Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/pollCreation.css (from rev 3153, branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/pollCreation.css) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/pollCreation.css (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-03-02 18:52:12 UTC (rev 3159) @@ -0,0 +1,122 @@ +#pollCreationZone { + width: 550px; + margin: auto; + -moz-border-radius: 15px; +} + +legend { + color: #727a7e; + font-weight: bold; +} + +#pollCreationFormDiv fieldset { + border: 1px solid #aab; + padding: 15px; + width: 380px; + margin: auto; + vertical-align: top; + text-align: left; +} + +#optionsCreationFormDiv fieldset { + border: 1px solid #aab; + padding: 15px; + width: 300px; + margin: auto; + vertical-align: top; + text-align: left; +} + +#listsCreationFormDiv fieldset { + border: 1px solid #aab; + padding: 15px; + width: 550px; + margin: auto; + vertical-align: top; + text-align: left; +} + +#choicesCreationFormDiv div { + margin-bottom: 5px; +} + +#choicesCreationFormDiv fieldset { + border: 1px solid #aab; + padding: 15px; + width: 670px; + margin: auto; + vertical-align: top; + text-align: left; +} + +#choicesCreationFormDiv div.choiceName { + padding-top: 12px; +} + +#choicesCreationFormDiv div.choiceName input.nameField { + width: 280px; +} + +#pollCreationFormDiv label { + display: block; + width: 150px; + float: left; +} + +#listsCreationFormDiv .groupDiv { + padding: 10px; +} + +#listsCreationFormDiv .currentGroupDiv { + background-color: #d0d0ff; + padding: 5px; + -moz-border-radius: 3px; +} + +#listsCreationFormDiv .groupTitleDiv { + background-color: #32b5c9; + padding: 3px; + -moz-border-radius: 3px; +} + +#listsCreationFormDiv .cmd { + float: right; +} + +#listsCreationFormDiv .editGroupSubmit { + border: none; + font-size: 0px; + background: transparent url('../img/editSmall.png') no-repeat top left; + width: 15px; + height: 16px; +} + +#listsCreationFormDiv .deleteGroupSubmit { + border: none; + font-size: 0px; + background: transparent url('../img/delete.png') no-repeat top left; + width: 16px; + height: 16px; +} + +#pollCreationFormDiv div, +#optionsCreationFormDiv div, +#listsCreationFormDiv div { + margin-bottom: 10px; +} + +#choiceDateDiv, +#choiceNbDiv, +#notificationDiv, +#reminderDiv { + color: #555; +} + +.buttons { + text-align: center; + margin-top: 20px; +} + +.buttons input { + margin-left: 10px; +} \ No newline at end of file

1 0

r3158 - branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators
by tchemit＠users.chorem.org March 2, 2012

March 2, 2012

Author: tchemit Date: 2012-03-02 19:51:13 +0100 (Fri, 02 Mar 2012) New Revision: 3158 Url: http://chorem.org/repositories/revision/pollen/3158 Log: let's make fieldset rounder Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-03-02 18:50:45 UTC (rev 3157) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-03-02 18:51:13 UTC (rev 3158) @@ -46,6 +46,15 @@ <a href="http://chorem.org/projects/pollen">Version βeta</a> </div> + +<script type="text/javascript"> + + jQuery(document).ready(function () { + + // apply common style + $('fieldset').attr('class', 'ui-widget-content ui-corner-all') + }); +</script> <s:set var="user" value="%{#session.pollenSession.userAccount}"/> <s:set var="userExists" value="%{#user != null}"/> <s:set var="userIsAdmin" value="%{#userExists && #user.administrator}"/>

1 0

r3157 - branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css
by tchemit＠users.chorem.org March 2, 2012

March 2, 2012

Author: tchemit Date: 2012-03-02 19:50:45 +0100 (Fri, 02 Mar 2012) New Revision: 3157 Url: http://chorem.org/repositories/revision/pollen/3157 Log: fix css Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css 2012-03-02 18:50:26 UTC (rev 3156) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css 2012-03-02 18:50:45 UTC (rev 3157) @@ -76,7 +76,7 @@ padding-left: 5px; } .info_success li{ - background: url("../images/true.png") no-repeat ; + background: url("../img/true.png") no-repeat ; list-style: none; font-style: italic; padding-left: 25px;

1 0

r3156 - branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen
by tchemit＠users.chorem.org March 2, 2012

March 2, 2012

Author: tchemit Date: 2012-03-02 19:50:26 +0100 (Fri, 02 Mar 2012) New Revision: 3156 Url: http://chorem.org/repositories/revision/pollen/3156 Log: fix configuration option for enums Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-03-02 13:42:51 UTC (rev 3155) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-03-02 18:50:26 UTC (rev 3156) @@ -94,21 +94,21 @@ } public ChoiceType getDefaultChoiceType() { - ChoiceType result = applicationConfig.getOptionAsObject( + ChoiceType result = applicationConfig.getOption( ChoiceType.class, PollenConfigurationOption.DEFAULT_CHOICE_TYPE.key); return result; } public VoteCountingType getDefaultVoteCountingType() { - VoteCountingType result = applicationConfig.getOptionAsObject( + VoteCountingType result = applicationConfig.getOption( VoteCountingType.class, PollenConfigurationOption.DEFAULT_VOTE_COUNTING_TYPE.key); return result; } public PollType getDefaultPollType() { - PollType result = applicationConfig.getOptionAsObject( + PollType result = applicationConfig.getOption( PollType.class, PollenConfigurationOption.DEFAULT_POLL_TYPE.key); return result;

1 0