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

r353 - trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 31 Jul '13

31 Jul '13

Author: bleny Date: 2013-07-31 18:15:32 +0200 (Wed, 31 Jul 2013) New Revision: 353 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #3006 prevent creation of duplicate storage movement Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 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-07-31 15:49:10 UTC (rev 352) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-07-31 16:15:32 UTC (rev 353) @@ -49,6 +49,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.collect.Ordering; @@ -433,27 +434,46 @@ Location destinationLocation = locationDao.findById(destinationLocationId); - StorageMovement storageMovement = new StorageMovement(); + StorageMovementJpaDao storageMovementDao = + persistenceContext.getStorageMovementDao(); - storageMovement.setOriginLocation(originLocation); + Map<String, Object> storageMovementProperties = Maps.newHashMap(); + storageMovementProperties.put(StorageMovement.PROPERTY_MAGALIE_USER, magalieUser); + storageMovementProperties.put(StorageMovement.PROPERTY_ARTICLE, article); + storageMovementProperties.put(StorageMovement.PROPERTY_ORIGIN_LOCATION, originLocation); + storageMovementProperties.put(StorageMovement.PROPERTY_DESTINATION_LOCATION, destinationLocation); + storageMovementProperties.put(StorageMovement.PROPERTY_CONFIRM_DATE, null); - storageMovement.setDestinationLocation(destinationLocation); + StorageMovement storageMovement = storageMovementDao.findByProperties(storageMovementProperties); - storageMovement.setMagalieUser(magalieUser); + if (storageMovement == null) { - storageMovement.setArticle(article); + storageMovement = new StorageMovement(); + storageMovement.setOriginLocation(originLocation); + + storageMovement.setDestinationLocation(destinationLocation); + + storageMovement.setMagalieUser(magalieUser); + + storageMovement.setArticle(article); + + storageMovementDao.persist(storageMovement); + + } else { + + if (log.isDebugEnabled()) { + log.debug("storage movement already exists, user just want to update quantity " + storageMovement); + } + + } + storageMovement.setActualQuantity(quantity); Date now = serviceContext.getNow(); storageMovement.setMovementDate(now); - StorageMovementJpaDao storageMovementDao = - persistenceContext.getStorageMovementDao(); - - storageMovementDao.persist(storageMovement); - persistenceContext.commit(); if (log.isInfoEnabled()) {

1 0

r352 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence 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 31 Jul '13

31 Jul '13

