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

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

11 Jul '13

Author: bleny Date: 2013-07-11 21:38:53 +0200 (Thu, 11 Jul 2013) New Revision: 303 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add header in simple-withdraw-item-input to show article code and description Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java 2013-07-11 19:31:05 UTC (rev 302) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java 2013-07-11 19:38:53 UTC (rev 303) @@ -23,6 +23,7 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.StoredArticle; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -31,18 +32,25 @@ public class SimpleWithdrawItemTask { + protected Article article; + protected List<StoredArticle> storedArticles; protected boolean driverLicenseRequired; protected boolean articleUnavailable; - public SimpleWithdrawItemTask(Iterable<StoredArticle> storedArticles, boolean driverLicenseRequired, boolean articleUnavailable) { + public SimpleWithdrawItemTask(Article article, Iterable<StoredArticle> storedArticles, boolean driverLicenseRequired, boolean articleUnavailable) { + this.article = article; this.storedArticles = Lists.newArrayList(storedArticles); this.driverLicenseRequired = driverLicenseRequired; this.articleUnavailable = articleUnavailable; } + public Article getArticle() { + return article; + } + public List<StoredArticle> getStoredArticles() { return storedArticles; } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java 2013-07-11 19:31:05 UTC (rev 302) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java 2013-07-11 19:38:53 UTC (rev 303) @@ -105,7 +105,7 @@ storedArticles = Iterables.filter(storedArticles, articleStoredInAccessibleLocationPredicate); SimpleWithdrawItemTask simpleWithdrawItemTask = - new SimpleWithdrawItemTask(storedArticles, driverLicenseRequired, articleUnavailable); + new SimpleWithdrawItemTask(article, storedArticles, driverLicenseRequired, articleUnavailable); return simpleWithdrawItemTask; 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-11 19:31:05 UTC (rev 302) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-07-11 19:38:53 UTC (rev 303) @@ -30,6 +30,15 @@ <s:url action="choose-activity" id="cancelUrl" /> +<ul class="oneItemPerLine"> + <li> + Réf. : <s:property value="simpleWithdrawItemTask.article.code" /> + </li> + <li> + Desc. : <s:property value="simpleWithdrawItemTask.article.description" /> + </li> +</ul> + <s:form> <ul>

1 0

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

11 Jul '13

Author: bleny Date: 2013-07-11 21:31:05 +0200 (Thu, 11 Jul 2013) New Revision: 302 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: in simple-withdraw-item-input show quantities and mention when no batchCode value, fix exception raised with simple withdraw item on an unavailable article Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemServiceTest.java trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java 2013-07-11 18:41:26 UTC (rev 301) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/SimpleWithdrawItemTask.java 2013-07-11 19:31:05 UTC (rev 302) @@ -48,12 +48,16 @@ } public boolean isDriverLicenseRequired() { - Preconditions.checkState( ! articleUnavailable); + if (driverLicenseRequired) { + Preconditions.checkState( ! articleUnavailable); + } return driverLicenseRequired; } public boolean isArticleUnavailable() { - Preconditions.checkState( ! driverLicenseRequired); + if (articleUnavailable) { + Preconditions.checkState( ! driverLicenseRequired); + } return articleUnavailable; } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java 2013-07-11 18:41:26 UTC (rev 301) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemService.java 2013-07-11 19:31:05 UTC (rev 302) @@ -81,17 +81,31 @@ Predicate<StoredArticle> articleStoredInAccessibleLocationPredicate = StoredArticles.articleStoredInAccessibleLocationPredicate(magalieUser); - boolean articleIsAccessible = - Iterables.any( - storedArticles, - articleStoredInAccessibleLocationPredicate); - boolean articleUnavailable = Iterables.isEmpty(storedArticles); + boolean articleAvailable = ! articleUnavailable; + + boolean driverLicenseRequired; + + if (articleAvailable) { + + boolean articleIsAccessible = + Iterables.any( + storedArticles, + articleStoredInAccessibleLocationPredicate); + + driverLicenseRequired = ! articleIsAccessible; + + } else { + + driverLicenseRequired = false; + + } + storedArticles = Iterables.filter(storedArticles, articleStoredInAccessibleLocationPredicate); SimpleWithdrawItemTask simpleWithdrawItemTask = - new SimpleWithdrawItemTask(storedArticles, ! articleIsAccessible, articleUnavailable); + new SimpleWithdrawItemTask(storedArticles, driverLicenseRequired, articleUnavailable); return simpleWithdrawItemTask; Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemServiceTest.java 2013-07-11 18:41:26 UTC (rev 301) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/SimpleWithdrawItemServiceTest.java 2013-07-11 19:31:05 UTC (rev 302) @@ -92,6 +92,20 @@ } @Test + public void testSimpleWithdrawOnUnavailableArticle() throws InvalidMagalieBarcodeException, IllegalWithdrawException { + + Article article = fixture("article4"); + + SimpleWithdrawItemTask simpleWithdrawItemTask = + service.getSimpleWithdrawItemTask(building, magalieUser, article.getCode()); + + Assert.assertTrue(simpleWithdrawItemTask.isArticleUnavailable()); + + Assert.assertFalse(simpleWithdrawItemTask.isDriverLicenseRequired()); + + } + + @Test public void testSimpleWithdrawWithoutDriverLicense() throws InvalidMagalieBarcodeException, IllegalWithdrawException { magalieUser = fixture("corinne"); 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-11 18:41:26 UTC (rev 301) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-07-11 19:31:05 UTC (rev 302) @@ -39,10 +39,16 @@ <li> <s:property value="location.barcode" /> + Qté + <s:property value="quantity" /> + <s:property value="article.unit" /> - <s:if test="batchCode != null"> + <s:if test="batchCode == null"> + (aucun lot) + </s:if> + <s:else> (<s:property value="batchCode" />) - </s:if> + </s:else> </li>

1 0

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

11 Jul '13

Author: bleny Date: 2013-07-11 20:41:26 +0200 (Thu, 11 Jul 2013) New Revision: 301 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes some locations are removed even if the article is not the same Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorJpaDao.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/LocationErrorsService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-07-11 10:56:35 UTC (rev 300) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-07-11 18:41:26 UTC (rev 301) @@ -95,10 +95,6 @@ return new LocationRequiringDriverLicenseFirstComparator(); } - public static Predicate<Location> locationIsNotReportedInError(Collection<Location> allLocationsInError) { - return Predicates.not(Predicates.in(allLocationsInError)); - } - public static String codeForWarehouseWithoutLocations() { return " SANS"; } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java 2013-07-11 10:56:35 UTC (rev 300) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java 2013-07-11 18:41:26 UTC (rev 301) @@ -23,6 +23,7 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.LocationError; @@ -33,7 +34,8 @@ LocationError findByLocation(Location location); - List<Location> findAllLocationsInError(); + List<Location> findAllLocationsInError(Article article); List<LocationError> findAll(); + } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorJpaDao.java 2013-07-11 10:56:35 UTC (rev 300) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorJpaDao.java 2013-07-11 18:41:26 UTC (rev 301) @@ -23,12 +23,12 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.LocationError; import javax.persistence.EntityManager; import javax.persistence.Query; -import javax.persistence.TypedQuery; import java.util.List; public class LocationErrorJpaDao extends AbstractLocationErrorJpaDao { @@ -38,22 +38,16 @@ } @Override - public LocationError findByLocation(Location location) { - TypedQuery<LocationError> query = createQuery("from LocationError se where se.location = :location"); - query.setParameter("location", location); - return findUniqueOrNull(query); - } - - @Override - public List<Location> findAllLocationsInError() { - Query query = entityManager.createQuery("select se.location from LocationError se"); + public List<Location> findAllLocationsInError(Article article) { + Query query = entityManager.createQuery("select le.location from LocationError le where le.article = :article "); + query.setParameter("article", article); List<Location> allLocationsInError = query.getResultList(); return allLocationsInError; } @Override public List<LocationError> findAll() { - Query query = entityManager.createQuery("from LocationError se order by se.reportDate"); + Query query = entityManager.createQuery("from LocationError le order by le.reportDate"); List<LocationError> all = query.getResultList(); return all; } 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-11 10:56:35 UTC (rev 300) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-07-11 18:41:26 UTC (rev 301) @@ -356,9 +356,7 @@ LocationErrorsService locationErrorsService = serviceContext.newService(LocationErrorsService.class); - storedArticles = Iterables.filter( - storedArticles, - locationErrorsService.getArticleNotStoredInLocationReportedInErrorPredicate()); + storedArticles = locationErrorsService.filterLocationInError(storedArticles); return storedArticles; Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java 2013-07-11 10:56:35 UTC (rev 300) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java 2013-07-11 18:41:26 UTC (rev 301) @@ -24,8 +24,6 @@ */ import com.franciaflex.magalie.persistence.JpaMagaliePersistenceContext; -import com.franciaflex.magalie.persistence.Locations; -import com.franciaflex.magalie.persistence.StoredArticles; import com.franciaflex.magalie.persistence.dao.LocationErrorJpaDao; import com.franciaflex.magalie.persistence.dao.StoredArticleJpaDao; import com.franciaflex.magalie.persistence.entity.Article; @@ -38,6 +36,8 @@ import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -122,20 +122,54 @@ } - public Predicate<Location> getLocationNotReportedInErrorPredicate() { + protected Predicate<Location> getLocationNotReportedInErrorPredicate(Article article) { LocationErrorJpaDao locationErrorDao = serviceContext.getPersistenceContext().getLocationErrorDao(); - List<Location> allLocationsInError = locationErrorDao.findAllLocationsInError(); + List<Location> allLocationsInErrorForArticle = + locationErrorDao.findAllLocationsInError(article); - return Locations.locationIsNotReportedInError(allLocationsInError); + return Predicates.not(Predicates.in(allLocationsInErrorForArticle)); } - public Predicate<StoredArticle> getArticleNotStoredInLocationReportedInErrorPredicate() { + protected Iterable<StoredArticle> filterLocationInError(Iterable<StoredArticle> storedArticles) { - return Predicates.compose(getLocationNotReportedInErrorPredicate(), StoredArticles.getLocationFunction()); + List<StoredArticle> result = Lists.newLinkedList(); + LocationErrorJpaDao locationErrorDao = + serviceContext.getPersistenceContext().getLocationErrorDao(); + + for (StoredArticle storedArticle : storedArticles) { + + ImmutableMap properties = + ImmutableMap.of( + LocationError.PROPERTY_ARTICLE, storedArticle.getArticle(), + LocationError.PROPERTY_LOCATION, storedArticle.getLocation() + ); + + LocationError locationError = locationErrorDao.findByProperties(properties); + + if (locationError == null) { + + if (log.isTraceEnabled()) { + log.trace("no location error reported for " + storedArticle); + } + + result.add(storedArticle); + + } else { + + if (log.isDebugEnabled()) { + log.debug("removing stored article " + storedArticle + " due to location error " + locationError); + } + + } + + } + + return result; + } } 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-11 10:56:35 UTC (rev 300) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-11 18:41:26 UTC (rev 301) @@ -68,6 +68,9 @@ private static final Log log = LogFactory.getLog(ReceptionService.class); + /** disabled, for a warehouse with 1000+ locations, can lead to a page of 1Mo+, now the locations are loaded on demand */ + protected static final boolean INCLUDE_ALL_BUILDING_LOCATIONS_IN_RECEPTION_TASK = false; + protected MagalieServiceContext serviceContext; @Override @@ -195,7 +198,7 @@ ImmutableSet.of( Locations.isNotReceptionLocation(), Locations.isNotFullLocation(), - locationErrorsService.getLocationNotReportedInErrorPredicate() + locationErrorsService.getLocationNotReportedInErrorPredicate(article) ) ); @@ -244,7 +247,7 @@ locations.addAll(locationDao.findAllWithoutReception(warehouse)); // add all locations in the same building, other warehouses - if (false) { // disabled, for a warehouse with 1000+ locations, can lead to a page of 1Mo+, now the locations are loaded on demand + if (INCLUDE_ALL_BUILDING_LOCATIONS_IN_RECEPTION_TASK) { locations.addAll(locationDao.findAllWithoutReception(warehouse.getBuilding())); } 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-11 10:56:35 UTC (rev 300) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-07-11 18:41:26 UTC (rev 301) @@ -144,14 +144,18 @@ Assert.assertEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 3).getWarehouse()); // locations in another warehouse last - Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 4).getWarehouse()); - Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 5).getWarehouse()); - Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 6).getWarehouse()); - Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 7).getWarehouse()); - Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 8).getWarehouse()); - Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 9).getWarehouse()); - Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 10).getWarehouse()); + if (service.INCLUDE_ALL_BUILDING_LOCATIONS_IN_RECEPTION_TASK) { + Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 4).getWarehouse()); + Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 5).getWarehouse()); + Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 6).getWarehouse()); + Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 7).getWarehouse()); + Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 8).getWarehouse()); + Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 9).getWarehouse()); + Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 10).getWarehouse()); + + } + for (Location location : receptionTask.getLocations()) { if (log.isDebugEnabled()) {

