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

r114 - trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 18 Apr '13

18 Apr '13

Author: bleny Date: 2013-04-18 15:17:39 +0200 (Thu, 18 Apr 2013) New Revision: 114 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: allow to remove user affectation: more logs Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-04-18 13:15:08 UTC (rev 113) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-04-18 13:17:39 UTC (rev 114) @@ -382,18 +382,25 @@ DeliveredRequestedListDao dao = persistenceContext.getDeliveredRequestedListDao(); - DeliveredRequestedList affectedTo = dao.findByAffectedTo(magalieUser); + DeliveredRequestedList deliveredRequestedList = + dao.findByAffectedTo(magalieUser); - if (affectedTo != null && affectedTo.getStatus() == DeliveredRequestedListStatus.AFFECTED) { + if (deliveredRequestedList != null && deliveredRequestedList.getStatus() == DeliveredRequestedListStatus.AFFECTED) { - affectedTo.setAffectedTo(null); + if (log.isInfoEnabled()) { + log.info("user " + magalieUser.getLogin() + + " is no longer affected to list " + + deliveredRequestedList.getRequestedList().getCode()); + } - affectedTo.setStatus(DeliveredRequestedListStatus.PENDING); + deliveredRequestedList.setAffectedTo(null); + deliveredRequestedList.setStatus(DeliveredRequestedListStatus.PENDING); + + persistenceContext.commit(); + } - persistenceContext.commit(); - } }

1 0

r113 - in trunk: magalie-services/src/main/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 18 Apr '13

18 Apr '13

Author: bleny Date: 2013-04-18 15:15:08 +0200 (Thu, 18 Apr 2013) New Revision: 113 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: allow to remove user affectation Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-04-18 12:43:33 UTC (rev 112) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-04-18 13:15:08 UTC (rev 113) @@ -374,4 +374,26 @@ } + public void removeAffectation(MagalieUser magalieUser) { + + MagaliePersistenceContext persistenceContext = + serviceContext.getPersistenceContext(); + + DeliveredRequestedListDao dao = + persistenceContext.getDeliveredRequestedListDao(); + + DeliveredRequestedList affectedTo = dao.findByAffectedTo(magalieUser); + + if (affectedTo != null && affectedTo.getStatus() == DeliveredRequestedListStatus.AFFECTED) { + + affectedTo.setAffectedTo(null); + + affectedTo.setStatus(DeliveredRequestedListStatus.PENDING); + + } + + persistenceContext.commit(); + + } + } Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java (rev 0) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java 2013-04-18 13:15:08 UTC (rev 113) @@ -0,0 +1,38 @@ +package com.franciaflex.magalie.web.action; + +import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.services.service.RequestedArticleService; +import com.franciaflex.magalie.web.MagalieActionSupport; +import com.franciaflex.magalie.web.MagalieSession; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; + +@Results({ + @Result(name="success", type="redirectAction", params = { "actionName", "choose-activity" }) +}) +public class RemoveUserAffectationAction extends MagalieActionSupport { + + protected MagalieSession session; + + protected RequestedArticleService service; + + public void setSession(MagalieSession session) { + this.session = session; + } + + public void setService(RequestedArticleService service) { + this.service = service; + } + + @Override + public String execute() { + + MagalieUser magalieUser = session.getMagalieUser(); + + service.removeAffectation(magalieUser); + + return SUCCESS; + + } + +} 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-04-18 12:43:33 UTC (rev 112) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-04-18 13:15:08 UTC (rev 113) @@ -2,7 +2,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <s:url namespace="/" action="deliver-requested-article" id="deliverRequestedArticleUrl"/> -<s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/> +<s:url namespace="/" action="remove-user-affectation" id="removeUserAffectationUrl"/> <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block">Demander un article à servir</s:a> -<s:a href="%{chooseActivityUrl}" cssClass="btn btn-block">Changer d'activité</s:a> +<s:a href="%{removeUserAffectationUrl}" cssClass="btn btn-block">Changer d'activité</s:a>

1 0

r112 - 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-persistence/src/main/java/com/franciaflex/magalie/persistence/entity 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 18 Apr '13

18 Apr '13

