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

r170 - in trunk: 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 magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com May 21, 2013

May 21, 2013

Author: bleny Date: 2013-05-21 12:28:31 +0200 (Tue, 21 May 2013) New Revision: 170 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: deal with reception of articles without suppliers Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SuppliersToReceive.java Modified: 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/PrepareArticleReceptionAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.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-05-21 09:16:26 UTC (rev 169) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-05-21 10:28:31 UTC (rev 170) @@ -60,7 +60,7 @@ this.serviceContext = serviceContext; } - public List<Supplier> getReceivedSuppliers(Building building) { + public SuppliersToReceive getReceivedSuppliers(Building building) { List<StoredArticle> allReceivedArticles = getReceivedArticles(building, null); @@ -72,8 +72,10 @@ ) ); - return Lists.newArrayList(suppliers); + SuppliersToReceive suppliersToReceive = new SuppliersToReceive(suppliers); + return suppliersToReceive; + } public List<StoredArticle> getReceivedArticles(Building building, String supplierId) { Added: 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 (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SuppliersToReceive.java 2013-05-21 10:28:31 UTC (rev 170) @@ -0,0 +1,39 @@ +package com.franciaflex.magalie.services.service; + +import com.franciaflex.magalie.persistence.entity.Supplier; +import com.google.common.base.Predicates; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; + +import java.util.List; + +public class SuppliersToReceive { + + protected Iterable<Supplier> suppliers; + + protected boolean articlesWithoutSuppliers; + + protected boolean somethingToReceive; + + public SuppliersToReceive(Iterable<Supplier> suppliers) { + + somethingToReceive = ! Iterables.isEmpty(suppliers); + + articlesWithoutSuppliers = Iterables.contains(suppliers, null); + + this.suppliers = Iterables.filter(suppliers, Predicates.notNull()); + + } + + public boolean isSomethingToReceive() { + return somethingToReceive; + } + + public List<Supplier> getSuppliers() { + return Lists.newArrayList(suppliers); + } + + public boolean isArticlesWithoutSuppliers() { + return articlesWithoutSuppliers; + } +} 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-05-21 09:16:26 UTC (rev 169) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-05-21 10:28:31 UTC (rev 170) @@ -39,7 +39,6 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import java.text.ParseException; @@ -80,15 +79,20 @@ } @Test - @Ignore("to be fixed") public void testGetSuppliers() { - List<Supplier> suppliers = service.getReceivedSuppliers(building); + SuppliersToReceive receivedSuppliers = service.getReceivedSuppliers(building); + Assert.assertTrue(receivedSuppliers.isSomethingToReceive()); + + List<Supplier> suppliers = receivedSuppliers.getSuppliers(); + Assert.assertEquals(1, suppliers.size()); Assert.assertEquals(supplier, suppliers.get(0)); + Assert.assertTrue(receivedSuppliers.isArticlesWithoutSuppliers()); + } @Test @@ -176,7 +180,6 @@ } @Test - @Ignore("to be fixed") public void testWeCannotReceiveTheSameItemMultipleTime() throws Exception { testConfirmReception(); @@ -186,9 +189,13 @@ Assert.assertTrue(receivedArticles.isEmpty()); - List<Supplier> receivedSuppliers = service.getReceivedSuppliers(building); + SuppliersToReceive receivedSuppliers = service.getReceivedSuppliers(building); - Assert.assertTrue(receivedSuppliers.isEmpty()); + List<Supplier> suppliers = receivedSuppliers.getSuppliers(); + Assert.assertTrue(receivedSuppliers.isSomethingToReceive()); + + Assert.assertTrue(suppliers.isEmpty()); + } } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java 2013-05-21 09:16:26 UTC (rev 169) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java 2013-05-21 10:28:31 UTC (rev 170) @@ -25,8 +25,8 @@ import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.StoredArticle; -import com.franciaflex.magalie.persistence.entity.Supplier; import com.franciaflex.magalie.services.service.ReceptionService; +import com.franciaflex.magalie.services.service.SuppliersToReceive; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; @@ -40,10 +40,10 @@ protected MagalieSession session; - protected List<Supplier> receivedSuppliers; - protected List<StoredArticle> receivedArticles; + protected SuppliersToReceive suppliersToReceive; + public void setSupplierId(String supplierId) { this.supplierId = supplierId; } @@ -61,16 +61,18 @@ Building building = session.getBuilding(); - receivedSuppliers = service.getReceivedSuppliers(building); + suppliersToReceive = service.getReceivedSuppliers(building); + if ( ! suppliersToReceive.isSomethingToReceive()) { + + addActionMessage("Il n'y a aucun article en attente"); + + } + return INPUT; } - public List<Supplier> getReceivedSuppliers() { - return receivedSuppliers; - } - @Override public String execute() { @@ -78,10 +80,20 @@ receivedArticles = service.getReceivedArticles(building, supplierId); + if (receivedArticles.isEmpty()) { + + addActionMessage("Il n'y a aucun article en attente"); + + } + return SUCCESS; } + public SuppliersToReceive getSuppliersToReceive() { + return suppliersToReceive; + } + public List<StoredArticle> getReceivedArticles() { return receivedArticles; } 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-05-21 09:16:26 UTC (rev 169) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-05-21 10:28:31 UTC (rev 170) @@ -23,22 +23,24 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<ul> - <s:iterator value="receivedSuppliers"> +<s:if test="suppliersToReceive.somethingToReceive"> + <ul> + <s:iterator value="suppliersToReceive.suppliers"> + <li> + <s:url namespace="/" action="prepare-article-reception" id="prepareArticleReceptionUrl"> + <s:param name="supplierId" value="%{id}" /> + </s:url> + <s:a href="%{prepareArticleReceptionUrl}"><s:property value="name" /></s:a> + </li> + </s:iterator> <li> - <s:url namespace="/" action="prepare-article-reception" id="prepareArticleReceptionUrl"> - <s:param name="supplierId" value="%{id}" /> - </s:url> - <s:a href="%{prepareArticleReceptionUrl}"><s:property value="name" /></s:a> + <s:url namespace="/" action="prepare-article-reception" id="prepareArticleReceptionUrl" /> + <s:a href="%{prepareArticleReceptionUrl}"> + Tous les fournisseurs + </s:a> </li> - </s:iterator> - <li> - <s:url namespace="/" action="prepare-article-reception" id="prepareArticleReceptionUrl" /> - <s:a href="%{prepareArticleReceptionUrl}"> - Tous les fournisseurs - </s:a> - </li> -</ul> + </ul> +</s:if> <s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/> <s:a href="%{chooseActivityUrl}" cssClass="btn">Changer d'activité</s:a>

