Author: bleny Date: 2013-06-07 12:14:02 +0200 (Fri, 07 Jun 2013) New Revision: 242 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: fixes #2168 show batchCode in UI Modified: trunk/magalie-persistence/src/main/xmi/magalie.zargo trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp Modified: trunk/magalie-persistence/src/main/xmi/magalie.zargo =================================================================== (Binary files differ) Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-06-07 09:40:51 UTC (rev 241) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-06-07 10:14:02 UTC (rev 242) @@ -327,8 +327,6 @@ } } - // TODO brendan 27/05/13 add extra info about the locations - return storageMovementTask; } Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-06-07 09:40:51 UTC (rev 241) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-06-07 10:14:02 UTC (rev 242) @@ -469,6 +469,7 @@ article: *article1 location: *locationRecU01 quantity: 30 + batchCode: lot 1 storedArticle6: &storedArticle6 !stored-article @@ -532,6 +533,7 @@ article: *article6 location: *locationRecU01 quantity: 10 + batchCode: lot 2 storedArticles: - *storedArticle1 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-06-07 09:40:51 UTC (rev 241) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-06-07 10:14:02 UTC (rev 242) @@ -36,7 +36,16 @@ <s:iterator value="simpleWithdrawItemTask.storedArticles"> - <li><s:property value="location.barcode" /></li> + <li> + + <s:property value="location.barcode" /> + + <s:if test="batchCode != null"> + (<s:property value="batchCode" />) + </s:if> + + </li> + </s:iterator> </ul>