Author: bleny Date: 2013-07-03 13:14:16 +0200 (Wed, 03 Jul 2013) New Revision: 278 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: add a button in received articles menu to go back to suppliers list Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-03 10:55:35 UTC (rev 277) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-03 11:14:16 UTC (rev 278) @@ -124,8 +124,16 @@ receivedArticles = articleStorageService.computeActualQuantities(receivedArticles, allStorageMovementsInReception); - return Lists.newArrayList(receivedArticles); + List<StoredArticle> result = Lists.newArrayList(receivedArticles); + if (log.isTraceEnabled()) { + log.trace(result.size() + "stored articles found in reception for building " + + building + " and supplierId " + supplierId + ": \n" + + result); + } + + return result; + } public ReceptionTask getReceptionTask(String storedArticleId) { Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-07-03 10:55:35 UTC (rev 277) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-07-03 11:14:16 UTC (rev 278) @@ -23,6 +23,14 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> +<head> + <script type="text/javascript"> + $(document).ready(function () { + bindKey('Esc', function(){ redirectTo($('#prepareArticleReceptionLink'));}); + }); + </script> +</head> + <ul id="receivedArticles"> <s:iterator value="receivedArticles" status="stat" > <s:set var="receiveArticleId">prepareArticleReceptionId<s:property value="#stat.index" /></s:set> @@ -56,3 +64,6 @@ </s:else> </s:iterator> </ul> + +<s:url namespace="/" action="prepare-article-reception!input" id="prepareArticleReceptionUrl"/> +<s:a href="%{prepareArticleReceptionUrl}" cssClass="btn" id="prepareArticleReceptionLink">Annuler (Esc)</s:a>
participants (1)
-
bleny＠users.forge.codelutin.com