1 0

r169 - trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com May 21, 2013

May 21, 2013

Author: bleny Date: 2013-05-21 11:16:26 +0200 (Tue, 21 May 2013) New Revision: 169 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: ignore some tests Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 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-05-21 09:10:59 UTC (rev 168) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-05-21 09:16:26 UTC (rev 169) @@ -39,6 +39,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import java.text.ParseException; @@ -79,6 +80,7 @@ } @Test + @Ignore("to be fixed") public void testGetSuppliers() { List<Supplier> suppliers = service.getReceivedSuppliers(building); @@ -174,6 +176,7 @@ } @Test + @Ignore("to be fixed") public void testWeCannotReceiveTheSameItemMultipleTime() throws Exception { testConfirmReception();

1 0

r168 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by Bavencoff＠users.forge.codelutin.com May 21, 2013

May 21, 2013

Author: Bavencoff Date: 2013-05-21 11:10:59 +0200 (Tue, 21 May 2013) New Revision: 168 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2431 : code key pressed 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-05-17 16:33:36 UTC (rev 167) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-05-21 09:10:59 UTC (rev 168) @@ -31,6 +31,15 @@ <s:url namespace="/" action="prepare-article-reception!input" id="prepareArticleReceptionUrl"/> <s:url namespace="/" action="logout" id="logoutUrl"/> +<head> +<script> +$(document).keydown(function(event) { +alert('Touche :' + event.which); +}); +</script> + +</head> + <header> <dl class="dl-horizontal"> <dt>Identifiant</dt>

1 0

r167 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/test/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com May 17, 2013

May 17, 2013

Author: bleny Date: 2013-05-17 18:33:36 +0200 (Fri, 17 May 2013) New Revision: 167 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: prevent user to recept a same article multiple times Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Articles.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.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 Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Articles.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Articles.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Articles.java 2013-05-17 16:33:36 UTC (rev 167) @@ -0,0 +1,20 @@ +package com.franciaflex.magalie.persistence; + +import com.franciaflex.magalie.persistence.entity.Article; +import com.franciaflex.magalie.persistence.entity.Supplier; +import com.google.common.base.Function; + +public class Articles { + + protected static class GetSupplierFunction implements Function<Article, Supplier> { + + @Override + public Supplier apply(Article article) { + return article.getSupplier(); + } + } + + public static GetSupplierFunction getSupplierFunction() { + return new GetSupplierFunction(); + } +} Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-05-17 15:42:52 UTC (rev 166) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-05-17 16:33:36 UTC (rev 167) @@ -27,7 +27,9 @@ import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.StoredArticle; +import com.franciaflex.magalie.persistence.entity.Supplier; import com.google.common.base.Function; +import com.google.common.base.Functions; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -142,6 +144,14 @@ return predicate; } + protected static class GetArticleFunction implements Function<StoredArticle, Article> { + + @Override + public Article apply(StoredArticle storedArticle) { + return storedArticle.getArticle(); + } + } + public static Comparator<StoredArticle> articleStoredInLocationsRequiringDriverLicenseFirstComparator() { return new ArticleStoredInLocationsRequiringDriverLicenseFirstComparator(); } @@ -153,4 +163,13 @@ public static Predicate<StoredArticle> notEmpty() { return new NotEmptyPredicate(); } + + public static Function<StoredArticle, Article> getArticleFunction() { + return new GetArticleFunction(); + } + + public static Function<StoredArticle, Supplier> getArticleSupplierFunction() { + return Functions.compose(Articles.getSupplierFunction(), getArticleFunction()); + } + } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java 2013-05-17 15:42:52 UTC (rev 166) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementDao.java 2013-05-17 16:33:36 UTC (rev 167) @@ -24,6 +24,7 @@ */ import com.franciaflex.magalie.persistence.entity.Article; +import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.StorageMovement; import java.util.List; @@ -37,4 +38,5 @@ List<StorageMovement> findAll(); + List<StorageMovement> findAllInReception(Building building); } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementJpaDao.java 2013-05-17 15:42:52 UTC (rev 166) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementJpaDao.java 2013-05-17 16:33:36 UTC (rev 167) @@ -23,8 +23,10 @@ * #L% */ +import com.franciaflex.magalie.persistence.Locations; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; import com.franciaflex.magalie.persistence.entity.Article; +import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.StorageMovement; import javax.persistence.EntityManager; @@ -50,6 +52,18 @@ } @Override + public List<StorageMovement> findAllInReception(Building building) { + Query query = entityManager.createQuery( + " from StorageMovement sm" + + " where sm.originLocation.code = :codeForReceptionLocations and sm.originLocation.warehouse.building = :building" + + " or " + + " sm.destinationLocation.code = :codeForReceptionLocations and sm.destinationLocation.warehouse.building = :building"); + query.setParameter("building", building); + query.setParameter("codeForReceptionLocations", Locations.codeForReceptionLocations()); + return query.getResultList(); + } + + @Override public List<StorageMovement> findAll() { Query query = entityManager.createQuery("from StorageMovement sm order by sm.orderDate"); return query.getResultList(); Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-05-17 15:42:52 UTC (rev 166) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-05-17 16:33:36 UTC (rev 167) @@ -61,7 +61,11 @@ TypedQuery<StoredArticle> query = createQuery("from StoredArticle sa where sa.location.warehouse.building = :building and sa.location.code = :code"); query.setParameter("building", building); query.setParameter("code", Locations.codeForReceptionLocations()); - return findAll(query); + List<StoredArticle> resultList = findAll(query); + for (StoredArticle storedArticle : resultList) { + entityManager.detach(storedArticle); + } + return resultList; } @Override @@ -70,6 +74,10 @@ query.setParameter("building", building); query.setParameter("supplierId", supplierId); query.setParameter("code", Locations.codeForReceptionLocations()); - return findAll(query); + List<StoredArticle> resultList = findAll(query); + for (StoredArticle storedArticle : resultList) { + entityManager.detach(storedArticle); + } + return resultList; } } 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-05-17 15:42:52 UTC (rev 166) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-05-17 16:33:36 UTC (rev 167) @@ -25,11 +25,11 @@ import com.franciaflex.magalie.persistence.Locations; import com.franciaflex.magalie.persistence.MagaliePersistenceContext; +import com.franciaflex.magalie.persistence.StorageMovements; import com.franciaflex.magalie.persistence.StoredArticles; import com.franciaflex.magalie.persistence.dao.LocationDao; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; import com.franciaflex.magalie.persistence.dao.StoredArticleDao; -import com.franciaflex.magalie.persistence.dao.SupplierDao; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.Location; @@ -41,6 +41,8 @@ import com.franciaflex.magalie.services.MagalieServiceContext; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import com.google.common.collect.Multimap; +import com.google.common.collect.Multimaps; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; @@ -60,16 +62,18 @@ public List<Supplier> getReceivedSuppliers(Building building) { - MagaliePersistenceContext persistenceContext = - serviceContext.getPersistenceContext(); + List<StoredArticle> allReceivedArticles = getReceivedArticles(building, null); - SupplierDao supplierDao = persistenceContext.getSupplierDao(); + Iterable<Supplier> suppliers = + Sets.newHashSet( // to prevent multiple occurrence of the same supplier + Iterables.transform( + allReceivedArticles, + StoredArticles.getArticleSupplierFunction() + ) + ); - List<Supplier> suppliers = - supplierDao.findAllWithReceivedArticles(building); + return Lists.newArrayList(suppliers); - return suppliers; - } public List<StoredArticle> getReceivedArticles(Building building, String supplierId) { @@ -77,23 +81,61 @@ MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); - StoredArticleDao dao = + StoredArticleDao storedArticleDao = persistenceContext.getStoredArticleDao(); - List<StoredArticle> receivedArticles; + Iterable<StoredArticle> receivedArticles; if (supplierId == null) { - receivedArticles = dao.findAllReceivedForAllSupplier(building); + receivedArticles = storedArticleDao.findAllReceivedForAllSupplier(building); } else { - receivedArticles = dao.findAllReceivedForSupplier(building, supplierId); + receivedArticles = storedArticleDao.findAllReceivedForSupplier(building, supplierId); } - return receivedArticles; + // remove all items that have already been moved from the reception location + StorageMovementDao storageMovementDao = + persistenceContext.getStorageMovementDao(); + + List<StorageMovement> allStorageMovementsInReception = + storageMovementDao.findAllInReception(building); + + Multimap<Article, StoredArticle> storedArticlesByArticles = + Multimaps.index(receivedArticles, StoredArticles.getArticleFunction()); + + Multimap<Article, StorageMovement> allStorageMovementsInReceptionByArticle = + Multimaps.index(allStorageMovementsInReception, StorageMovements.getArticleFunction()); + + for (Map.Entry<Article, StoredArticle> articleStored : storedArticlesByArticles.entries()) { + + Article article = articleStored.getKey(); + + StoredArticle storedArticle = articleStored.getValue(); + + Location location = storedArticle.getLocation(); + + for (StorageMovement storageMovement : allStorageMovementsInReceptionByArticle.get(article)) { + + if (storageMovement.getOriginLocation().equals(location)) { + + double actualQuantity = storedArticle.getQuantity() - storageMovement.getQuantity(); + + storedArticle.setQuantity(actualQuantity); + + } + + } + + } + + receivedArticles = Iterables.filter(receivedArticles, StoredArticles.notEmpty()); + + return Lists.newArrayList(receivedArticles); + } public ReceptionTask getReceptionTask(String storedArticleId) { 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-05-17 15:42:52 UTC (rev 166) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-05-17 16:33:36 UTC (rev 167) @@ -172,4 +172,20 @@ Assert.assertEquals(1, storageMovements.size()); } + + @Test + public void testWeCannotReceiveTheSameItemMultipleTime() throws Exception { + + testConfirmReception(); + + List<StoredArticle> receivedArticles = + service.getReceivedArticles(building, supplier.getId()); + + Assert.assertTrue(receivedArticles.isEmpty()); + + List<Supplier> receivedSuppliers = service.getReceivedSuppliers(building); + + Assert.assertTrue(receivedSuppliers.isEmpty()); + + } }

