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/revisions... 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> });