1 0

Jenkins build became unstable: franciaflex-magalie » MagaLiE :: Services #86
by admin+hudson＠codelutin.com 11 Jul '13

11 Jul '13

See <http://ci.nuiton.org/jenkins/job/franciaflex-magalie/com.franciaflex$magali…>

1 1

r300 - 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 11 Jul '13

11 Jul '13

Author: bleny Date: 2013-07-11 12:56:35 +0200 (Thu, 11 Jul 2013) New Revision: 300 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes focus on destinationBarcode in storage-transfer-input.jsp, count storage actual stored quantity Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java 2013-07-10 07:43:29 UTC (rev 299) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java 2013-07-11 10:56:35 UTC (rev 300) @@ -23,9 +23,11 @@ * #L% */ +import com.franciaflex.magalie.persistence.JpaMagaliePersistenceContext; import com.franciaflex.magalie.persistence.Locations; import com.franciaflex.magalie.persistence.StoredArticles; import com.franciaflex.magalie.persistence.dao.LocationErrorJpaDao; +import com.franciaflex.magalie.persistence.dao.StoredArticleJpaDao; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.LocationError; @@ -33,6 +35,7 @@ import com.franciaflex.magalie.persistence.entity.StoredArticle; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; +import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import org.apache.commons.logging.Log; @@ -60,6 +63,20 @@ } + public void reportError(String storedArticleId, MagalieUser magalieUser) { + + Preconditions.checkArgument(storedArticleId != null); + + JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); + + StoredArticleJpaDao storedArticleDao = persistenceContext.getStoredArticleDao(); + + StoredArticle storedArticle = storedArticleDao.findById(storedArticleId); + + reportError(storedArticle.getLocation(), storedArticle.getArticle(), magalieUser); + + } + public void reportError(Location location, Article article, MagalieUser magalieUser, Date reportDate) { LocationErrorJpaDao locationErrorDao = serviceContext.getPersistenceContext().getLocationErrorDao(); 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-10 07:43:29 UTC (rev 299) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-07-11 10:56:35 UTC (rev 300) @@ -30,7 +30,6 @@ import com.franciaflex.magalie.persistence.dao.StorageMovementDao; import com.franciaflex.magalie.persistence.dao.StorageMovementJpaDao; import com.franciaflex.magalie.persistence.dao.StoredArticleDao; -import com.franciaflex.magalie.persistence.dao.StoredArticleJpaDao; import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.Company; import com.franciaflex.magalie.persistence.entity.Location; @@ -122,20 +121,6 @@ return Lists.newArrayList(storedArticles); } - - public StoredArticle findStoredArticle(String storedArticleId) { - - Preconditions.checkArgument(storedArticleId != null); - - JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); - - StoredArticleJpaDao storedArticleDao = persistenceContext.getStoredArticleDao(); - - StoredArticle storedArticle = storedArticleDao.findById(storedArticleId); - - return storedArticle; - } - public void confirmStorageTransfer(MagalieUser magalieUser, StoredArticle storedArticle, double quantity, Location destinationLocation) { JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-07-10 07:43:29 UTC (rev 299) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-07-11 10:56:35 UTC (rev 300) @@ -34,10 +34,12 @@ import com.franciaflex.magalie.services.service.StorageTransferService; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; +import com.google.common.collect.Iterables; 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; +import org.nuiton.jpa.api.JpaEntities; import java.util.List; @@ -105,8 +107,11 @@ storedArticles = service.getStoredArticlesInLocation(origin); if (storedArticleId != null) { - storedArticle = service.findStoredArticle(storedArticleId); + + storedArticle = Iterables.find(storedArticles, JpaEntities.entityHasId(storedArticleId)); + quantity = storedArticle.getQuantity(); + } Company company = session.getBuilding().getCompany(); @@ -240,10 +245,8 @@ MagalieUser magalieUser = session.getMagalieUser(); - storedArticle = service.findStoredArticle(storedArticleId); + locationErrorsService.reportError(storedArticleId, magalieUser); - locationErrorsService.reportError(storedArticle.getLocation(), storedArticle.getArticle(), magalieUser); - session.addMessage("L'emplacement a bien été reporté en erreur"); return ERROR; Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-10 07:43:29 UTC (rev 299) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-11 10:56:35 UTC (rev 300) @@ -31,7 +31,7 @@ bindKey("Esc", function(){ redirectTo($('#cancelLink'));}); bindKey("F5", function(){ redirectTo($('#reportErrorLink'));}); <s:if test="storedArticle != null"> - $('#storage-transfer_destinationBarCode').focus(); + $('#storage-transfer_destinationBarcode').focus(); </s:if> });