1 0

r166 - in trunk/magalie-web/src/main/webapp: WEB-INF/content css js
by Bavencoff＠users.forge.codelutin.com May 17, 2013

May 17, 2013

Author: Bavencoff Date: 2013-05-17 17:42:52 +0200 (Fri, 17 May 2013) New Revision: 166 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2431 : user experience Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-05-17 13:07:37 UTC (rev 165) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-05-17 15:42:52 UTC (rev 166) @@ -51,15 +51,14 @@ <s:hidden name="confirmation" /> <div class="btn-group"> - <s:submit name="reportError" value="Anomalie" cssClass="btn btn-danger btn-small" /> + <input type="button" id="reportError" value="Anomalie" class="btn btn-danger btn-small" /> <s:submit name="next" value="Suivant" cssClass="btn btn-primary btn-small" /> </div> </s:form> <div id="storageMovementTemplate" class="template"> - <dl class="dl-horizontal"> - <dt>Empl.</dt> - <dd><span data="originLocation.warehouse.code"></span> <span data="originLocation.code"></span></dd> - <dt>Prélev.</dt> - <dd><span data="withdrawn">0</span> / <span data="expectedQuantity"></span> <s:property value="storageMovementTask.article.unit" /></dd> - </dl> + <div> + <span data="originLocation.warehouse.code"></span> + <span data="originLocation.code"></span> + <span data="withdrawn">0</span> / <span data="expectedQuantity"></span> <s:property value="storageMovementTask.article.unit" /> + </div> </div> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-05-17 13:07:37 UTC (rev 165) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-05-17 15:42:52 UTC (rev 166) @@ -41,13 +41,13 @@ #storageMovements, #locations { overflow-y: scroll; - height: 150px; + height: 120px; } -#storageMovements dl, +#storageMovements div, #locations dl { margin: 0; - height: 50px; + height: 20px; box-sizing: border-box; color: inherit; } Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-17 13:07:37 UTC (rev 165) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-17 15:42:52 UTC (rev 166) @@ -234,6 +234,8 @@ model.nextLocation(); } + view.refresh(); + } } catch (ex) { @@ -266,7 +268,7 @@ // bindings $(document).ready(function() { $('#withdraw-item').submit(controller.onSubmit); - $('#withdraw-item_reportError').click(controller.onReportError); + $('#reportError').click(controller.onReportError); $('#withdraw-item_next').click(controller.onNext); view.refresh();

