Author: bleny Date: 2013-07-11 21:38:53 +0200 (Thu, 11 Jul 2013) New Revision: 303 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: add header in simple-withdraw-item-input to show article code and description Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java 2013-07-11 19:31:05 UTC (rev 302) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java 2013-07-11 19:38:53 UTC (rev 303) @@ -23,6 +23,7 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.StoredArticle; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -31,18 +32,25 @@ public class SimpleWithdrawItemTask { + protected Article article; + protected List<StoredArticle> storedArticles; protected boolean driverLicenseRequired; protected boolean articleUnavailable; - public SimpleWithdrawItemTask(Iterable<StoredArticle> storedArticles, boolean driverLicenseRequired, boolean articleUnavailable) { + public SimpleWithdrawItemTask(Article article, Iterable<StoredArticle> storedArticles, boolean driverLicenseRequired, boolean articleUnavailable) { + this.article = article; this.storedArticles = Lists.newArrayList(storedArticles); this.driverLicenseRequired = driverLicenseRequired; this.articleUnavailable = articleUnavailable; } + public Article getArticle() { + return article; + } + public List<StoredArticle> getStoredArticles() { return storedArticles; } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java 2013-07-11 19:31:05 UTC (rev 302) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java 2013-07-11 19:38:53 UTC (rev 303) @@ -105,7 +105,7 @@ storedArticles = Iterables.filter(storedArticles, articleStoredInAccessibleLocationPredicate); SimpleWithdrawItemTask simpleWithdrawItemTask = - new SimpleWithdrawItemTask(storedArticles, driverLicenseRequired, articleUnavailable); + new SimpleWithdrawItemTask(article, storedArticles, driverLicenseRequired, articleUnavailable); return simpleWithdrawItemTask; Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-07-11 19:31:05 UTC (rev 302) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-07-11 19:38:53 UTC (rev 303) @@ -30,6 +30,15 @@ <s:url action="choose-activity" id="cancelUrl" /> +<ul class="oneItemPerLine"> + <li> + Réf. : <s:property value="simpleWithdrawItemTask.article.code" /> + </li> + <li> + Desc. : <s:property value="simpleWithdrawItemTask.article.description" /> + </li> +</ul> + <s:form> <ul>