1 0

r299 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 10 Jul '13

10 Jul '13

Author: bleny Date: 2013-07-10 09:43:29 +0200 (Wed, 10 Jul 2013) New Revision: 299 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove useless Thread.sleep Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java 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-09 15:59:44 UTC (rev 298) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java 2013-07-10 07:43:29 UTC (rev 299) @@ -1,6 +1,5 @@ package com.franciaflex.magalie.web.action; -import com.franciaflex.magalie.MagalieTechnicalException; import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; @@ -38,12 +37,6 @@ @Override public String execute() throws InvalidMagalieBarcodeException { - try { - Thread.sleep(5000); - } catch (InterruptedException e) { - throw new MagalieTechnicalException(e); - } - Building building = session.getBuilding(); location = service.getLocation(locationBarcode, building);

1 0

r298 - 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 magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 09 Jul '13

09 Jul '13

Author: bleny Date: 2013-07-09 17:59:44 +0200 (Tue, 09 Jul 2013) New Revision: 298 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: use ajax request in receive-article-input to prevent loading of thousands locations Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 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-09 13:03:54 UTC (rev 297) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-09 15:59:44 UTC (rev 298) @@ -244,8 +244,7 @@ locations.addAll(locationDao.findAllWithoutReception(warehouse)); // add all locations in the same building, other warehouses - // FIXME brendan 04/07/13 re-enable - if (true) { + if (false) { // disabled, for a warehouse with 1000+ locations, can lead to a page of 1Mo+, now the locations are loaded on demand locations.addAll(locationDao.findAllWithoutReception(warehouse.getBuilding())); } Added: 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 (rev 0) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java 2013-07-09 15:59:44 UTC (rev 298) @@ -0,0 +1,59 @@ +package com.franciaflex.magalie.web.action; + +import com.franciaflex.magalie.MagalieTechnicalException; +import com.franciaflex.magalie.persistence.entity.Building; +import com.franciaflex.magalie.persistence.entity.Location; +import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; +import com.franciaflex.magalie.services.service.MagalieBarcodeService; +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="json") +}) +public class LocationJsonAction extends MagalieActionSupport{ + + protected MagalieBarcodeService service; + + protected Location location; + + protected String locationBarcode; + + protected MagalieSession session; + + public void setSession(MagalieSession session) { + this.session = session; + } + + public void setService(MagalieBarcodeService service) { + this.service = service; + } + + public void setLocationBarcode(String locationBarcode) { + this.locationBarcode = locationBarcode; + } + + @Override + public String execute() throws InvalidMagalieBarcodeException { + + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + throw new MagalieTechnicalException(e); + } + + Building building = session.getBuilding(); + + location = service.getLocation(locationBarcode, building); + + return SUCCESS; + + } + + public Location getLocation() { + return location; + } + +} Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-07-09 13:03:54 UTC (rev 297) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-07-09 15:59:44 UTC (rev 298) @@ -25,6 +25,8 @@ <head> <script> + <s:url action="location-json" id="locationJsonUrl" /> + var locationJsonUrl = '<s:property value="%{locationJsonUrl}" />'; var model = <s:property value="modelAsJson" escapeHtml="false" />; </script> <script src="<s:url value='/js/receive-article-input.js' />"></script> 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-09 13:03:54 UTC (rev 297) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-07-09 15:59:44 UTC (rev 298) @@ -43,14 +43,25 @@ }; model.getLocation = function(barcode) { + var locations = this.locations; var location; - for (var i = 0; i < this.locations.length; i++) { - if (barcode == this.locations[i].barcode) { - location = this.locations[i]; + for (var i = 0; i < locations.length; i++) { + if (barcode == locations[i].barcode) { + location = locations[i]; } } if (location == null) { // try to load it form JSON request ? + $.ajax({ + dataType: "json", + url: locationJsonUrl, + data: { locationBarcode: barcode }, + async: false, + success: function(data) { + location = data.location; + locations.push(location); + } + }); } if (location == null) { throw new ValidationError(barcode + " n'est pas le code barre d'un emplacement valide");

1 0

r297 - 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 09 Jul '13

09 Jul '13

Author: bleny Date: 2013-07-09 15:03:54 +0200 (Tue, 09 Jul 2013) New Revision: 297 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add possibility to make storage transfer to another building Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 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-09 12:20:41 UTC (rev 296) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-07-09 13:03:54 UTC (rev 297) @@ -25,12 +25,14 @@ import com.franciaflex.magalie.persistence.JpaMagaliePersistenceContext; +import com.franciaflex.magalie.persistence.dao.BuildingJpaDao; import com.franciaflex.magalie.persistence.dao.LocationJpaDao; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; import com.franciaflex.magalie.persistence.dao.StorageMovementJpaDao; import com.franciaflex.magalie.persistence.dao.StoredArticleDao; import com.franciaflex.magalie.persistence.dao.StoredArticleJpaDao; import com.franciaflex.magalie.persistence.entity.Building; +import com.franciaflex.magalie.persistence.entity.Company; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.StorageMovement; @@ -73,6 +75,19 @@ } + public Location getLocation(String buildingId, MagalieUser magalieUser, String barcode) + throws InvalidMagalieBarcodeException, InaccessibleLocationException { + + Preconditions.checkNotNull(buildingId); + + BuildingJpaDao buildingDao = serviceContext.getPersistenceContext().getBuildingDao(); + + Building building = buildingDao.findById(buildingId); + + return getLocation(building, magalieUser, barcode); + + } + public Location getLocationById(String id) { JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); @@ -154,4 +169,16 @@ } } + + public List<Building> getDestinationBuildings(Company company) { + + BuildingsService buildingsService = + serviceContext.newService(BuildingsService.class); + + List<Building> buildings = buildingsService.getAllBuildingsByCompany(company); + + return buildings; + + } + } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-07-09 12:20:41 UTC (rev 296) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-07-09 13:03:54 UTC (rev 297) @@ -24,6 +24,7 @@ */ import com.franciaflex.magalie.persistence.entity.Building; +import com.franciaflex.magalie.persistence.entity.Company; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.StoredArticle; @@ -72,6 +73,10 @@ protected double quantity; + protected String destinationBuildingId; + + protected List<Building> destinationBuildings; + public void setService(StorageTransferService service) { this.service = service; } @@ -88,12 +93,11 @@ this.originId = originId; } - @Override - public String input() { + protected void prepare() { if (log.isDebugEnabled()) { - log.debug("originId : " + originId + "\n" + - "storedArticleId : " + storedArticleId); + log.debug("originId = " + originId + + ", storedArticleId = " + storedArticleId); } origin = service.getLocationById(originId); @@ -105,9 +109,25 @@ quantity = storedArticle.getQuantity(); } + Company company = session.getBuilding().getCompany(); + + destinationBuildings = service.getDestinationBuildings(company); + + } + + @Override + public String input() { + + prepare(); + return INPUT; + } + public List<Building> getDestinationBuildings() { + return destinationBuildings; + } + public Location getOrigin() { return origin; } @@ -144,21 +164,31 @@ this.quantity = quantity; } + public String getDestinationBuildingId() { + if (destinationBuildingId == null) { + destinationBuildingId = session.getBuilding().getId(); + } + return destinationBuildingId; + } + + public void setDestinationBuildingId(String destinationBuildingId) { + this.destinationBuildingId = destinationBuildingId; + } + @Override public String execute() { if (log.isDebugEnabled()) { - log.debug("originId : " + originId + "\n" + - "storedArticleId : " + storedArticleId + "\n" + - "quantity : " + quantity + "\n" + - "destinationBarcode : " + destinationBarcode); + log.debug("originId = " + originId + + ", storedArticleId = " + storedArticleId + + ", quantity = " + quantity + + ", destinationBuildingId = " + destinationBuildingId + + ", destinationBarcode = " + destinationBarcode); } - origin = service.getLocationById(originId); + prepare(); - storedArticle = service.findStoredArticle(storedArticleId); - - if (quantity == 0) { + if ( ! (quantity > 0.)) { addFieldError("quantity", "la quantité ne doit pas être nulle"); return INPUT; } @@ -173,15 +203,13 @@ return INPUT; } - Building building = session.getBuilding(); - MagalieUser magalieUser = session.getMagalieUser(); Location destination; try { - destination = service.getLocation(building, magalieUser, destinationBarcode); + destination = service.getLocation(getDestinationBuildingId(), magalieUser, destinationBarcode); } catch (InvalidMagalieBarcodeException e) { Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-07-09 12:20:41 UTC (rev 296) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-07-09 13:03:54 UTC (rev 297) @@ -145,12 +145,14 @@ <s:property value="originLocation.warehouse.code" /> - <s:property value="originLocation.code" /> + (<s:property value="originLocation.warehouse.building.code" />) </td> <td> <s:if test="destinationLocation"> <s:property value="destinationLocation.warehouse.code" /> - <s:property value="destinationLocation.code" /> + (<s:property value="destinationLocation.warehouse.building.code" />) </s:if> </td> <td> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-09 12:20:41 UTC (rev 296) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-09 13:03:54 UTC (rev 297) @@ -101,8 +101,17 @@ <s:textfield name="quantity" label="Qté" inputAppend="%{storedArticle.article.unit}" type="number" step="any" min="0" cssClass="input-mini" /> - <s:textfield key="destinationBarcode" label="Destination" inputAppendIcon="barcode" cssClass="input-small" /> + <s:select label="Bât. dest." + key="destinationBuildingId" + list="destinationBuildings" + listKey="id" + listValue="code" + required="true" + cssClass="input-small" + /> + <s:textfield key="destinationBarcode" label="Empl. dest." inputAppendIcon="barcode" cssClass="input-small" /> + <div class="btn-group"> <s:a href="%{cancelUrl}" cssClass="btn btn-small" id="cancelLink">Quitter (Esc)</s:a>

1 0

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

09 Jul '13

Author: bleny Date: 2013-07-09 14:20:41 +0200 (Tue, 09 Jul 2013) New Revision: 296 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove namespace='/' in all s:url Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -49,30 +49,30 @@ </p> </header> -<s:url namespace="/" action="fulfil-kanban!input" id="fulfilKanbanUrl"/> +<s:url action="fulfil-kanban!input" id="fulfilKanbanUrl"/> <s:a href="%{fulfilKanbanUrl}" cssClass="btn btn-block" id="fulfilKanbanLink">Kanbans (1)</s:a> -<s:url namespace="/" action="deliver-requested-article!input" id="deliverRequestedArticleUrl"/> +<s:url action="deliver-requested-article!input" id="deliverRequestedArticleUrl"/> <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="deliverRequestedArticleLink">Listes à servir (2)</s:a> -<s:url namespace="/" action="prepare-article-reception!input" id="prepareArticleReceptionUrl"/> +<s:url action="prepare-article-reception!input" id="prepareArticleReceptionUrl"/> <s:a href="%{prepareArticleReceptionUrl}" cssClass="btn btn-block" id="prepareArticleReceptionLink" >Réceptions fournisseurs (3)</s:a> -<s:url namespace="/" action="prepare-prepared-article-reception!input" id="preparePreparedArticleReceptionUrl"/> +<s:url action="prepare-prepared-article-reception!input" id="preparePreparedArticleReceptionUrl"/> <s:a href="%{preparePreparedArticleReceptionUrl}" cssClass="btn btn-block" id="preparePreparedArticleReceptionLink" >Rangement toiles (4)</s:a> -<s:url namespace="/" action="storage-transfer-location!input" id="storageTransferUrl"/> +<s:url action="storage-transfer-location!input" id="storageTransferUrl"/> <s:a href="%{storageTransferUrl}" cssClass="btn btn-block" id="storageTransferLink" >Transfert de stock (5)</s:a> -<s:url namespace="/" action="prepare-withdraw-item!input" id="prepareWithdrawItemUrl"/> +<s:url action="prepare-withdraw-item!input" id="prepareWithdrawItemUrl"/> <s:a href="%{prepareWithdrawItemUrl}" cssClass="btn btn-block" id="prepareWithdrawItemLink" >Sorties toiles (6)</s:a> <s:if test="movementOrderResume" > - <s:url namespace="/" action="withdraw-item!input" id="movementOrderResumeUrl"> + <s:url action="withdraw-item!input" id="movementOrderResumeUrl"> <s:param name="storageMovementOrderId" value="%{movementOrderResume.id}" /> </s:url> <s:a href="%{movementOrderResumeUrl}" cssClass="btn btn-block" id="movementOrderResumeLink" >Reprendre l'ordre de mouvement (7)</s:a> </s:if> -<s:url namespace="/" action="logout" id="logoutUrl"/> +<s:url action="logout" id="logoutUrl"/> <s:a href="%{logoutUrl}" cssClass="btn btn-block" id="logoutLink" >Déconnexion (Esc)</s:a> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -33,7 +33,7 @@ <s:iterator value="companies" status="stat"> <li> <s:set var="elementCompanyId">companyId<s:property value="#stat.index" /></s:set> - <s:url namespace="/" action="login!input" id="loginUrl"> + <s:url action="login!input" id="loginUrl"> <s:param name="companyId" value="%{id}" /> </s:url> <s:if test="#stat.index < shortcuts.size()"> 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-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -34,7 +34,7 @@ <p> Vous êtes affecté à la liste <s:property value="requestedList.code" /> </p> - <s:url namespace="/" action="deliver-requested-article" id="deliverRequestedArticleUrl"> + <s:url action="deliver-requested-article" id="deliverRequestedArticleUrl"> <s:param name="listType" value="%{requestedList.listType}" /> </s:url> <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="requestedArticle" >Demander un article à servir (0)</s:a> @@ -42,7 +42,7 @@ <s:else> <s:iterator value="listTypes" var="listType" status="stat"> <s:set var="deliverRequestedArticleId">prepareArticleReceptionId<s:property value="#stat.index" /></s:set> - <s:url namespace="/" action="deliver-requested-article" id="deliverRequestedArticleUrl"> + <s:url action="deliver-requested-article" id="deliverRequestedArticleUrl"> <s:param name="listType" value="#listType" /> </s:url> <s:if test="#stat.index < shortcuts.size()"> @@ -72,5 +72,5 @@ }); </script> -<s:url namespace="/" action="remove-user-affectation" id="removeUserAffectationUrl"/> +<s:url action="remove-user-affectation" id="removeUserAffectationUrl"/> <s:a href="%{removeUserAffectationUrl}" cssClass="btn btn-block" id="removeUserAffectationLink">Changer d'activité (Esc)</s:a> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -41,7 +41,7 @@ bindKey(<s:property value="shortcuts.get(0)" />, function(){ redirectTo($('#prepareArticleReceptionLink'));}); }); </script> - <s:url namespace="/" action="prepare-article-reception" id="prepareArticleReceptionUrl" /> + <s:url action="prepare-article-reception" id="prepareArticleReceptionUrl" /> <s:a href="%{prepareArticleReceptionUrl}" id="prepareArticleReceptionLink"> (<s:property value="shortcuts.get(0)" />) Tous les fournisseurs </s:a> @@ -50,7 +50,7 @@ <s:iterator value="suppliersToReceive.suppliers" status="stat"> <li> <s:set var="prepareArticleReceptionId">prepareArticleReceptionId<s:property value="#stat.index" /></s:set> - <s:url namespace="/" action="prepare-article-reception" id="prepareArticleReceptionUrl"> + <s:url action="prepare-article-reception" id="prepareArticleReceptionUrl"> <s:param name="supplierId" value="%{id}" /> </s:url> <s:if test="#stat.index + 1 < shortcuts.size()"> @@ -75,5 +75,5 @@ </ul> </s:if> -<s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/> +<s:url action="choose-activity" id="chooseActivityUrl"/> <s:a href="%{chooseActivityUrl}" cssClass="btn" id="chooseActivityLink">Changer d'activité (Esc)</s:a> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -34,7 +34,7 @@ <ul class="oneItemPerLine"> <s:iterator value="receivedArticles" status="stat" > <s:set var="receiveArticleId">prepareArticleReceptionId<s:property value="#stat.index" /></s:set> - <s:url namespace="/" action="receive-article!input" id="receiveArticleUrl"> + <s:url action="receive-article!input" id="receiveArticleUrl"> <s:param name="storedArticleId" value="%{id}" /> </s:url> <s:if test="#stat.index < shortcuts.size()"> @@ -65,5 +65,5 @@ </s:iterator> </ul> -<s:url namespace="/" action="prepare-article-reception!input" id="prepareArticleReceptionUrl"/> +<s:url action="prepare-article-reception!input" id="prepareArticleReceptionUrl"/> <s:a href="%{prepareArticleReceptionUrl}" cssClass="btn" id="prepareArticleReceptionLink">Annuler (Esc)</s:a> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -33,7 +33,7 @@ </script> </head> -<s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/> +<s:url action="choose-activity" id="chooseActivityUrl"/> <s:form> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-withdraw-item-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-withdraw-item-input.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-withdraw-item-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -33,7 +33,7 @@ </script> </head> -<s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/> +<s:url action="choose-activity" id="chooseActivityUrl"/> <s:form> <s:textfield key="articleBarcode" label="Article" inputAppendIcon="barcode" cssClass="input-medium" /> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -367,7 +367,7 @@ <s:if test="devMode"> <p> - <s:url namespace="/" action="restore-fixtures" id="restoreFixturesUrl"/> + <s:url action="restore-fixtures" id="restoreFixturesUrl"/> <s:a href="%{restoreFixturesUrl}">Restaurer le jeu de test de départ</s:a> </p> </s:if> 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-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -28,7 +28,7 @@ <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> </head> -<s:url namespace="/" action="choose-activity" id="cancelUrl" /> +<s:url action="choose-activity" id="cancelUrl" /> <s:form> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -40,7 +40,7 @@ <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> </head> -<s:url namespace="/" action="choose-activity" id="cancelUrl" /> +<s:url action="choose-activity" id="cancelUrl" /> <header> <dl class="dl-horizontal"> @@ -63,7 +63,7 @@ <s:iterator value="storedArticles" status="stat"> <li> <s:set var="elementStoredArticleId">storedArticleId<s:property value="#stat.index" /></s:set> - <s:url namespace="/" action="storage-transfer!input" id="storageTransferNextStepUrl"> + <s:url action="storage-transfer!input" id="storageTransferNextStepUrl"> <s:param name="originId" value="%{origin.id}" /> <s:param name="storedArticleId" value="%{id}" /> </s:url> @@ -107,7 +107,7 @@ <s:a href="%{cancelUrl}" cssClass="btn btn-small" id="cancelLink">Quitter (Esc)</s:a> - <s:url namespace="/" action="storage-transfer!reportError" id="reportErrorUrl"> + <s:url action="storage-transfer!reportError" id="reportErrorUrl"> <s:param name="storedArticleId" value="%{storedArticle.id}" /> </s:url> <s:a href="%{reportErrorUrl}" cssClass="btn btn-danger btn-small" id="reportErrorLink">Anomalie (F5)</s:a> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp 2013-07-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -34,7 +34,7 @@ </script> </head> -<s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/> +<s:url action="choose-activity" id="chooseActivityUrl"/> <s:form> <s:textfield key="originBarcode" label="Emplacement de prélévement" inputAppendIcon="barcode" cssClass="input-medium" /> 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-09 12:16:49 UTC (rev 295) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-07-09 12:20:41 UTC (rev 296) @@ -50,7 +50,7 @@ <s:hidden name="confirmation" /> <div class="btn-group"> - <s:url namespace="/" action="withdraw-item!cancel" id="cancelUrl" > + <s:url action="withdraw-item!cancel" id="cancelUrl" > <s:param name="storageMovementOrderId" value="%{storageMovementOrderId}" /> </s:url> <s:a href="%{cancelUrl}" cssClass="btn btn-small" id="cancelLink" >Quitter (Esc)</s:a>