Author: bleny Date: 2013-04-18 14:43:33 +0200 (Thu, 18 Apr 2013) New Revision: 112 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add hook for when a requestedlist is completed Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/DeliveredRequestedArticles.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedArticleJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationErrorJpaDao.java 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/MagalieUserJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedArticle.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/DeliveredRequestedArticles.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/DeliveredRequestedArticles.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/DeliveredRequestedArticles.java 2013-04-18 12:43:33 UTC (rev 112) @@ -0,0 +1,19 @@ +package com.franciaflex.magalie.persistence; + +import com.franciaflex.magalie.persistence.entity.DeliveredRequestedArticle; +import com.google.common.base.Predicate; + +public class DeliveredRequestedArticles { + + public static Predicate<DeliveredRequestedArticle> isConfirmedPredicate() { + return new ConfirmedPredicate(); + } + + private static class ConfirmedPredicate implements Predicate<DeliveredRequestedArticle> { + + @Override + public boolean apply(DeliveredRequestedArticle deliveredRequestedArticle) { + return deliveredRequestedArticle.isConfirmed(); + } + } +} Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleDao.java 2013-04-18 12:42:00 UTC (rev 111) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/DeliveredRequestedArticleDao.java 2013-04-18 12:43:33 UTC (rev 112) @@ -1,10 +1,18 @@ package com.franciaflex.magalie.persistence.dao; import com.franciaflex.magalie.persistence.entity.DeliveredRequestedArticle; +import com.franciaflex.magalie.persistence.entity.RequestedList; +import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; +import java.util.List; + /** * @author bleny */ public interface DeliveredRequestedArticleDao extends Dao<DeliveredRequestedArticle> { + DeliveredRequestedArticle find(StorageMovementOrder storageMovementOrder); + + List<DeliveredRequestedArticle> findAll(RequestedList requestedList); + } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java 2013-04-18 12:42:00 UTC (rev 111) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java 2013-04-18 12:43:33 UTC (rev 112) @@ -3,6 +3,7 @@ import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.RequestedArticle; +import com.franciaflex.magalie.persistence.entity.RequestedList; import java.util.List; @@ -13,4 +14,6 @@ List<RequestedArticle> findAllUndelivered(Building building, MagalieUser affectedTo); + List<RequestedArticle> findAll(RequestedList requestedList); + } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java 2013-04-18 12:42:00 UTC (rev 111) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java 2013-04-18 12:43:33 UTC (rev 112) @@ -2,6 +2,7 @@ import com.franciaflex.magalie.persistence.dao.Dao; import com.franciaflex.magalie.persistence.entity.AbstractEntity; +import com.google.common.collect.Iterables; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; @@ -51,4 +52,22 @@ return entityManager.contains(entity); } + protected TypedQuery<E> createQuery(String hql) { + TypedQuery<E> query = entityManager.createQuery(hql, getEntityClass()); + return query; + } + + protected List<E> findAll(TypedQuery<E> query) { + return query.getResultList(); + } + + protected E findUnique(TypedQuery<E> query) { + return query.getSingleResult(); + } + + protected E findUniqueOrNull(TypedQuery<E> query) { + List<E> all = findAll(query); + E onlyElement = Iterables.getOnlyElement(all, null); + return onlyElement; + } } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedArticleJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedArticleJpaDao.java 2013-04-18 12:42:00 UTC (rev 111) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/DeliveredRequestedArticleJpaDao.java 2013-04-18 12:43:33 UTC (rev 112) @@ -2,8 +2,12 @@ import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleDao; import com.franciaflex.magalie.persistence.entity.DeliveredRequestedArticle; +import com.franciaflex.magalie.persistence.entity.RequestedList; +import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; +import java.util.List; public class DeliveredRequestedArticleJpaDao extends AbstractJpaDao<DeliveredRequestedArticle> implements DeliveredRequestedArticleDao { @@ -16,4 +20,21 @@ return DeliveredRequestedArticle.class; } + @Override + public DeliveredRequestedArticle find(StorageMovementOrder storageMovementOrder) { + TypedQuery<DeliveredRequestedArticle> query = + entityManager.createQuery( + "from DeliveredRequestedArticle dra where dra.storageMovementOrder = :storageMovementOrder", getEntityClass()); + query.setParameter("storageMovementOrder", storageMovementOrder); + return findUniqueOrNull(query); + } + + @Override + public List<DeliveredRequestedArticle> findAll(RequestedList requestedList) { + TypedQuery<DeliveredRequestedArticle> query = + entityManager.createQuery( + "from DeliveredRequestedArticle dra where dra.requestedArticle.requestedList = :requestedList", getEntityClass()); + query.setParameter("requestedList", requestedList); + return findAll(query); + } } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationErrorJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationErrorJpaDao.java 2013-04-18 12:42:00 UTC (rev 111) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationErrorJpaDao.java 2013-04-18 12:43:33 UTC (rev 112) @@ -3,10 +3,10 @@ import com.franciaflex.magalie.persistence.dao.LocationErrorDao; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.LocationError; -import com.google.common.collect.Iterables; import javax.persistence.EntityManager; import javax.persistence.Query; +import javax.persistence.TypedQuery; import java.util.List; public class LocationErrorJpaDao extends AbstractJpaDao<LocationError> implements LocationErrorDao { @@ -22,13 +22,9 @@ @Override public LocationError findByLocation(Location location) { - Query query = entityManager.createQuery("from LocationError se where se.location = :location"); + TypedQuery<LocationError> query = createQuery("from LocationError se where se.location = :location"); query.setParameter("location", location); - LocationError locationError = (LocationError) - Iterables.getOnlyElement( - query.getResultList(), - null); - return locationError; + return findUniqueOrNull(query); } @Override 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-04-18 12:42:00 UTC (rev 111) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java 2013-04-18 12:43:33 UTC (rev 112) @@ -20,10 +20,9 @@ @Override public Location find(String code, Warehouse warehouse) { - TypedQuery<Location> query = entityManager.createQuery("from Location l where l.code = :code and l.warehouse = :warehouse", getEntityClass()); + TypedQuery<Location> query = createQuery("from Location l where l.code = :code and l.warehouse = :warehouse"); query.setParameter("code", code); query.setParameter("warehouse", warehouse); - Location singleResult = query.getSingleResult(); - return singleResult; + return findUnique(query); } } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/MagalieUserJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/MagalieUserJpaDao.java 2013-04-18 12:42:00 UTC (rev 111) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/MagalieUserJpaDao.java 2013-04-18 12:43:33 UTC (rev 112) @@ -2,10 +2,10 @@ import com.franciaflex.magalie.persistence.dao.MagalieUserDao; import com.franciaflex.magalie.persistence.entity.MagalieUser; -import com.google.common.collect.Iterables; import javax.persistence.EntityManager; import javax.persistence.Query; +import javax.persistence.TypedQuery; import java.util.List; public class MagalieUserJpaDao extends AbstractJpaDao<MagalieUser> implements MagalieUserDao { @@ -21,11 +21,9 @@ @Override public MagalieUser findByLogin(String login) { - Query query = entityManager.createQuery("from MagalieUser mu where mu.login = :login"); + TypedQuery<MagalieUser> query = createQuery("from MagalieUser mu where mu.login = :login"); query.setParameter("login", login); - List<MagalieUser> resultList = query.getResultList(); - MagalieUser onlyElement = Iterables.getOnlyElement(resultList, null); - return onlyElement; + return findUnique(query); } @Override Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java 2013-04-18 12:42:00 UTC (rev 111) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java 2013-04-18 12:43:33 UTC (rev 112) @@ -5,6 +5,7 @@ import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.RequestedArticle; +import com.franciaflex.magalie.persistence.entity.RequestedList; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; @@ -23,19 +24,23 @@ @Override public List<RequestedArticle> findAllUndelivered(Building building, MagalieUser affectedTo) { - TypedQuery<RequestedArticle> query = - entityManager.createQuery( + TypedQuery<RequestedArticle> query = createQuery( "from RequestedArticle ra where " + " ra not in (select dra.requestedArticle from DeliveredRequestedArticle dra) " + " and ra.requestedList.building = :building " - + " and ra.requestedList not in (select drl.requestedList from DeliveredRequestedList drl where drl.status = :complete or drl.status = :affected and drl.affectedTo != :affectedTo)", - getEntityClass() - ); + + " and ra.requestedList not in (select drl.requestedList from DeliveredRequestedList drl where drl.status = :complete or drl.status = :affected and drl.affectedTo != :affectedTo)"); query.setParameter("building", building); query.setParameter("complete", DeliveredRequestedListStatus.COMPLETE); query.setParameter("affected", DeliveredRequestedListStatus.AFFECTED); query.setParameter("affectedTo", affectedTo); - return query.getResultList(); + return findAll(query); } + @Override + public List<RequestedArticle> findAll(RequestedList requestedList) { + TypedQuery<RequestedArticle> query = createQuery("from RequestedArticle ra where ra.requestedList = :requestedList"); + query.setParameter("requestedList", requestedList); + return findAll(query); + } + } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedArticle.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedArticle.java 2013-04-18 12:42:00 UTC (rev 111) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedArticle.java 2013-04-18 12:43:33 UTC (rev 112) @@ -38,4 +38,8 @@ public void setRequestedArticle(RequestedArticle requestedArticle) { this.requestedArticle = requestedArticle; } + + public boolean isConfirmed() { + return getStorageMovementOrder().isConfirmed(); + } } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-04-18 12:42:00 UTC (rev 111) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-04-18 12:43:33 UTC (rev 112) @@ -143,4 +143,12 @@ Location onlyElement = Iterables.getOnlyElement(getDestinationLocations()); return onlyElement; } + + public boolean isConfirmed() { + boolean isConfirmed = Iterables.all( + getStorageMovements(), + StorageMovements.storageMovementIsConfirmed()); + return isConfirmed; + } + } 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-04-18 12:42:00 UTC (rev 111) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-04-18 12:43:33 UTC (rev 112) @@ -23,6 +23,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -140,7 +141,7 @@ bookArticleResult.setAvailableQuantity(quantity); - if (storageMovementOrder.getStorageMovements().isEmpty()) { + if (CollectionUtils.isEmpty(storageMovementOrder.getStorageMovements())) { storageMovementOrder = null; @@ -370,6 +371,11 @@ storageMovementOrderDao.merge(storageMovementOrder); + RequestedArticleService requestedArticleService = + serviceContext.newService(RequestedArticleService.class); + + requestedArticleService.onStorageMovementConfirmation(storageMovementOrder); + persistenceContext.commit(); } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-04-18 12:42:00 UTC (rev 111) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-04-18 12:43:33 UTC (rev 112) @@ -23,6 +23,7 @@ * #L% */ +import com.franciaflex.magalie.persistence.DeliveredRequestedArticles; import com.franciaflex.magalie.persistence.MagaliePersistenceContext; import com.franciaflex.magalie.persistence.RequestedArticles; import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleDao; @@ -41,6 +42,7 @@ import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; import com.google.common.base.Preconditions; +import com.google.common.collect.Iterables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -317,4 +319,59 @@ return all; } + + public void onStorageMovementConfirmation(StorageMovementOrder storageMovementOrder) { + + MagaliePersistenceContext persistenceContext = + serviceContext.getPersistenceContext(); + + DeliveredRequestedArticleDao deliveredRequestedArticleDao = + persistenceContext.getDeliveredRequestedArticleDao(); + + DeliveredRequestedArticle deliveredRequestedArticle = + deliveredRequestedArticleDao.find(storageMovementOrder); + + if (deliveredRequestedArticle != null) { + + // a order is confirmed and this order is about a requested article + // so we may update the status of the list + + RequestedList requestedList = + deliveredRequestedArticle.getRequestedArticle().getRequestedList(); + + RequestedArticleDao requestedArticleDao = + persistenceContext.getRequestedArticleDao(); + + List<RequestedArticle> requestedArticles = + requestedArticleDao.findAll(requestedList); + + List<DeliveredRequestedArticle> deliveredRequestedArticles = + deliveredRequestedArticleDao.findAll(requestedList); + + boolean allIsConfirmed = deliveredRequestedArticles.size() == requestedArticles.size() + && Iterables.all( + deliveredRequestedArticles, + DeliveredRequestedArticles.isConfirmedPredicate()); + + if (allIsConfirmed) { + + if (log.isInfoEnabled()) { + log.info("all requested articles have confirmed order, marking list " + + requestedList.getCode() + " as complete"); + } + + DeliveredRequestedListDao deliveredRequestedListDao = + persistenceContext.getDeliveredRequestedListDao(); + + DeliveredRequestedList deliveredRequestedList = + deliveredRequestedListDao.findByRequestedList(requestedList); + + deliveredRequestedList.setStatus(DeliveredRequestedListStatus.COMPLETE); + + } + + } + + } + } Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-04-18 12:42:00 UTC (rev 111) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-04-18 12:43:33 UTC (rev 112) @@ -13,6 +13,7 @@ import java.text.ParseException; import java.util.Date; +import java.util.LinkedList; import java.util.List; import java.util.Queue; @@ -101,4 +102,52 @@ } + @Test + public void testFindOrderRequestedArticlesForUnavailableArticle() { + + RequestedArticle requestedArticle4 = fixture("requestedArticle4"); + + LinkedList<RequestedArticle> fakePriorityQueue = + Lists.newLinkedList(); + + fakePriorityQueue.add(requestedArticle4); + + FindOrderToExecuteResult orderToExecute = + service.findOrderToExecute(fakePriorityQueue, magalieUser, building); + + Assert.assertFalse(orderToExecute.isNothingToDo()); + Assert.assertTrue(orderToExecute.isEverythingUnavailable()); + Assert.assertFalse(orderToExecute.isDriverLicenseRequired()); + Assert.assertFalse(orderToExecute.isSuccess()); + + Assert.assertNull(orderToExecute.getOldAffectation()); + Assert.assertNull(orderToExecute.getNewAffectation()); + + } + + @Test + public void testFindOrderRequestedArticlesNotAvailable() { + + // it is not available in expected quantity because spreading in different buildings + + RequestedArticle requestedArticle1 = fixture("requestedArticle1"); + + LinkedList<RequestedArticle> fakePriorityQueue = + Lists.newLinkedList(); + + fakePriorityQueue.add(requestedArticle1); + + FindOrderToExecuteResult orderToExecute = + service.findOrderToExecute(fakePriorityQueue, magalieUser, building); + + Assert.assertFalse(orderToExecute.isNothingToDo()); + Assert.assertTrue(orderToExecute.isEverythingUnavailable()); + Assert.assertFalse(orderToExecute.isDriverLicenseRequired()); + Assert.assertFalse(orderToExecute.isSuccess()); + + Assert.assertNull(orderToExecute.getOldAffectation()); + Assert.assertNull(orderToExecute.getNewAffectation()); + + } + }

1 0

r111 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 18 Apr '13

18 Apr '13

Author: bleny Date: 2013-04-18 14:42:00 +0200 (Thu, 18 Apr 2013) New Revision: 111 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove test code Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-04-17 15:02:48 UTC (rev 110) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-04-18 12:42:00 UTC (rev 111) @@ -49,8 +49,6 @@ String result; - addActionMessage("test"); - if (findOrderToExecuteResult.isSuccess()) { DeliveredRequestedList oldAffectation = findOrderToExecuteResult.getOldAffectation();

1 0

r110 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity
by bleny＠users.forge.codelutin.com 17 Apr '13

17 Apr '13

Author: bleny Date: 2013-04-17 17:02:48 +0200 (Wed, 17 Apr 2013) New Revision: 110 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: use name instead of ordinal Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java 2013-04-17 14:38:24 UTC (rev 109) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java 2013-04-17 15:02:48 UTC (rev 110) @@ -2,6 +2,8 @@ import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.OneToOne; @@ -19,6 +21,7 @@ @OneToOne protected MagalieUser affectedTo; + @Enumerated(value = EnumType.STRING) protected DeliveredRequestedListStatus status; @Override

1 0

r109 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 17 Apr '13

17 Apr '13

Author: bleny Date: 2013-04-17 16:38:24 +0200 (Wed, 17 Apr 2013) New Revision: 109 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: allow change activity when fulfilling kanban Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-04-17 14:17:44 UTC (rev 108) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-04-17 14:38:24 UTC (rev 109) @@ -5,6 +5,8 @@ <title>Traitement des kanbans</title> </head> +<s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/> + <s:form> <s:textfield key="articleBarcode" label="Article" inputAppendIcon="barcode" cssClass="input-medium" /> @@ -21,6 +23,7 @@ </s:if> <div class="btn-group"> + <s:a href="%{chooseActivityUrl}" cssClass="btn">Changer d'activité</s:a> <s:submit name="next" value="Suivant" cssClass="btn btn-primary" /> </div> </s:form> \ No newline at end of file

1 0

r108 - trunk/magalie-services/src/main/resources
by bleny＠users.forge.codelutin.com 17 Apr '13

17 Apr '13

Author: bleny Date: 2013-04-17 16:17:44 +0200 (Wed, 17 Apr 2013) New Revision: 108 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: update fixtures, set fixedLocationsFirst=true on 2 articles 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-04-17 14:06:20 UTC (rev 107) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-04-17 14:17:44 UTC (rev 108) @@ -213,7 +213,7 @@ code: 4034108 unit: M description: Jonc Souple D5 - fixedLocationsFirst: false + fixedLocationsFirst: true article2: &article2 !article @@ -233,7 +233,7 @@ code: 4092459 unit: PCE description: Interface ASA/SOMFY + clip - fixedLocationsFirst: false + fixedLocationsFirst: true article4: &article4 !article

1 0

r107 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity
by bleny＠users.forge.codelutin.com 17 Apr '13

17 Apr '13

Author: bleny Date: 2013-04-17 16:06:20 +0200 (Wed, 17 Apr 2013) New Revision: 107 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add occupied attribute in location Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-04-17 14:02:00 UTC (rev 106) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-04-17 14:06:20 UTC (rev 107) @@ -17,6 +17,8 @@ protected int requiredAccreditationLevel; + protected boolean occupied; + @Override public String getId() { return id; @@ -59,4 +61,11 @@ return requiredAccreditationLevel == 9; } + public boolean isOccupied() { + return occupied; + } + + public void setOccupied(boolean occupied) { + this.occupied = occupied; + } }

1 0

r106 - 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-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/main/java/com/franciaflex/magalie/services magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/main/reso
by bleny＠users.forge.codelutin.com 17 Apr '13

17 Apr '13

Author: bleny Date: 2013-04-17 16:02:00 +0200 (Wed, 17 Apr 2013) New Revision: 106 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: can change quantity in kanban for each warehouse Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/KanbanJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-services/src/main/resources/fixtures2.yaml Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-04-17 13:27:17 UTC (rev 105) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-04-17 14:02:00 UTC (rev 106) @@ -4,6 +4,7 @@ import com.franciaflex.magalie.persistence.dao.BuildingDao; import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleDao; import com.franciaflex.magalie.persistence.dao.DeliveredRequestedListDao; +import com.franciaflex.magalie.persistence.dao.KanbanDao; import com.franciaflex.magalie.persistence.dao.MagalieUserDao; import com.franciaflex.magalie.persistence.dao.RequestedArticleDao; import com.franciaflex.magalie.persistence.dao.LocationDao; @@ -17,6 +18,7 @@ import com.franciaflex.magalie.persistence.dao.jpa.BuildingJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.DeliveredRequestedArticleJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.DeliveredRequestedListJpaDao; +import com.franciaflex.magalie.persistence.dao.jpa.KanbanJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.LocationErrorJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.LocationJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.MagalieUserJpaDao; @@ -129,4 +131,9 @@ public DeliveredRequestedListDao getDeliveredRequestedListDao() { return new DeliveredRequestedListJpaDao(entityManager); } + + @Override + public KanbanDao getKanbanDao() { + return new KanbanJpaDao(entityManager); + } } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java 2013-04-17 13:27:17 UTC (rev 105) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java 2013-04-17 14:02:00 UTC (rev 106) @@ -4,6 +4,7 @@ import com.franciaflex.magalie.persistence.dao.BuildingDao; import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleDao; import com.franciaflex.magalie.persistence.dao.DeliveredRequestedListDao; +import com.franciaflex.magalie.persistence.dao.KanbanDao; import com.franciaflex.magalie.persistence.dao.LocationDao; import com.franciaflex.magalie.persistence.dao.LocationErrorDao; import com.franciaflex.magalie.persistence.dao.MagalieUserDao; @@ -51,4 +52,6 @@ DeliveredRequestedListDao getDeliveredRequestedListDao(); + KanbanDao getKanbanDao(); + } Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanDao.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/KanbanDao.java 2013-04-17 14:02:00 UTC (rev 106) @@ -0,0 +1,14 @@ +package com.franciaflex.magalie.persistence.dao; + +import com.franciaflex.magalie.persistence.entity.Article; +import com.franciaflex.magalie.persistence.entity.Kanban; +import com.franciaflex.magalie.persistence.entity.Warehouse; + +/** + * @author bleny + */ +public interface KanbanDao extends Dao<Kanban> { + + public Kanban find(Article article, Warehouse warehouse); + +} Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/KanbanJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/KanbanJpaDao.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/KanbanJpaDao.java 2013-04-17 14:02:00 UTC (rev 106) @@ -0,0 +1,29 @@ +package com.franciaflex.magalie.persistence.dao.jpa; + +import com.franciaflex.magalie.persistence.dao.KanbanDao; +import com.franciaflex.magalie.persistence.entity.Article; +import com.franciaflex.magalie.persistence.entity.Kanban; +import com.franciaflex.magalie.persistence.entity.Warehouse; + +import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; + +public class KanbanJpaDao extends AbstractJpaDao<Kanban> implements KanbanDao { + + public KanbanJpaDao(EntityManager entityManager) { + super(entityManager); + } + + @Override + protected Class<Kanban> getEntityClass() { + return Kanban.class; + } + + @Override + public Kanban find(Article article, Warehouse warehouse) { + 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(); + } +} Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-04-17 13:27:17 UTC (rev 105) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-04-17 14:02:00 UTC (rev 106) @@ -22,8 +22,6 @@ protected String code; - protected double quantityInKanban; - protected String unit; protected boolean fixedLocationsFirst; @@ -53,14 +51,6 @@ this.code = code; } - public double getQuantityInKanban() { - return quantityInKanban; - } - - public void setQuantityInKanban(double quantityInKanban) { - this.quantityInKanban = quantityInKanban; - } - public String getUnit() { return unit; } Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Kanban.java 2013-04-17 14:02:00 UTC (rev 106) @@ -0,0 +1,55 @@ +package com.franciaflex.magalie.persistence.entity; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; + +@Entity +public class Kanban extends AbstractEntity { + + @Id + @GeneratedValue + protected String id; + + @ManyToOne + protected Article article; + + @ManyToOne + protected Warehouse warehouse; + + protected double requiredQuantity; + + @Override + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Article getArticle() { + return article; + } + + public void setArticle(Article article) { + this.article = article; + } + + public Warehouse getWarehouse() { + return warehouse; + } + + public void setWarehouse(Warehouse warehouse) { + this.warehouse = warehouse; + } + + public double getRequiredQuantity() { + return requiredQuantity; + } + + public void setRequiredQuantity(double requiredQuantity) { + this.requiredQuantity = requiredQuantity; + } +} Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-04-17 13:27:17 UTC (rev 105) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-04-17 14:02:00 UTC (rev 106) @@ -5,6 +5,7 @@ import com.franciaflex.magalie.MagalieTechnicalException; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; +import com.franciaflex.magalie.persistence.entity.Kanban; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.RequestedArticle; import com.franciaflex.magalie.persistence.entity.Location; @@ -35,6 +36,7 @@ reader.getConfig().setClassTag("building", Building.class); reader.getConfig().setClassTag("warehouse", Warehouse.class); reader.getConfig().setClassTag("article", Article.class); + reader.getConfig().setClassTag("kanban", Kanban.class); reader.getConfig().setClassTag("stored-article", StoredArticle.class); reader.getConfig().setClassTag("user", MagalieUser.class); reader.getConfig().setClassTag("requested-article", RequestedArticle.class); Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-17 13:27:17 UTC (rev 105) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-04-17 14:02:00 UTC (rev 106) @@ -3,6 +3,7 @@ import com.franciaflex.magalie.persistence.MagaliePersistenceContext; import com.franciaflex.magalie.persistence.dao.ArticleDao; import com.franciaflex.magalie.persistence.dao.BuildingDao; +import com.franciaflex.magalie.persistence.dao.KanbanDao; import com.franciaflex.magalie.persistence.dao.LocationDao; import com.franciaflex.magalie.persistence.dao.MagalieUserDao; import com.franciaflex.magalie.persistence.dao.RequestedArticleDao; @@ -11,6 +12,7 @@ import com.franciaflex.magalie.persistence.dao.WarehouseDao; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; +import com.franciaflex.magalie.persistence.entity.Kanban; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.RequestedArticle; @@ -133,6 +135,16 @@ } + KanbanDao kanbanDao = persistenceContext.getKanbanDao(); + + Collection<Kanban> kanbans = fixtures.fixture("kanbans"); + + for (Kanban kanban : kanbans) { + + kanbanDao.persist(kanban); + + } + persistenceContext.commit(); StoredArticleDao storedArticleDao = persistenceContext.getStoredArticleDao(); 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-04-17 13:27:17 UTC (rev 105) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-04-17 14:02:00 UTC (rev 106) @@ -2,17 +2,18 @@ import com.franciaflex.magalie.persistence.Locations; import com.franciaflex.magalie.persistence.MagaliePersistenceContext; +import com.franciaflex.magalie.persistence.dao.KanbanDao; import com.franciaflex.magalie.persistence.dao.LocationDao; import com.franciaflex.magalie.persistence.dao.WarehouseDao; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; +import com.franciaflex.magalie.persistence.entity.Kanban; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; 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.google.common.base.Preconditions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -41,32 +42,19 @@ } - public double getDefinedQuantity( - Article article, - Warehouse destinationStore) { + public double getDefinedQuantity(Article article, Warehouse destinationStore) { - double quantityInKanban = article.getQuantityInKanban(); + MagaliePersistenceContext persistenceContext = + serviceContext.getPersistenceContext(); - // TODO brendan 17/04/13 consider destination store + KanbanDao dao = persistenceContext.getKanbanDao(); - return quantityInKanban; + Kanban kanban = dao.find(article, destinationStore); - } + double quantityInKanban = kanban.getRequiredQuantity(); - public BookArticleResult fulfilKanbanTask( - Article article, - MagalieUser magalieUser, - Warehouse destinationStore) { + return quantityInKanban; - MagalieBarcodeService magalieBarcodeService = - serviceContext.newService(MagalieBarcodeService.class); - - double quantityInKanban = article.getQuantityInKanban(); - - Preconditions.checkArgument(quantityInKanban > 0); - - return fulfilKanbanTask(article, magalieUser, destinationStore, quantityInKanban); - } public BookArticleResult fulfilKanbanTask( Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-04-17 13:27:17 UTC (rev 105) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-04-17 14:02:00 UTC (rev 106) @@ -211,7 +211,6 @@ - *location4 - *location8 code: 4034108 - quantityInKanban: 50 unit: M description: Jonc Souple D5 fixedLocationsFirst: false @@ -222,7 +221,6 @@ fixedLocations: - *location11 code: 4033079 - quantityInKanban: 3 unit: PCE description: Moteur Oréa Slt 50 RTS 50/12 fixedLocationsFirst: false @@ -233,7 +231,6 @@ fixedLocations: - *location1 code: 4092459 - quantityInKanban: 50 unit: PCE description: Interface ASA/SOMFY + clip fixedLocationsFirst: false @@ -242,7 +239,6 @@ &article4 !article id: article4 code: 4019450 - quantityInKanban: 20 unit: PCE description: Kit Tr.PM Fixe 122G D40Plat 10 fixedLocationsFirst: false @@ -253,7 +249,6 @@ fixedLocations: - *location5 code: 4020012 - quantityInKanban: 10 unit: B60 description: Caisson 2005 3F 6000 Brun fixedLocationsFirst: false @@ -264,7 +259,6 @@ fixedLocations: - *location3 code: 1421812 - quantityInKanban: 9 unit: PCE description: Ensemble SOLIRIS UNO fixedLocationsFirst: false @@ -277,6 +271,50 @@ - *article5 - *article6 +kanban1: + &kanban1 !kanban + article: *article1 + warehouse: *B01 + requiredQuantity: 50 + +kanban2: + &kanban2 !kanban + article: *article2 + warehouse: *B01 + requiredQuantity: 3 + +kanban3: + &kanban3 !kanban + article: *article3 + warehouse: *B01 + requiredQuantity: 50 + +kanban4: + &kanban4 !kanban + article: *article4 + warehouse: *B01 + requiredQuantity: 20 + +kanban5: + &kanban5 !kanban + article: *article5 + warehouse: *B01 + requiredQuantity: 10 + +kanban6: + &kanban6 !kanban + article: *article6 + warehouse: *B01 + requiredQuantity: 9 + +kanbans: + - *kanban1 + - *kanban2 + - *kanban3 + - *kanban4 + - *kanban5 + - *kanban6 + storedArticle1: &storedArticle1 !stored-article id: storedArticle1 Modified: trunk/magalie-services/src/main/resources/fixtures2.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-04-17 13:27:17 UTC (rev 105) +++ trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-04-17 14:02:00 UTC (rev 106) @@ -70,12 +70,19 @@ code: SOM building: *B1 +B01: + &B01 !warehouse + id: warehouse_b01 + code: B01 + building: *B1 + warehouses: - *U01 - *U02 - *U03 - *U04 - *SOM + - *B01 location1: &location1 !location @@ -125,7 +132,6 @@ fixedLocations: - *location1 code: 111111111 - quantityInKanban: 10 unit: kg description: very big screws fixedLocationsFirst: false @@ -134,7 +140,6 @@ &article2 !article id: article2 code: 222222222 - quantityInKanban: 2 unit: box description: little buttons fixedLocationsFirst: false @@ -145,7 +150,6 @@ fixedLocations: - *location2 code: 333333333 - quantityInKanban: 50 unit: g description: magic powder fixedLocationsFirst: false @@ -155,6 +159,29 @@ - *article2 - *article3 +kanban1: + &kanban1 !kanban + article: *article1 + warehouse: *B01 + requiredQuantity: 10 + +kanban2: + &kanban2 !kanban + article: *article2 + warehouse: *B01 + requiredQuantity: 2 + +kanban3: + &kanban3 !kanban + article: *article3 + warehouse: *B01 + requiredQuantity: 50 + +kanbans: + - *kanban1 + - *kanban2 + - *kanban3 + storedArticle1: &storedArticle1 !stored-article id: storedArticle1

1 0

r105 - in trunk: magalie-services/src/main/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 17 Apr '13

17 Apr '13

Author: bleny Date: 2013-04-17 15:27:17 +0200 (Wed, 17 Apr 2013) New Revision: 105 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: ask for quantity in kanban when necessary Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 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-04-17 10:35:44 UTC (rev 104) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FulfilKanbanService.java 2013-04-17 13:27:17 UTC (rev 105) @@ -12,6 +12,7 @@ import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; +import com.google.common.base.Preconditions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,29 +41,43 @@ } + public double getDefinedQuantity( + Article article, + Warehouse destinationStore) { + + double quantityInKanban = article.getQuantityInKanban(); + + // TODO brendan 17/04/13 consider destination store + + return quantityInKanban; + + } + public BookArticleResult fulfilKanbanTask( - String articleBarcode, + Article article, MagalieUser magalieUser, - String destinationStoreId) throws InvalidMagalieBarcodeException { + Warehouse destinationStore) { - if (log.isInfoEnabled()) { - log.info(magalieUser + " requested fulfil kanban with barcode " + articleBarcode); - } - MagalieBarcodeService magalieBarcodeService = serviceContext.newService(MagalieBarcodeService.class); - Article article = magalieBarcodeService.getArticle(articleBarcode); - double quantityInKanban = article.getQuantityInKanban(); + Preconditions.checkArgument(quantityInKanban > 0); + + return fulfilKanbanTask(article, magalieUser, destinationStore, quantityInKanban); + + } + + public BookArticleResult fulfilKanbanTask( + Article article, + MagalieUser magalieUser, + Warehouse destinationWarehouse, + double quantityInKanban) { + ArticleStorageService articleStorageService = serviceContext.newService(ArticleStorageService.class); - WarehouseDao warehouseDao = serviceContext.getPersistenceContext().getWarehouseDao(); - - Warehouse destinationWarehouse = warehouseDao.findById(destinationStoreId); - Building building = destinationWarehouse.getBuilding(); Location destinationLocation = getDestinationLocation(destinationWarehouse); @@ -102,4 +117,15 @@ return destinationWarehouses; } + + public Article getArticle(String articleBarcode) throws InvalidMagalieBarcodeException { + + MagalieBarcodeService magalieBarcodeService = + serviceContext.newService(MagalieBarcodeService.class); + + Article article = magalieBarcodeService.getArticle(articleBarcode); + + return article; + + } } 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-04-17 10:35:44 UTC (rev 104) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-04-17 13:27:17 UTC (rev 105) @@ -1,5 +1,6 @@ package com.franciaflex.magalie.web.action; +import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; @@ -10,6 +11,7 @@ import com.franciaflex.magalie.web.Activity; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; +import com.opensymphony.xwork2.Preparable; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.convention.annotation.Result; @@ -21,7 +23,7 @@ @Results({ @Result(name="success", type="redirectAction", params = { "actionName", "withdraw-item!input", "storageMovementOrderId", "${storageMovementOrderId}" }) }) -public class FulfilKanbanAction extends MagalieActionSupport { +public class FulfilKanbanAction extends MagalieActionSupport implements Preparable { private static final Log log = LogFactory.getLog(FulfilKanbanAction.class); @@ -37,6 +39,14 @@ protected String destinationWarehouseId; + protected Double quantity; + + protected boolean askQuantity; + + protected Article article; + + protected Warehouse destinationWarehouse; + public void setService(FulfilKanbanService service) { this.service = service; } @@ -46,7 +56,7 @@ } @Override - public String input() { + public void prepare() { session.setActivity(Activity.KANBANS); @@ -64,8 +74,10 @@ } - return INPUT; + } + public boolean isAskQuantity() { + return askQuantity; } public String getDestinationWarehouseId() { @@ -84,6 +96,10 @@ this.destinationWarehouseId = destinationWarehouseId; } + public void setQuantity(Double quantity) { + this.quantity = quantity; + } + @Override public String execute() { @@ -95,16 +111,14 @@ MagalieUser magalieUser = session.getMagalieUser(); - Warehouse destinationWarehouse = service.getStore(destinationWarehouseId); + destinationWarehouse = service.getStore(destinationWarehouseId); // save used destination warehouse to propose it by default on next kanban session.setLastUsedDestinationWarehouseForKanbans(destinationWarehouse); - BookArticleResult bookArticleResult; - try { - bookArticleResult = service.fulfilKanbanTask(articleBarcode, magalieUser, destinationWarehouseId); + article = service.getArticle(articleBarcode); } catch (InvalidMagalieBarcodeException e) { @@ -114,6 +128,31 @@ } + if (quantity == null) { + + double quantityDefined = service.getDefinedQuantity(article, destinationWarehouse); + + if (quantityDefined > 0) { + + quantity = quantityDefined; + + } + + } + + if (quantity == null || ! (quantity > 0.)) { + + askQuantity = true; + + addFieldError("quantity", "Il faut préciser une quantité pour cet article"); + + return INPUT; + + } + + BookArticleResult bookArticleResult = + service.fulfilKanbanTask(article, magalieUser, destinationWarehouse, quantity); + if (bookArticleResult.isArticleUnavailable()) { addActionError("Cet article n'est pas disponible"); @@ -136,6 +175,14 @@ } + public Article getArticle() { + return article; + } + + public String getArticleBarcode() { + return articleBarcode; + } + public String getStorageMovementOrderId() { return storageMovementOrder.getId(); } Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-04-17 10:35:44 UTC (rev 104) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-04-17 13:27:17 UTC (rev 105) @@ -6,7 +6,7 @@ </head> <s:form> - <s:textfield name="articleBarcode" label="Article" inputAppendIcon="barcode" cssClass="input-medium" /> + <s:textfield key="articleBarcode" label="Article" inputAppendIcon="barcode" cssClass="input-medium" /> <s:select label="Magasin destination" key="destinationWarehouseId" @@ -16,6 +16,10 @@ required="true" /> + <s:if test="askQuantity"> + <s:textfield name="quantity" label="Qté" inputAppend="%{article.unit}" cssClass="input-mini" /> + </s:if> + <div class="btn-group"> <s:submit name="next" value="Suivant" cssClass="btn btn-primary" /> </div>

1 0