Author: bleny Date: 2013-07-31 17:49:10 +0200 (Wed, 31 Jul 2013) New Revision: 352 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3001 urgent field was considered but shortest list was priorized, now list size is ignored Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.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 Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java 2013-07-31 15:31:58 UTC (rev 351) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java 2013-07-31 15:49:10 UTC (rev 352) @@ -31,7 +31,6 @@ import org.nuiton.jpa.api.JpaEntities; import java.util.Comparator; -import java.util.List; public class RequestedArticles { @@ -49,12 +48,12 @@ } } - public static Comparator<RequestedArticle> comparator(List<RequestedArticle> requests, RequestedList affectedRequestedList) { + public static Comparator<RequestedArticle> comparator(RequestedList affectedRequestedList) { Comparator<RequestedArticle> comparator = Ordering.compound( Lists.newArrayList( - new RequestedListComparator(RequestedLists.comparator(requests, affectedRequestedList)), + new RequestedListComparator(RequestedLists.comparator(affectedRequestedList)), // we can still have ambiguous or priorities, so to be deterministic, use arbitrary order JpaEntities.<RequestedArticle>arbitraryComparator() Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.java 2013-07-31 15:31:58 UTC (rev 351) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.java 2013-07-31 15:49:10 UTC (rev 352) @@ -23,21 +23,14 @@ * #L% */ -import com.franciaflex.magalie.persistence.entity.RequestedArticle; import com.franciaflex.magalie.persistence.entity.RequestedList; -import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Multimaps; import com.google.common.collect.Ordering; import org.apache.commons.collections.comparators.BooleanComparator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.util.Collection; import java.util.Comparator; -import java.util.List; -import java.util.Map; public class RequestedLists { @@ -77,40 +70,6 @@ } - protected static class FinishEarlyFirstComparator implements Comparator<RequestedList> { - - protected Map<RequestedList, Integer> requestListToArticleRemainingCount; - - public FinishEarlyFirstComparator(Map<RequestedList, Integer> requestListToArticleRemainingCount) { - this.requestListToArticleRemainingCount = requestListToArticleRemainingCount; - } - - protected int getRemainingCount(RequestedList requestedList) { - Integer remainingCount = requestListToArticleRemainingCount.get(requestedList); - return remainingCount; - } - - @Override - public int compare(RequestedList x, RequestedList y) { - int xRemainingCount = getRemainingCount(x); - int yRemainingCount = getRemainingCount(y); - int compare = xRemainingCount - yRemainingCount; - if (log.isTraceEnabled()) { - if (compare < 0) { - log.trace(x.getId() + " is before " + y.getId()); - } - if (compare == 0 && ! x.equals(y)) { - log.trace(x.getId() + " is same position as " + y.getId()); - } - if (compare > 0) { - log.trace(y.getId() + " is before " + x.getId()); - } - } - return compare; - } - - } - public static Comparator<RequestedList> urgentFirstComparator() { return new UrgentFirstComparator(); } @@ -119,41 +78,15 @@ return new RequestDateFistComparator(); } - public static Comparator<RequestedList> finishEarlyFirstComparator(List<RequestedArticle> requests) { - - ImmutableListMultimap<RequestedList, RequestedArticle> index = - Multimaps.index(requests, RequestedArticles.getRequestList()); - - Map<RequestedList, Integer> requestListToArticleRemainingCount = Maps.newHashMap(); - - for (Map.Entry<RequestedList, Collection<RequestedArticle>> requestedListCollectionEntry : index.asMap().entrySet()) { - - RequestedList requestedList = requestedListCollectionEntry.getKey(); - - int remainingCount = requestedListCollectionEntry.getValue().size(); - - requestListToArticleRemainingCount.put(requestedList, remainingCount); - - } - - if (log.isDebugEnabled()) { - log.debug("number of remaining articles per list: " + requestListToArticleRemainingCount); - } - - return new FinishEarlyFirstComparator(requestListToArticleRemainingCount); - - } - public static Comparator<RequestedList> givenRequestListFirst(RequestedList requestedList) { return new GivenRequestListFirst(requestedList); } - public static Comparator<RequestedList> comparator(List<RequestedArticle> requests, RequestedList affectedRequestedList) { + public static Comparator<RequestedList> comparator(RequestedList affectedRequestedList) { Ordering<RequestedList> comparator = Ordering.compound( Lists.newArrayList( givenRequestListFirst(affectedRequestedList), - finishEarlyFirstComparator(requests), urgentFirstComparator(), requestDateFirstComparator() ) 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-07-31 15:31:58 UTC (rev 351) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-07-31 15:49:10 UTC (rev 352) @@ -286,7 +286,7 @@ } Comparator<RequestedArticle> priorityComparator = - RequestedArticles.comparator(requests, affectedRequestedList); + RequestedArticles.comparator(affectedRequestedList); Set<RequestedArticle> requestedArticles = Sets.newTreeSet(priorityComparator); 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-07-31 15:31:58 UTC (rev 351) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-07-31 15:49:10 UTC (rev 352) @@ -93,12 +93,12 @@ Assert.assertEquals(requestedArticles.size(), requestedArticlesByPriority.size()); - Assert.assertEquals("requestedArticle5", Iterables.get(requestedArticlesByPriority, 0).getId()); - Assert.assertEquals("requestedArticle6", Iterables.get(requestedArticlesByPriority, 1).getId()); - Assert.assertEquals("requestedArticle1", Iterables.get(requestedArticlesByPriority, 2).getId()); - Assert.assertEquals("requestedArticle2", Iterables.get(requestedArticlesByPriority, 3).getId()); - Assert.assertEquals("requestedArticle3", Iterables.get(requestedArticlesByPriority, 4).getId()); - Assert.assertEquals("requestedArticle4", Iterables.get(requestedArticlesByPriority, 5).getId()); + Assert.assertEquals("requestedArticle1", Iterables.get(requestedArticlesByPriority, 0).getId()); + Assert.assertEquals("requestedArticle2", Iterables.get(requestedArticlesByPriority, 1).getId()); + Assert.assertEquals("requestedArticle3", Iterables.get(requestedArticlesByPriority, 2).getId()); + Assert.assertEquals("requestedArticle4", Iterables.get(requestedArticlesByPriority, 3).getId()); + Assert.assertEquals("requestedArticle5", Iterables.get(requestedArticlesByPriority, 4).getId()); + Assert.assertEquals("requestedArticle6", Iterables.get(requestedArticlesByPriority, 5).getId()); } @@ -212,6 +212,20 @@ } + // continuing first list, user affectation not changed + { + orderToExecute = service.findOrderToExecute(magalieUser, building, LIST_TYPE); + Preconditions.checkState(orderToExecute.isSuccess()); + + Assert.assertNull(orderToExecute.getOldAffectation()); + Assert.assertNull(orderToExecute.getNewAffectation()); + + StorageMovementConfirmation confirmation = new StorageMovementConfirmation(); + confirmation.setRequestedArticleId(orderToExecute.getRequestedArticle().getId()); + service.onStorageMovementConfirmation(confirmation, emptySet); + + } + // first list is finished, must know old affectation and new affectation { orderToExecute = service.findOrderToExecute(magalieUser, building, LIST_TYPE);

1 0

r351 - 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/js
by bleny＠users.forge.codelutin.com 31 Jul '13

31 Jul '13

Author: bleny Date: 2013-07-31 17:31:58 +0200 (Wed, 31 Jul 2013) New Revision: 351 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2995 report error if user scan a location known as full 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/LocationJsonAction.java trunk/magalie-web/src/main/webapp/js/receive-article-input.js Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-31 14:11:50 UTC (rev 350) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-31 15:31:58 UTC (rev 351) @@ -26,6 +26,7 @@ import com.franciaflex.magalie.persistence.JpaMagaliePersistenceContext; import com.franciaflex.magalie.persistence.Locations; import com.franciaflex.magalie.persistence.StoredArticles; +import com.franciaflex.magalie.persistence.dao.ArticleJpaDao; import com.franciaflex.magalie.persistence.dao.LocationDao; import com.franciaflex.magalie.persistence.dao.LocationJpaDao; import com.franciaflex.magalie.persistence.dao.PreparedArticleReceptionJpaDao; @@ -403,4 +404,32 @@ } + public Location getLocationToStoreSomething(Building building, MagalieUser magalieUser, String locationBarcode, String articleId) throws InvalidMagalieBarcodeException { + + MagalieBarcodeService magalieBarcodeService = + serviceContext.newService(MagalieBarcodeService.class); + + Location location = magalieBarcodeService.getLocation(locationBarcode, building); + + if (location.isFullLocation()) { + + if (log.isInfoEnabled()) { + log.info(magalieUser + " scanned barcode " + locationBarcode + " for reception but location " + location + " is full, reporting error"); + } + + LocationErrorsService locationErrorsService = + serviceContext.newService(LocationErrorsService.class); + + ArticleJpaDao articleDao = serviceContext.getPersistenceContext().getArticleDao(); + + Article article = articleDao.findById(articleId); + + locationErrorsService.reportError(location, article, magalieUser); + + } + + return location; + + } + } Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-07-31 14:11:50 UTC (rev 350) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-07-31 15:31:58 UTC (rev 351) @@ -24,6 +24,7 @@ */ import com.franciaflex.magalie.persistence.Locations; +import com.franciaflex.magalie.persistence.dao.LocationErrorJpaDao; import com.franciaflex.magalie.persistence.dao.ReceivedPreparedArticleReceptionJpaDao; import com.franciaflex.magalie.persistence.dao.StorageMovementJpaDao; import com.franciaflex.magalie.persistence.entity.Article; @@ -354,4 +355,19 @@ } + @Test + public void testGetLocationToStoreSomethingReportErrorIfFullLocation() throws InvalidMagalieBarcodeException { + + Location fullLocation = fixture("locationFull1"); + + service.getLocationToStoreSomething(building, magalieUser, fullLocation.getBarcode(), article.getId()); + + EntityManager entityManager = getJpaEntityManagerRule().newEntityManager(); + + LocationErrorJpaDao locationErrorJpaDao = new LocationErrorJpaDao(entityManager); + + Assert.assertFalse(locationErrorJpaDao.findAll().isEmpty()); + + } + } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java 2013-07-31 14:11:50 UTC (rev 350) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java 2013-07-31 15:31:58 UTC (rev 351) @@ -25,10 +25,13 @@ import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.Location; +import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; -import com.franciaflex.magalie.services.service.MagalieBarcodeService; +import com.franciaflex.magalie.services.service.ReceptionService; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; @@ -37,19 +40,23 @@ }) public class LocationJsonAction extends MagalieActionSupport{ - protected MagalieBarcodeService service; + private static final Log log = LogFactory.getLog(LocationJsonAction.class); + protected ReceptionService service; + protected Location location; protected String locationBarcode; protected MagalieSession session; + protected String articleId; + public void setSession(MagalieSession session) { this.session = session; } - public void setService(MagalieBarcodeService service) { + public void setService(ReceptionService service) { this.service = service; } @@ -57,12 +64,22 @@ this.locationBarcode = locationBarcode; } + public void setArticleId(String articleId) { + this.articleId = articleId; + } + @Override public String execute() throws InvalidMagalieBarcodeException { + MagalieUser magalieUser = session.getMagalieUser(); + + if (log.isInfoEnabled()) { + log.info(magalieUser + " scanned " + locationBarcode + " to store something"); + } + Building building = session.getBuilding(); - location = service.getLocation(locationBarcode, building); + location = service.getLocationToStoreSomething(building, magalieUser, locationBarcode, articleId); return SUCCESS; Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-07-31 14:11:50 UTC (rev 350) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-07-31 15:31:58 UTC (rev 351) @@ -55,7 +55,10 @@ $.ajax({ dataType: "json", url: locationJsonUrl, - data: { locationBarcode: barcode }, + data: { + locationBarcode: barcode, + articleId: model.storedArticle.article.id + }, async: false, success: function(data) { location = data.location; @@ -66,6 +69,9 @@ if (location == null) { throw new ValidationError(barcode + " n'est pas le code barre d'un emplacement valide"); } + if (location.fullLocation) { + throw new ValidationError("Emplt " + barcode + " en erreur - choisir un autre"); + } return location; };

1 0

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

31 Jul '13

Author: bleny Date: 2013-07-31 16:11:50 +0200 (Wed, 31 Jul 2013) New Revision: 350 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2989 reported errors was not considered Added: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/StorageTransferServiceTest.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-07-31 13:00:16 UTC (rev 349) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-07-31 14:11:50 UTC (rev 350) @@ -104,7 +104,7 @@ StoredArticleDao storedArticleDao = persistenceContext.getStoredArticleDao(); - Iterable<StoredArticle > storedArticles = storedArticleDao.findAllByLocation(location); + Iterable<StoredArticle> storedArticles = storedArticleDao.findAllByLocation(location); ArticleStorageService articleStorageService = serviceContext.newService(ArticleStorageService.class); @@ -118,7 +118,12 @@ storedArticles = articleStorageService.computeActualQuantities(storedArticles, allImpactingStoredArticle); + LocationErrorsService locationErrorsService = serviceContext.newService(LocationErrorsService.class); + + storedArticles = locationErrorsService.filterLocationInError(storedArticles); + return Lists.newArrayList(storedArticles); + } public void confirmStorageTransfer(MagalieUser magalieUser, StoredArticle storedArticle, double quantity, Location destinationLocation) { Added: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/StorageTransferServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/StorageTransferServiceTest.java (rev 0) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/StorageTransferServiceTest.java 2013-07-31 14:11:50 UTC (rev 350) @@ -0,0 +1,63 @@ +package com.franciaflex.magalie.services.service; + +import com.franciaflex.magalie.persistence.entity.Building; +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.services.AbstractMagalieServiceTest; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.text.ParseException; +import java.util.Date; +import java.util.List; + +public class StorageTransferServiceTest extends AbstractMagalieServiceTest { + + protected StorageTransferService service; + + protected MagalieUser magalieUser; + + protected Building building; + + @Before + public void setUp() throws ParseException { + + loadFixtures("fixtures"); + + service = newService(StorageTransferService.class); + + serviceContext.setDate(new Date(1363948427576l)); + + magalieUser = fixture("bruno"); + + building = fixture("B1"); + + } + + @Test + public void testGetStoredArticlesInLocationIgnoreArticlesReportedInError() { + + Location location = fixture("location3"); + + List<StoredArticle> storedArticlesInLocation = + service.getStoredArticlesInLocation(location); + + Assert.assertEquals(2, storedArticlesInLocation.size()); + + LocationErrorsService locationErrorsService = + newService(LocationErrorsService.class); + + locationErrorsService.reportError(storedArticlesInLocation.get(0).getId(), magalieUser); + + List<StoredArticle> storedArticlesInLocationAfterError = + service.getStoredArticlesInLocation(location); + + Assert.assertEquals( + storedArticlesInLocation.size() - 1, + storedArticlesInLocationAfterError.size()); + + } + +}

1 0

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

31 Jul '13

Author: bleny Date: 2013-07-31 15:00:16 +0200 (Wed, 31 Jul 2013) New Revision: 349 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2988 add binding for F5 key Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-07-31 12:53:45 UTC (rev 348) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-07-31 13:00:16 UTC (rev 349) @@ -29,6 +29,7 @@ <script type="text/javascript"> $(document).ready(function () { bindKey('Esc', function(){ redirectTo($('#cancelLink'));}); + bindKey('F5', function(){ $('#reportError').click(); }); $('input[name="originLocationBarcode"]').focus(); }); </script> @@ -80,7 +81,7 @@ <div class="btn-group"> <s:a href="%{cancelUrl}" cssClass="btn btn-mini" id="cancelLink" >Quitter (Esc)</s:a> <s:submit action="simple-withdraw-item" value="Valider" cssClass="btn btn-mini btn-primary" /> - <s:submit action="simple-withdraw-item!reportError" value="Anomalie (F5)" cssClass="btn btn-mini btn-danger" /> + <s:submit action="simple-withdraw-item!reportError" value="Anomalie (F5)" cssClass="btn btn-mini btn-danger" id="reportError" /> </div> </s:form>

1 0

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

31 Jul '13

Author: bleny Date: 2013-07-31 14:53:45 +0200 (Wed, 31 Jul 2013) New Revision: 348 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2995 : the stored article asked was in the result of preferred location 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/ReceptionTask.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-31 12:15:10 UTC (rev 347) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-31 12:53:45 UTC (rev 348) @@ -206,24 +206,21 @@ Set<Location> preferredLocations = getPreferredLocations(warehouse, article); - boolean userMustChooseExtraLocation = preferredLocations.isEmpty(); + Iterable<Location> acceptablePreferredLocations = Iterables.filter(preferredLocations, isAcceptableForReception); // second step, add extra locations Set<Location> extraLocations = getExtraLocations(warehouse); - Set<Location> locations = Sets.newLinkedHashSet(); + Iterable<Location> acceptableExtraLocations = Iterables.filter(extraLocations, isAcceptableForReception); - Iterables.addAll(locations, Iterables.filter(preferredLocations, isAcceptableForReception)); + ReceptionTask receptionTask = new ReceptionTask(storedArticle, quantity, acceptablePreferredLocations, acceptableExtraLocations); - Iterables.addAll(locations, Iterables.filter(extraLocations, isAcceptableForReception)); - - ReceptionTask receptionTask = new ReceptionTask(storedArticle, quantity, locations, userMustChooseExtraLocation); - if (log.isDebugEnabled()) { - log.debug(locations.size() + " locations to receive articles for article " - + article + " in warehouse " + warehouse + " are " - + StringUtils.join(locations, ", ")); + log.debug("locations to receive articles for article " + + article + " in warehouse " + warehouse + " are acceptable = " + + StringUtils.join(acceptablePreferredLocations, ", ") + + " extra = " + StringUtils.join(acceptableExtraLocations, ", ")); } return receptionTask; Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java 2013-07-31 12:15:10 UTC (rev 347) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java 2013-07-31 12:53:45 UTC (rev 348) @@ -25,6 +25,9 @@ import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.StoredArticle; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import java.util.Set; @@ -36,13 +39,17 @@ protected double quantity; + protected Iterable<Location> preferredLocations; + + protected Iterable<Location> extraLocations; + protected Set<Location> locations; - public ReceptionTask(StoredArticle storedArticle, double quantity, Set<Location> locations, boolean userMustChooseExtraLocation) { + public ReceptionTask(StoredArticle storedArticle, double quantity, Iterable<Location> preferredLocations, Iterable<Location> extraLocations) { this.storedArticle = storedArticle; this.quantity = quantity; - this.locations = locations; - this.userMustChooseExtraLocation = userMustChooseExtraLocation; + this.preferredLocations = preferredLocations; + this.extraLocations = extraLocations; } public StoredArticle getStoredArticle() { @@ -50,6 +57,11 @@ } public Set<Location> getLocations() { + if (locations == null) { + locations = Sets.newLinkedHashSet(); + Iterables.addAll(locations, preferredLocations); + Iterables.addAll(locations, extraLocations); + } return locations; } @@ -58,7 +70,12 @@ } public boolean isUserMustChooseExtraLocation() { - return userMustChooseExtraLocation; + return Iterables.isEmpty(preferredLocations); } + @Override + public String toString() { + return ReflectionToStringBuilder.toString(this); + } + } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-07-31 12:15:10 UTC (rev 347) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-07-31 12:53:45 UTC (rev 348) @@ -98,12 +98,6 @@ receptionTask = service.getReceptionTaskForPreparedArticleReception(building, preparedArticleReceptionBarcode); - if (receptionTask.isUserMustChooseExtraLocation()) { - - addActionMessage("Pas de stock : emplacement libre proposé"); - - } - } catch (PreparedArticleReceptionAlreadyStoredException e) { session.addMessage("Article déjà rangé"); @@ -126,6 +120,12 @@ Preconditions.checkNotNull(receptionTask); + if (receptionTask.isUserMustChooseExtraLocation()) { + + addActionMessage("Pas de stock : emplacement libre proposé"); + + } + return INPUT; }

1 0

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

31 Jul '13

Author: bleny Date: 2013-07-31 14:15:10 +0200 (Wed, 31 Jul 2013) New Revision: 347 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: change label in withdraw-item-input Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 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-07-26 11:53:22 UTC (rev 346) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-07-31 12:15:10 UTC (rev 347) @@ -45,7 +45,7 @@ Desc. : <s:property value="article.description" /> </li> <li> - Stocké : + Prélevé : <span id="withdrawn">0</span> <s:if test="expectedQuantity"> / <s:property value="expectedQuantity" />

1 0

r346 - in trunk: . magalie-persistence magalie-services magalie-web
by maven-release＠users.forge.codelutin.com 26 Jul '13

26 Jul '13

Author: maven-release Date: 2013-07-26 13:53:22 +0200 (Fri, 26 Jul 2013) New Revision: 346 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/magalie-persistence/pom.xml trunk/magalie-services/pom.xml trunk/magalie-web/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-07-26 11:53:15 UTC (rev 345) +++ trunk/magalie-persistence/pom.xml 2013-07-26 11:53:22 UTC (rev 346) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-2</version> + <version>1.0-rc-3-SNAPSHOT</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-07-26 11:53:15 UTC (rev 345) +++ trunk/magalie-services/pom.xml 2013-07-26 11:53:22 UTC (rev 346) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-2</version> + <version>1.0-rc-3-SNAPSHOT</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-07-26 11:53:15 UTC (rev 345) +++ trunk/magalie-web/pom.xml 2013-07-26 11:53:22 UTC (rev 346) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-2</version> + <version>1.0-rc-3-SNAPSHOT</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-26 11:53:15 UTC (rev 345) +++ trunk/pom.xml 2013-07-26 11:53:22 UTC (rev 346) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-2</version> + <version>1.0-rc-3-SNAPSHOT</version> <packaging>pom</packaging> <name>MagaLiE</name> @@ -92,9 +92,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/tags/fra…</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/trunk</url> </scm> <distributionManagement> <site>

1 0

r345 - in tags: . franciaflex-magalie-1.0-rc-2
by maven-release＠users.forge.codelutin.com 26 Jul '13

26 Jul '13

Author: maven-release Date: 2013-07-26 13:53:15 +0200 (Fri, 26 Jul 2013) New Revision: 345 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] copy for tag franciaflex-magalie-1.0-rc-2 Added: tags/franciaflex-magalie-1.0-rc-2/ Property changes on: tags/franciaflex-magalie-1.0-rc-2 ___________________________________________________________________ Added: svn:ignore + target *.iml *.ipr .idea *~ Added: svn:mergeinfo + /branches/magalie-eugene:191-224

1 0

r344 - in trunk: . magalie-persistence magalie-services magalie-web
by maven-release＠users.forge.codelutin.com 26 Jul '13

26 Jul '13

Author: maven-release Date: 2013-07-26 13:53:07 +0200 (Fri, 26 Jul 2013) New Revision: 344 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] prepare release franciaflex-magalie-1.0-rc-2 Modified: trunk/magalie-persistence/pom.xml trunk/magalie-services/pom.xml trunk/magalie-web/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-07-26 11:51:01 UTC (rev 343) +++ trunk/magalie-persistence/pom.xml 2013-07-26 11:53:07 UTC (rev 344) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-2-SNAPSHOT</version> + <version>1.0-rc-2</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-07-26 11:51:01 UTC (rev 343) +++ trunk/magalie-services/pom.xml 2013-07-26 11:53:07 UTC (rev 344) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-2-SNAPSHOT</version> + <version>1.0-rc-2</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-07-26 11:51:01 UTC (rev 343) +++ trunk/magalie-web/pom.xml 2013-07-26 11:53:07 UTC (rev 344) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-2-SNAPSHOT</version> + <version>1.0-rc-2</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-26 11:51:01 UTC (rev 343) +++ trunk/pom.xml 2013-07-26 11:53:07 UTC (rev 344) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-2-SNAPSHOT</version> + <version>1.0-rc-2</version> <packaging>pom</packaging> <name>MagaLiE</name> @@ -92,9 +92,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/tags/fra…</url> </scm> <distributionManagement> <site>

1 0