1 0

r295 - 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 09 Jul '13

09 Jul '13

Author: bleny Date: 2013-07-09 14:16:49 +0200 (Tue, 09 Jul 2013) New Revision: 295 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add a button to report error in storage transfer Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 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-05 16:14:07 UTC (rev 294) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-07-09 12:16:49 UTC (rev 295) @@ -295,8 +295,12 @@ Preconditions.checkArgument( storageMovementOrder != null, - "no storage movement order with id " + storageMovementOrderId); + "cet ordre de mouvement n'existe pas " + storageMovementOrderId); + Preconditions.checkState( + ! storageMovementOrder.isConfirmed(), + "ordre de mouvement déjà confirmé"); + StorageMovementTask storageMovementTask = new StorageMovementTask(storageMovementOrder); Article article = storageMovementOrder.getArticle(); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-07-05 16:14:07 UTC (rev 294) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-07-09 12:16:49 UTC (rev 295) @@ -29,6 +29,7 @@ import com.franciaflex.magalie.persistence.entity.StoredArticle; import com.franciaflex.magalie.services.exception.InaccessibleLocationException; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; +import com.franciaflex.magalie.services.service.LocationErrorsService; import com.franciaflex.magalie.services.service.StorageTransferService; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; @@ -44,7 +45,8 @@ */ @Results({ - @Result(name="success", type="redirectAction", params = { "actionName", "storage-transfer-location!input"}) + @Result(name="success", type="redirectAction", params = { "actionName", "storage-transfer-location!input"}), + @Result(name="error", type="redirectAction", params = { "actionName", "storage-transfer-location!input"}) }) public class StorageTransferAction extends MagalieActionSupport { @@ -54,6 +56,8 @@ protected StorageTransferService service; + protected LocationErrorsService locationErrorsService; + protected String originId; protected Location origin; @@ -72,6 +76,10 @@ this.service = service; } + public void setLocationErrorsService(LocationErrorsService locationErrorsService) { + this.locationErrorsService = locationErrorsService; + } + public void setSession(MagalieSession session) { this.session = session; } @@ -200,4 +208,18 @@ } + public String reportError() { + + MagalieUser magalieUser = session.getMagalieUser(); + + storedArticle = service.findStoredArticle(storedArticleId); + + locationErrorsService.reportError(storedArticle.getLocation(), storedArticle.getArticle(), magalieUser); + + session.addMessage("L'emplacement a bien été reporté en erreur"); + + return ERROR; + + } + } Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-05 16:14:07 UTC (rev 294) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-09 12:16:49 UTC (rev 295) @@ -28,8 +28,9 @@ <title>Transfert de stock</title> <script type="text/javascript"> $(document).ready(function () { - bindKey("Esc", function(){ redirectTo($('#CancelLink'));}); - <s:if test="storedArticle != null" > + bindKey("Esc", function(){ redirectTo($('#cancelLink'));}); + bindKey("F5", function(){ redirectTo($('#reportErrorLink'));}); + <s:if test="storedArticle != null"> $('#storage-transfer_destinationBarCode').focus(); </s:if> }); @@ -45,7 +46,7 @@ <dl class="dl-horizontal"> <dt>Source</dt> <dd><s:property value="origin.warehouse.code + origin.code" /></dd> - <s:if test="storedArticle != null" > + <s:if test="storedArticle != null"> <dt>Article</dt> <dd><s:property value="storedArticle.article.description" /></dd> <dt>Réf</dt> @@ -57,7 +58,7 @@ </header> -<s:if test="storedArticle == null" > +<s:if test="storedArticle == null"> <ul class="oneItemPerLine"> <s:iterator value="storedArticles" status="stat"> <li> @@ -81,7 +82,7 @@ </s:a> </s:if> <s:else> - <s:a href="%{storageTransferNextStepUrl}" > + <s:a href="%{storageTransferNextStepUrl}"> <s:property value="article.code" /> Qté <s:property value="quantity" /> <s:property value="article.unit" /> <s:property value="article.description" /> @@ -91,7 +92,7 @@ </s:iterator> </ul> - <s:a href="%{cancelUrl}" cssClass="btn" id="CancelLink" >Quitter (Esc)</s:a> + <s:a href="%{cancelUrl}" cssClass="btn" id="cancelLink">Quitter (Esc)</s:a> </s:if> <s:else> <s:form cssClass="form-horizontal"> @@ -103,8 +104,16 @@ <s:textfield key="destinationBarcode" label="Destination" inputAppendIcon="barcode" cssClass="input-small" /> <div class="btn-group"> - <s:a href="%{cancelUrl}" cssClass="btn" id="CancelLink" >Quitter (Esc)</s:a> - <s:submit name="" value="Valider" cssClass="btn btn-primary" /> + + <s:a href="%{cancelUrl}" cssClass="btn btn-small" id="cancelLink">Quitter (Esc)</s:a> + + <s:url namespace="/" action="storage-transfer!reportError" id="reportErrorUrl"> + <s:param name="storedArticleId" value="%{storedArticle.id}" /> + </s:url> + <s:a href="%{reportErrorUrl}" cssClass="btn btn-danger btn-small" id="reportErrorLink">Anomalie (F5)</s:a> + + <s:submit value="Suivant" cssClass="btn btn-primary btn-small" /> + </div> </s:form> </s:else>

1 0