Author: tchemit Date: 2012-07-31 23:14:04 +0200 (Tue, 31 Jul 2012) New Revision: 3583 Url: http://chorem.org/repositories/revision/pollen/3583 Log: fixes #719: Poll cr?\195?\169ation date in table list Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-07-31 20:43:25 UTC (rev 3582) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-07-31 21:14:04 UTC (rev 3583) @@ -135,6 +135,8 @@ } else { map.put(Poll.PROPERTY_END_DATE, decorateDate(poll.getEndDate())); } + map.put(Poll.TOPIA_CREATE_DATE, + decorateDateTime(poll.getTopiaCreateDate())); String addingchoiceText; if (poll.isChoiceAddAllowed()) { Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-07-31 20:43:25 UTC (rev 3582) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-07-31 21:14:04 UTC (rev 3583) @@ -81,6 +81,7 @@ pollen.common.commentAuthor=Name pollen.common.commentText=Comment pollen.common.comments=Comments about this poll +pollen.common.createDate=Create date pollen.common.csvImport=CSV import pollen.common.datePattern= pollen.common.datePickerPattern=mm/dd/yy Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-07-31 20:43:25 UTC (rev 3582) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-07-31 21:14:04 UTC (rev 3583) @@ -81,6 +81,7 @@ pollen.common.commentAuthor=Nom pollen.common.commentText=Commentaire pollen.common.comments=Commentaire à propos du sondage +pollen.common.createDate=Date de création pollen.common.csvImport=Import CSV pollen.common.datePattern= pollen.common.datePickerPattern=dd/mm/yy Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2012-07-31 20:43:25 UTC (rev 3582) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2012-07-31 21:14:04 UTC (rev 3583) @@ -69,11 +69,14 @@ <sjg:gridColumn name="title" title='%{getText("pollen.common.title")}'/> <sjg:gridColumn name="description" title='%{getText("pollen.common.description")}'/> - <sjg:gridColumn name="addingChoices" + <sjg:gridColumn name="topiaCreateDate" width="115" + title='%{getText("pollen.common.createDate")}'/> + <sjg:gridColumn name="addingChoices" sortable="false" title='%{getText("pollen.common.addingChoices")}'/> - <sjg:gridColumn name="beginDate" + <sjg:gridColumn name="beginDate" width="100" title='%{getText("pollen.common.beginDate")}'/> - <sjg:gridColumn name="endDate" title='%{getText("pollen.common.endDate")}'/> + <sjg:gridColumn name="endDate" width="100" + title='%{getText("pollen.common.endDate")}'/> <sjg:gridColumn name="functions" title='%{getText("pollen.common.functions")}' formatter="pollFunctions" width="75" sortable="false"/> </sjg:grid> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp 2012-07-31 20:43:25 UTC (rev 3582) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp 2012-07-31 21:14:04 UTC (rev 3583) @@ -53,11 +53,14 @@ <sjg:gridColumn name="title" title='%{getText("pollen.common.title")}'/> <sjg:gridColumn name="description" title='%{getText("pollen.common.description")}'/> - <sjg:gridColumn name="addingChoices" + <sjg:gridColumn name="topiaCreateDate" width="115" + title='%{getText("pollen.common.createDate")}'/> + <sjg:gridColumn name="addingChoices" sortable="false" title='%{getText("pollen.common.addingChoices")}'/> - <sjg:gridColumn name="beginDate" + <sjg:gridColumn name="beginDate" width="100" title='%{getText("pollen.common.beginDate")}'/> - <sjg:gridColumn name="endDate" title='%{getText("pollen.common.endDate")}'/> + <sjg:gridColumn name="endDate" width="100" + title='%{getText("pollen.common.endDate")}'/> <sjg:gridColumn name="functions" title='%{getText("pollen.common.functions")}' formatter="pollFunctions" width="75" sortable="false"/> </sjg:grid> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp 2012-07-31 20:43:25 UTC (rev 3582) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp 2012-07-31 21:14:04 UTC (rev 3583) @@ -53,11 +53,14 @@ <sjg:gridColumn name="title" title='%{getText("pollen.common.title")}'/> <sjg:gridColumn name="description" title='%{getText("pollen.common.description")}'/> - <sjg:gridColumn name="addingChoices" + <sjg:gridColumn name="topiaCreateDate" width="115" + title='%{getText("pollen.common.createDate")}'/> + <sjg:gridColumn name="addingChoices" sortable="false" title='%{getText("pollen.common.addingChoices")}'/> - <sjg:gridColumn name="beginDate" + <sjg:gridColumn name="beginDate" width="100" title='%{getText("pollen.common.beginDate")}'/> - <sjg:gridColumn name="endDate" title='%{getText("pollen.common.endDate")}'/> + <sjg:gridColumn name="endDate" width="100" + title='%{getText("pollen.common.endDate")}'/> <sjg:gridColumn name="functions" title='%{getText("pollen.common.functions")}' formatter="pollFunctions" width="75" sortable="false"/> </sjg:grid>