July 2013 - Franciaflex-magalie-commits - mailman.cloud.codelutin.com

r281 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao magalie-services/src/main/java/com/franciaflex/magalie/services/exception magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/main/resources magalie-services/src/test/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 04 Jul '13

04 Jul '13

Author: bleny Date: 2013-07-04 10:10:43 +0200 (Thu, 04 Jul 2013) New Revision: 281 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: some article may not be available by kanban Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/ArticleNotAvailableForKanbanException.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanJpaDao.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanJpaDao.java 2013-07-04 07:48:01 UTC (rev 280) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanJpaDao.java 2013-07-04 08:10:43 UTC (rev 281) @@ -41,6 +41,7 @@ TypedQuery<Kanban> query = entityManager.createQuery("from Kanban k where k.article = :article and k.warehouse = :warehouse", getEntityClass()); query.setParameter("article", article); query.setParameter("warehouse", warehouse); - return query.getSingleResult(); + return findAnyOrNull(query); } + } Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/ArticleNotAvailableForKanbanException.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/ArticleNotAvailableForKanbanException.java (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/ArticleNotAvailableForKanbanException.java 2013-07-04 08:10:43 UTC (rev 281) @@ -0,0 +1,16 @@ +package com.franciaflex.magalie.services.exception; + +import com.franciaflex.magalie.persistence.entity.Article; + +public class ArticleNotAvailableForKanbanException extends MagalieException { + + protected Article article; + + public ArticleNotAvailableForKanbanException(Article article) { + this.article = article; + } + + public Article getArticle() { + return article; + } +} Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-07-04 07:48:01 UTC (rev 280) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-07-04 08:10:43 UTC (rev 281) @@ -36,6 +36,7 @@ import com.franciaflex.magalie.persistence.entity.Warehouse; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; +import com.franciaflex.magalie.services.exception.ArticleNotAvailableForKanbanException; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -65,7 +66,7 @@ } - public double getDefinedQuantity(Article article, Warehouse destinationStore) { + public double getDefinedQuantity(Article article, Warehouse destinationStore) throws ArticleNotAvailableForKanbanException { JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); @@ -74,7 +75,9 @@ Kanban kanban = dao.find(article, destinationStore); - // FIXME brendan 03/07/13 NPE + if (kanban == null) { + throw new ArticleNotAvailableForKanbanException(article); + } double quantityInKanban = kanban.getRequiredQuantity(); Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-07-04 07:48:01 UTC (rev 280) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-07-04 08:10:43 UTC (rev 281) @@ -427,19 +427,12 @@ warehouse: *B01 requiredQuantity: 10 -kanban6: - &kanban6 !kanban - article: *article6 - warehouse: *B01 - requiredQuantity: 9 - kanbans: - *kanban1 - *kanban2 - *kanban3 - *kanban4 - *kanban5 - - *kanban6 storedArticle1: &storedArticle1 !stored-article Added: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java (rev 0) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java 2013-07-04 08:10:43 UTC (rev 281) @@ -0,0 +1,77 @@ +package com.franciaflex.magalie.services.service; + +import com.franciaflex.magalie.persistence.entity.Article; +import com.franciaflex.magalie.persistence.entity.Warehouse; +import com.franciaflex.magalie.services.AbstractMagalieServiceTest; +import com.franciaflex.magalie.services.exception.ArticleNotAvailableForKanbanException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +public class FulfilKanbanServiceTest extends AbstractMagalieServiceTest { + + private static final Log log = LogFactory.getLog(FulfilKanbanServiceTest.class); + + protected FulfilKanbanService service; + + protected Warehouse warehouse; + + @Before + public void setUp() { + + loadFixtures("fixtures"); + + warehouse = fixture("B01"); + + service = newService(FulfilKanbanService.class); + + } + + @Test + public void testGetDefinedQuantity() { + + Article article = fixture("article1"); + + try { + + double definedQuantity = service.getDefinedQuantity(article, warehouse); + + Assert.assertEquals(50., definedQuantity, DELTA); + + } catch (ArticleNotAvailableForKanbanException e) { + + if (log.isErrorEnabled()) { + log.error("unexpected exception", e); + } + + Assert.fail(); + + } + + article = fixture("article6"); + + try { + + double definedQuantity = service.getDefinedQuantity(article, warehouse); + + if (log.isTraceEnabled()) { + log.trace("defined quantity = " + definedQuantity); + } + + Assert.fail("expected exception"); + + } catch (ArticleNotAvailableForKanbanException e) { + + if (log.isTraceEnabled()) { + log.trace("expected exception", e); + } + + Assert.assertEquals(article, e.getArticle()); + + } + + } + +} Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-07-04 07:48:01 UTC (rev 280) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-07-04 08:10:43 UTC (rev 281) @@ -29,6 +29,7 @@ import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; import com.franciaflex.magalie.persistence.entity.Warehouse; +import com.franciaflex.magalie.services.exception.ArticleNotAvailableForKanbanException; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; import com.franciaflex.magalie.services.service.BookArticleResult; import com.franciaflex.magalie.services.service.FulfilKanbanService; @@ -165,8 +166,20 @@ if (quantity == null) { - double quantityDefined = service.getDefinedQuantity(article, destinationWarehouse); + double quantityDefined; + try { + + quantityDefined = service.getDefinedQuantity(article, destinationWarehouse); + + } catch (ArticleNotAvailableForKanbanException e) { + + addFieldError("articleBarcode", "Article non disponible par kanban"); + + return INPUT; + + } + if (quantityDefined > 0) { quantity = quantityDefined;

1 0

r280 - in trunk: magalie-services/src/main/java/com/franciaflex/magalie/services/exception magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/test/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 04 Jul '13

04 Jul '13

Author: bleny Date: 2013-07-04 09:48:01 +0200 (Thu, 04 Jul 2013) New Revision: 280 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: check that prepared article reception is not already stored Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/PreparedArticleReceptionAlreadyStoredException.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/PreparedArticleReceptionAlreadyStoredException.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/PreparedArticleReceptionAlreadyStoredException.java (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/PreparedArticleReceptionAlreadyStoredException.java 2013-07-04 07:48:01 UTC (rev 280) @@ -0,0 +1,17 @@ +package com.franciaflex.magalie.services.exception; + +import com.franciaflex.magalie.persistence.entity.PreparedArticleReception; + +public class PreparedArticleReceptionAlreadyStoredException extends MagalieException { + + protected PreparedArticleReception preparedArticleReception; + + public PreparedArticleReceptionAlreadyStoredException(PreparedArticleReception preparedArticleReception) { + super("prepared article reception is already stored"); + this.preparedArticleReception = preparedArticleReception; + } + + public PreparedArticleReception getPreparedArticleReception() { + return preparedArticleReception; + } +} Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-07-03 12:53:55 UTC (rev 279) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-07-04 07:48:01 UTC (rev 280) @@ -74,6 +74,8 @@ Kanban kanban = dao.find(article, destinationStore); + // FIXME brendan 03/07/13 NPE + double quantityInKanban = kanban.getRequiredQuantity(); return quantityInKanban; Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-07-03 12:53:55 UTC (rev 279) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-07-04 07:48:01 UTC (rev 280) @@ -26,13 +26,18 @@ import com.franciaflex.magalie.persistence.JpaMagaliePersistenceContext; import com.franciaflex.magalie.persistence.dao.ArticleDao; import com.franciaflex.magalie.persistence.dao.LocationDao; +import com.franciaflex.magalie.persistence.dao.PreparedArticleReceptionJpaDao; +import com.franciaflex.magalie.persistence.dao.StoredArticleJpaDao; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.Company; import com.franciaflex.magalie.persistence.entity.Location; +import com.franciaflex.magalie.persistence.entity.PreparedArticleReception; +import com.franciaflex.magalie.persistence.entity.StoredArticle; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; +import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -91,4 +96,35 @@ } + public PreparedArticleReception getPreparedArticleReception(String barcode) + throws InvalidMagalieBarcodeException, PreparedArticleReceptionAlreadyStoredException { + + JpaMagaliePersistenceContext persistenceContext = + serviceContext.getPersistenceContext(); + + PreparedArticleReceptionJpaDao dao = + persistenceContext.getPreparedArticleReceptionDao(); + + PreparedArticleReception preparedArticleReception = + dao.findByBarcode(barcode); + + if (preparedArticleReception == null) { + throw new InvalidMagalieBarcodeException("'" + barcode +"' is not a existing prepared article reception"); + } + + StoredArticleJpaDao storedArticleDao = + persistenceContext.getStoredArticleDao(); + + Article article = preparedArticleReception.getArticle(); + + StoredArticle storedArticle = + storedArticleDao.findInReception(article); + + if (storedArticle == null) { + throw new PreparedArticleReceptionAlreadyStoredException(preparedArticleReception); + } + + return preparedArticleReception; + } + } 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 12:53:55 UTC (rev 279) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-04 07:48:01 UTC (rev 280) @@ -46,6 +46,8 @@ import com.franciaflex.magalie.persistence.entity.Warehouse; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; +import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; +import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableSet; @@ -187,7 +189,7 @@ } - public ReceptionTask getReceptionTaskForPreparedArticleReception(String barcode) { + public ReceptionTask getReceptionTaskForPreparedArticleReception(String barcode) throws PreparedArticleReceptionAlreadyStoredException, InvalidMagalieBarcodeException { PreparedArticleReception preparedArticleReception = getPreparedArticleReception(barcode); @@ -370,16 +372,13 @@ } - public PreparedArticleReception getPreparedArticleReception(String barcode) { + public PreparedArticleReception getPreparedArticleReception(String barcode) throws InvalidMagalieBarcodeException, PreparedArticleReceptionAlreadyStoredException { - JpaMagaliePersistenceContext persistenceContext = - serviceContext.getPersistenceContext(); + MagalieBarcodeService magalieBarcodeService = + serviceContext.newService(MagalieBarcodeService.class); - PreparedArticleReceptionJpaDao dao = - persistenceContext.getPreparedArticleReceptionDao(); - PreparedArticleReception preparedArticleReception = - dao.findByBarcode(barcode); + magalieBarcodeService.getPreparedArticleReception(barcode); return preparedArticleReception; Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-07-03 12:53:55 UTC (rev 279) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-07-04 07:48:01 UTC (rev 280) @@ -36,6 +36,8 @@ import com.franciaflex.magalie.persistence.entity.StoredArticle; import com.franciaflex.magalie.persistence.entity.Supplier; import com.franciaflex.magalie.services.AbstractMagalieServiceTest; +import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; +import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import org.apache.commons.logging.Log; @@ -230,15 +232,41 @@ // we will try to receive a prepared article reception with following barcode String barcode = "PAR2"; - PreparedArticleReception preparedArticleReception = - service.getPreparedArticleReception(barcode); + try { - Assert.assertNotNull(preparedArticleReception); + PreparedArticleReception preparedArticleReception = + service.getPreparedArticleReception(barcode); - ReceptionTask receptionTask = - service.getReceptionTaskForPreparedArticleReception(barcode); + Assert.assertNotNull(preparedArticleReception); + } catch (InvalidMagalieBarcodeException e) { + if (log.isErrorEnabled()) { + log.error("unexpected exception", e); + } + Assert.fail(); + } catch (PreparedArticleReceptionAlreadyStoredException e) { + if (log.isErrorEnabled()) { + log.error("unexpected exception", e); + } + Assert.fail(); + } + ReceptionTask receptionTask = null; + try { + receptionTask = service.getReceptionTaskForPreparedArticleReception(barcode); + } catch (PreparedArticleReceptionAlreadyStoredException e) { + if (log.isErrorEnabled()) { + log.error("unexpected exception", e); + } + Assert.fail(); + } catch (InvalidMagalieBarcodeException e) { + if (log.isErrorEnabled()) { + log.error("unexpected exception", e); + } + Assert.fail(); + } + + // checks that given reception task asks to store quantity given Assert.assertEquals(4., receptionTask.getQuantity(), DELTA); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java 2013-07-03 12:53:55 UTC (rev 279) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java 2013-07-04 07:48:01 UTC (rev 280) @@ -23,7 +23,8 @@ * #L% */ -import com.franciaflex.magalie.persistence.entity.PreparedArticleReception; +import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; +import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; import com.franciaflex.magalie.services.service.ReceptionService; import com.franciaflex.magalie.web.Activity; import com.franciaflex.magalie.web.MagalieActionSupport; @@ -59,11 +60,18 @@ session.setActivity(Activity.PREPARED_RECEPTIONS); - PreparedArticleReception preparedArticleReception = - receptionService.getPreparedArticleReception(barcode); + try { - if (preparedArticleReception == null) { + receptionService.getPreparedArticleReception(barcode); + } catch (PreparedArticleReceptionAlreadyStoredException e) { + + addFieldError("barcode", "Article déjà rangé"); + + return INPUT; + + } catch (InvalidMagalieBarcodeException e) { + addFieldError("barcode", "Ce n'est pas un code-barre valide"); return INPUT; Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-07-03 12:53:55 UTC (rev 279) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-07-04 07:48:01 UTC (rev 280) @@ -25,6 +25,8 @@ import com.franciaflex.magalie.MagalieTechnicalException; import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; +import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; import com.franciaflex.magalie.services.service.ReceptionConfirmation; import com.franciaflex.magalie.services.service.ReceptionService; import com.franciaflex.magalie.services.service.ReceptionTask; @@ -89,8 +91,28 @@ if (preparedArticleReceptionBarcode != null) { - receptionTask = service.getReceptionTaskForPreparedArticleReception(preparedArticleReceptionBarcode); + try { + receptionTask = service.getReceptionTaskForPreparedArticleReception(preparedArticleReceptionBarcode); + + } catch (PreparedArticleReceptionAlreadyStoredException e) { + + session.addMessage("Article déjà rangé"); + + log.warn("should never occur", e); + + return "PREPARED_RECEPTIONS"; + + } catch (InvalidMagalieBarcodeException e) { + + session.addMessage("Le code n'est pas valide"); + + log.warn("should never occur", e); + + return "PREPARED_RECEPTIONS"; + + } + } Preconditions.checkNotNull(receptionTask);

1 0

r279 - trunk/magalie-services/src/main/resources
by bleny＠users.forge.codelutin.com 03 Jul '13

03 Jul '13

Author: bleny Date: 2013-07-03 14:53:55 +0200 (Wed, 03 Jul 2013) New Revision: 279 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: in fixtures, replace 'SANS' by ' SANS' Modified: trunk/magalie-services/src/main/resources/fixtures.yaml Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-07-03 11:14:16 UTC (rev 278) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-07-03 12:53:55 UTC (rev 279) @@ -220,7 +220,7 @@ &location14 !location id: location14 warehouse: *B01 - code: SANS + code: " SANS" requiredAccreditationLevel: 0 requiredCraneMan : false

1 0

r278 - in trunk: magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 03 Jul '13

03 Jul '13

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/revision… 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>

1 0

r277 - in trunk/magalie-web/src/main/webapp: WEB-INF/content css
by bleny＠users.forge.codelutin.com 03 Jul '13

03 Jul '13

Author: bleny Date: 2013-07-03 12:55:35 +0200 (Wed, 03 Jul 2013) New Revision: 277 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: keep on line per item in received suppliers and articles Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-07-03 10:40:40 UTC (rev 276) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-07-03 10:55:35 UTC (rev 277) @@ -34,7 +34,7 @@ </head> <s:if test="suppliersToReceive.somethingToReceive"> - <ul> + <ul id="receivedSuppliers"> <li> <script type="text/javascript"> $(document).ready(function () { 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:40:40 UTC (rev 276) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-07-03 10:55:35 UTC (rev 277) @@ -23,7 +23,7 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<ul> +<ul id="receivedArticles"> <s:iterator value="receivedArticles" status="stat" > <s:set var="receiveArticleId">prepareArticleReceptionId<s:property value="#stat.index" /></s:set> <s:url namespace="/" action="receive-article!input" id="receiveArticleUrl"> @@ -38,21 +38,19 @@ </script> <li> <s:a href="%{receiveArticleUrl}" id="%{receiveArticleId}"> - <s:property value="quantity" /> - <s:property value="article.unit" /> - <s:property value="article.description" /> - (Réf <s:property value="article.code" />) (<s:property value="shortcuts.get(#stat.index)" />) + <s:property value="article.code" /> + Qté : <s:property value="quantity" /> <s:property value="article.unit" /> + <s:property value="article.description" /> </s:a> </li> </s:if> <s:else> <li> <s:a href="%{receiveArticleUrl}"> - <s:property value="quantity" /> - <s:property value="article.unit" /> + <s:property value="article.code" /> + Qté : <s:property value="quantity" /> <s:property value="article.unit" /> <s:property value="article.description" /> - (Réf <s:property value="article.code" />) </s:a> </li> </s:else> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-07-03 10:40:40 UTC (rev 276) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-07-03 10:55:35 UTC (rev 277) @@ -72,4 +72,11 @@ right: auto; } +#receivedArticles, #receivedSuppliers { + margin-left: 5px; + list-style-type: none; + overflow-x: hidden; + white-space: nowrap; } + +}

1 0

r276 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 03 Jul '13

03 Jul '13

Author: bleny Date: 2013-07-03 12:40:40 +0200 (Wed, 03 Jul 2013) New Revision: 276 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: in supplier list put shorcuts add the beginning of the line Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-07-03 10:36:32 UTC (rev 275) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-07-03 10:40:40 UTC (rev 276) @@ -43,7 +43,7 @@ </script> <s:url namespace="/" action="prepare-article-reception" id="prepareArticleReceptionUrl" /> <s:a href="%{prepareArticleReceptionUrl}" id="prepareArticleReceptionLink"> - Tous les fournisseurs (<s:property value="shortcuts.get(0)" />) + (<s:property value="shortcuts.get(0)" />) Tous les fournisseurs </s:a> </li> @@ -61,7 +61,7 @@ }); </script> <s:a href="%{prepareArticleReceptionUrl}" id="%{prepareArticleReceptionId}"> - <s:property value="name" /> (<s:property value="shortcuts.get(#stat.index + 1)" />) + (<s:property value="shortcuts.get(#stat.index + 1)" />) <s:property value="name" /> </s:a> </s:if> <s:else>

1 0

r275 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/test/java/com/franciaflex/magalie magalie-persistence/src/test/java/com/franciaflex/magalie/persistence magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 03 Jul '13

03 Jul '13

Author: bleny Date: 2013-07-03 12:36:32 +0200 (Wed, 03 Jul 2013) New Revision: 275 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: sort suppliers by name Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/ trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SuppliersToReceive.java Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java 2013-07-03 10:36:32 UTC (rev 275) @@ -0,0 +1,24 @@ +package com.franciaflex.magalie.persistence; + +import com.franciaflex.magalie.persistence.entity.Supplier; +import com.google.common.base.Function; +import com.google.common.collect.Ordering; + +import java.util.Comparator; + +public class Suppliers { + + protected static class GetName implements Function<Supplier, String> { + + @Override + public String apply(Supplier supplier) { + return supplier.getName(); + } + } + + public static Comparator<Supplier> orderByNamesComparator() { + Comparator<Supplier> orderByNamesComparator = Ordering.natural().onResultOf(new GetName()); + return orderByNamesComparator; + } + +} Added: trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java =================================================================== --- trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java (rev 0) +++ trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java 2013-07-03 10:36:32 UTC (rev 275) @@ -0,0 +1,42 @@ +package com.franciaflex.magalie.persistence; + +import com.franciaflex.magalie.persistence.entity.Supplier; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Set; + +public class SuppliersTest { + + @Test + public void testOrderByNamesComparator() throws Exception { + + ImmutableList<String> supplierNames = ImmutableList.of("d", "a", "c", "b"); + + Iterable<Supplier> suppliers = + Iterables.transform( + supplierNames, + new Function<String, Supplier>() { + @Override + public Supplier apply(String name) { + Supplier supplier = new Supplier(); + supplier.setName(name); + return supplier; + } + }); + + Set<Supplier> sortedSuppliers = Sets.newTreeSet(Suppliers.orderByNamesComparator()); + + Iterables.addAll(sortedSuppliers, suppliers); + + Assert.assertEquals("a", Iterables.get(sortedSuppliers, 0).getName()); + Assert.assertEquals("b", Iterables.get(sortedSuppliers, 1).getName()); + Assert.assertEquals("c", Iterables.get(sortedSuppliers, 2).getName()); + Assert.assertEquals("d", Iterables.get(sortedSuppliers, 3).getName()); + + } +} Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SuppliersToReceive.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SuppliersToReceive.java 2013-07-03 08:36:10 UTC (rev 274) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SuppliersToReceive.java 2013-07-03 10:36:32 UTC (rev 275) @@ -23,16 +23,19 @@ * #L% */ +import com.franciaflex.magalie.persistence.Suppliers; import com.franciaflex.magalie.persistence.entity.Supplier; import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import java.util.List; +import java.util.Set; public class SuppliersToReceive { - protected Iterable<Supplier> suppliers; + protected List<Supplier> suppliers; protected boolean articlesWithoutSuppliers; @@ -44,8 +47,12 @@ articlesWithoutSuppliers = Iterables.contains(suppliers, null); - this.suppliers = Iterables.filter(suppliers, Predicates.notNull()); + Set<Supplier> sortedSuppliers = Sets.newTreeSet(Suppliers.orderByNamesComparator()); + Iterables.addAll(sortedSuppliers, Iterables.filter(suppliers, Predicates.notNull())); + + this.suppliers = ImmutableList.copyOf(sortedSuppliers); + } public boolean isSomethingToReceive() { @@ -53,7 +60,7 @@ } public List<Supplier> getSuppliers() { - return Lists.newArrayList(suppliers); + return suppliers; } public boolean isArticlesWithoutSuppliers() {

1 0

r274 - trunk
by bleny＠users.forge.codelutin.com 03 Jul '13

03 Jul '13

Author: bleny Date: 2013-07-03 10:36:10 +0200 (Wed, 03 Jul 2013) New Revision: 274 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: use stable version of nuiton-web Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-02 09:58:29 UTC (rev 273) +++ trunk/pom.xml 2013-07-03 08:36:10 UTC (rev 274) @@ -112,7 +112,7 @@  <nuitonJpaVersion>0.1-SNAPSHOT</nuitonJpaVersion> - <nuitonWebVersion>1.14-SNAPSHOT</nuitonWebVersion> + <nuitonWebVersion>1.14</nuitonWebVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.172</h2Version> <struts2Version>2.3.14.2</struts2Version>

1 0

r273 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 02 Jul '13

02 Jul '13

Author: bleny Date: 2013-07-02 11:58:29 +0200 (Tue, 02 Jul 2013) New Revision: 273 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: shorter labels in choose-activity Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-07-01 15:23:37 UTC (rev 272) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-07-02 09:58:29 UTC (rev 273) @@ -50,22 +50,22 @@ </header> <s:url namespace="/" action="fulfil-kanban!input" id="fulfilKanbanUrl"/> -<s:a href="%{fulfilKanbanUrl}" cssClass="btn btn-block" id="fulfilKanbanLink">Traiter kanbans (1)</s:a> +<s:a href="%{fulfilKanbanUrl}" cssClass="btn btn-block" id="fulfilKanbanLink">Kanbans (1)</s:a> <s:url namespace="/" action="deliver-requested-article!input" id="deliverRequestedArticleUrl"/> -<s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="deliverRequestedArticleLink">Traiter listes à servir (2)</s:a> +<s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="deliverRequestedArticleLink">Listes à servir (2)</s:a> <s:url namespace="/" action="prepare-article-reception!input" id="prepareArticleReceptionUrl"/> -<s:a href="%{prepareArticleReceptionUrl}" cssClass="btn btn-block" id="prepareArticleReceptionLink" >Traiter les réceptions fournisseurs (3)</s:a> +<s:a href="%{prepareArticleReceptionUrl}" cssClass="btn btn-block" id="prepareArticleReceptionLink" >Réceptions fournisseurs (3)</s:a> <s:url namespace="/" action="prepare-prepared-article-reception!input" id="preparePreparedArticleReceptionUrl"/> -<s:a href="%{preparePreparedArticleReceptionUrl}" cssClass="btn btn-block" id="preparePreparedArticleReceptionLink" >Traiter les réceptions fournisseurs préparées (4)</s:a> +<s:a href="%{preparePreparedArticleReceptionUrl}" cssClass="btn btn-block" id="preparePreparedArticleReceptionLink" >Rangement toiles (4)</s:a> <s:url namespace="/" action="storage-transfer-location!input" id="storageTransferUrl"/> <s:a href="%{storageTransferUrl}" cssClass="btn btn-block" id="storageTransferLink" >Transfert de stock (5)</s:a> <s:url namespace="/" action="prepare-withdraw-item!input" id="prepareWithdrawItemUrl"/> -<s:a href="%{prepareWithdrawItemUrl}" cssClass="btn btn-block" id="prepareWithdrawItemLink" >Prélèvement immédiat (6)</s:a> +<s:a href="%{prepareWithdrawItemUrl}" cssClass="btn btn-block" id="prepareWithdrawItemLink" >Sorties toiles (6)</s:a> <s:if test="movementOrderResume" > <s:url namespace="/" action="withdraw-item!input" id="movementOrderResumeUrl">

1 0

r272 - trunk/magalie-services/src/main/resources
by bleny＠users.forge.codelutin.com 01 Jul '13

01 Jul '13

Author: bleny Date: 2013-07-01 17:23:37 +0200 (Mon, 01 Jul 2013) New Revision: 272 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: update fixtures according to replace 'REC' by ' REC' Modified: trunk/magalie-services/src/main/resources/fixtures.yaml Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-07-01 15:20:21 UTC (rev 271) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-07-01 15:23:37 UTC (rev 272) @@ -228,7 +228,7 @@ &locationRecU01 !location id: locationRecU01 warehouse: *U01 - code: REC + code: " REC" requiredAccreditationLevel: 0 requiredCraneMan : false @@ -236,7 +236,7 @@ &locationRecU02 !location id: locationRecU02 warehouse: *U02 - code: REC + code: " REC" requiredAccreditationLevel: 0 requiredCraneMan : false @@ -244,7 +244,7 @@ &locationRecU03 !location id: locationRecU03 warehouse: *U03 - code: REC + code: " REC" requiredAccreditationLevel: 0 requiredCraneMan : false @@ -252,7 +252,7 @@ &locationRecU04 !location id: locationRecU04 warehouse: *U04 - code: REC + code: " REC" requiredAccreditationLevel: 0 requiredCraneMan : false @@ -260,7 +260,7 @@ &locationRecSOM !location id: locationRecSOM warehouse: *SOM - code: REC + code: " REC" requiredAccreditationLevel: 0 requiredCraneMan : false @@ -268,7 +268,7 @@ &locationRecB01 !location id: locationRecB01 warehouse: *B01 - code: REC + code: " REC" requiredAccreditationLevel: 0 requiredCraneMan : false

1 0