1 0

r165 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action
by Bavencoff＠users.forge.codelutin.com May 17, 2013

May 17, 2013

Author: Bavencoff Date: 2013-05-17 15:07:37 +0200 (Fri, 17 May 2013) New Revision: 165 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: disable most number of user Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java 2013-05-17 12:45:51 UTC (rev 164) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java 2013-05-17 13:07:37 UTC (rev 165) @@ -29,7 +29,6 @@ import com.franciaflex.magalie.services.service.MagalieUsersService; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; -import com.google.common.collect.Lists; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; @@ -94,15 +93,7 @@ } public List<MagalieUser> getAllMagalieUsers() { - // TODO brendan 17/05/13 for test only, suppress it ASAP - List<MagalieUser> magalieUsers = Lists.newLinkedList(); - magalieUsers.addAll(allMagalieUsers); - magalieUsers.addAll(allMagalieUsers); - magalieUsers.addAll(allMagalieUsers); - magalieUsers.addAll(allMagalieUsers); - magalieUsers.addAll(allMagalieUsers); - magalieUsers.addAll(allMagalieUsers); - return magalieUsers; + return allMagalieUsers; } public List<Building> getAllBuildings() {

1 0

r164 - trunk/magalie-services/src/test/resources
by bleny＠users.forge.codelutin.com May 17, 2013

May 17, 2013

Author: bleny Date: 2013-05-17 14:45:51 +0200 (Fri, 17 May 2013) New Revision: 164 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add a commented line in log4j tests Modified: trunk/magalie-services/src/test/resources/log4j.properties Modified: trunk/magalie-services/src/test/resources/log4j.properties =================================================================== --- trunk/magalie-services/src/test/resources/log4j.properties 2013-05-17 09:51:28 UTC (rev 163) +++ trunk/magalie-services/src/test/resources/log4j.properties 2013-05-17 12:45:51 UTC (rev 164) @@ -24,7 +24,8 @@ log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d [%p] %c %m%n +log4j.appender.console.layout.ConversionPattern=%d{hh:mm:ss} %5p (%F:%L) %m%n -log4j.logger.com.franciaflex.magalie=TRACE +# log4j.logger.com.franciaflex.magalie=TRACE +# log4j.logger.org.hibernate.tool.hbm2ddl.SchemaExport=FATAL

1 0

r163 - in trunk/magalie-web/src/main/webapp: WEB-INF/content css js
by Bavencoff＠users.forge.codelutin.com May 17, 2013

May 17, 2013

Author: Bavencoff Date: 2013-05-17 11:51:28 +0200 (Fri, 17 May 2013) New Revision: 163 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2431 : user experience Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css trunk/magalie-web/src/main/webapp/js/receive-article-input.js trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-05-17 09:38:46 UTC (rev 162) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-05-17 09:51:28 UTC (rev 163) @@ -24,13 +24,21 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <s:if test="requestedList"> + <head> + <script type="text/javascript"> + $(document).ready(function () { + $("#requestedArticle").focus(); + }); + </script> + </head> + <p> Vous êtes affecté à la liste <s:property value="requestedList.code" /> </p> <s:url namespace="/" action="deliver-requested-article" id="deliverRequestedArticleUrl"> <s:param name="listType" value="%{requestedList.listType}" /> </s:url> - <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block">Demander un article à servir</s:a> + <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="requestedArticle" >Demander un article à servir</s:a> </s:if> <s:else> <s:iterator value="listTypes" var="listType"> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-17 09:38:46 UTC (rev 162) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-17 09:51:28 UTC (rev 163) @@ -33,6 +33,9 @@ height: 320px; overflow: auto; background-color: white; + margin-top: 30px; + margin-left: 5px; + margin-right: 5px; } .dl-horizontal dt, @@ -52,21 +55,5 @@ left: 10px; right: auto; } -} -/* -@media screen and (min-width: 300px) and (min-height: 400px) and (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { - -body { - background-color: grey; } - -#container { - background-color: white; - position: absolute; - left: 20px; - top: 20px; -} - -} -*/ \ No newline at end of file Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-05-17 09:38:46 UTC (rev 162) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-05-17 09:51:28 UTC (rev 163) @@ -154,6 +154,7 @@ this.refreshLocations(); this.refreshForm(); this.refreshButtons(); + $('#receive-article_locationBarcode').focus(); } }; Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-17 09:38:46 UTC (rev 162) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-17 09:51:28 UTC (rev 163) @@ -177,6 +177,7 @@ this.refreshLocations(); this.refreshForm(); this.refreshButtons(); + $('#withdraw-item_locationBarcode').focus(); } };

1 0

r162 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com May 17, 2013

May 17, 2013

Author: bleny Date: 2013-05-17 11:38:46 +0200 (Fri, 17 May 2013) New Revision: 162 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: on login screen make a field with more values to check that CK3X reacts well Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java 2013-05-17 09:11:15 UTC (rev 161) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java 2013-05-17 09:38:46 UTC (rev 162) @@ -29,6 +29,7 @@ import com.franciaflex.magalie.services.service.MagalieUsersService; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; +import com.google.common.collect.Lists; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; @@ -93,7 +94,15 @@ } public List<MagalieUser> getAllMagalieUsers() { - return allMagalieUsers; + // TODO brendan 17/05/13 for test only, suppress it ASAP + List<MagalieUser> magalieUsers = Lists.newLinkedList(); + magalieUsers.addAll(allMagalieUsers); + magalieUsers.addAll(allMagalieUsers); + magalieUsers.addAll(allMagalieUsers); + magalieUsers.addAll(allMagalieUsers); + magalieUsers.addAll(allMagalieUsers); + magalieUsers.addAll(allMagalieUsers); + return magalieUsers; } public List<Building> getAllBuildings() {

1 0

r161 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa 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
by bleny＠users.forge.codelutin.com May 17, 2013

May 17, 2013

Author: bleny Date: 2013-05-17 11:11:15 +0200 (Fri, 17 May 2013) New Revision: 161 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2165 exclude full locations from suggested locations on reception Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-05-17 08:45:28 UTC (rev 160) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-05-17 09:11:15 UTC (rev 161) @@ -23,10 +23,11 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; -import com.franciaflex.magalie.persistence.entity.Location; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import com.google.common.collect.Lists; import java.util.Collection; import java.util.Comparator; @@ -41,6 +42,14 @@ } } + protected static class IsFullLocation implements Predicate<Location> { + + @Override + public boolean apply(Location location) { + return location.isFullLocation(); + } + } + protected static class AccessibleLocationPredicate implements Predicate<Location> { protected MagalieUser magalieUser; @@ -93,4 +102,19 @@ public static Predicate<Location> isNotReceptionLocation() { return Predicates.not(new IsReceptionLocation()); } + + public static Predicate<Location> isNotFullLocation() { + return Predicates.not(new IsFullLocation()); + } + + public static Predicate<Location> isAcceptableForReception() { + Predicate<Location> isAcceptableForReception = + Predicates.and( + Lists.newArrayList( + isNotReceptionLocation(), + isNotFullLocation() + ) + ); + return isAcceptableForReception; + } } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java 2013-05-17 08:45:28 UTC (rev 160) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java 2013-05-17 09:11:15 UTC (rev 161) @@ -58,7 +58,8 @@ " from Location l where" + " l.warehouse.building = :building and " + " l.code != :codeForReceptionLocations and " - + " l.code != :codeForWarehouseWithoutLocations " + + " l.code != :codeForWarehouseWithoutLocations and " + + " l.fullLocation = false " + " order by l.warehouse.building.code, l.warehouse.code, l.code"); query.setParameter("building", building); query.setParameter("codeForReceptionLocations", Locations.codeForReceptionLocations()); 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-05-17 08:45:28 UTC (rev 160) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-05-17 09:11:15 UTC (rev 161) @@ -164,11 +164,12 @@ // fourth step, remove reception locations because it's stupid to // move an article from reception location to another reception location + // also, remove full locations List<Location> result = Lists.newArrayList( Iterables.filter( locations, - Locations.isNotReceptionLocation() + Locations.isAcceptableForReception() ) ); Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-05-17 08:45:28 UTC (rev 160) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-05-17 09:11:15 UTC (rev 161) @@ -260,6 +260,15 @@ requiredAccreditationLevel: 0 requiredCraneMan : false +locationFull1: + &locationFull1 !location + id: locationFull1 + warehouse: *U01 + code: C04 + requiredAccreditationLevel: 0 + requiredCraneMan : false + fullLocation: true + locations: - *location1 - *location2 @@ -281,6 +290,7 @@ - *locationRecU04 - *locationRecSOM - *locationRecB01 + - *locationFull1 supplier1: &supplier1 !supplier 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-05-17 08:45:28 UTC (rev 160) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-05-17 09:11:15 UTC (rev 161) @@ -123,6 +123,10 @@ for (Location location : receptionTask.getLocations()) { + if (log.isDebugEnabled()) { + log.debug("location " + location.getBarcode()); + } + Assert.assertNotEquals( "we should never suggest someone to store something in a reception location", Locations.codeForReceptionLocations(), @@ -133,6 +137,10 @@ Locations.codeForWarehouseWithoutLocations(), location.getCode()); + Assert.assertFalse( + "we should never suggest someone to store something in a full location", + location.isFullLocation()); + } }

1 0