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

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

r294 - trunk
by bleny＠users.forge.codelutin.com 05 Jul '13

05 Jul '13

Author: bleny Date: 2013-07-05 18:14:07 +0200 (Fri, 05 Jul 2013) New Revision: 294 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: use nuiton-jpa 1.0-SNAPSHOT Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-05 10:16:22 UTC (rev 293) +++ trunk/pom.xml 2013-07-05 16:14:07 UTC (rev 294) @@ -110,7 +110,7 @@ <projectId>franciaflex-magalie</projectId>  - <nuitonJpaVersion>0.1-SNAPSHOT</nuitonJpaVersion> + <nuitonJpaVersion>1.0-SNAPSHOT</nuitonJpaVersion> <nuitonWebVersion>1.14</nuitonWebVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion>

1 0

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

05 Jul '13

Author: bleny Date: 2013-07-05 12:16:22 +0200 (Fri, 05 Jul 2013) New Revision: 293 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: enable all extra locations Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.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-05 10:14:21 UTC (rev 292) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-05 10:16:22 UTC (rev 293) @@ -245,7 +245,7 @@ // add all locations in the same building, other warehouses // FIXME brendan 04/07/13 re-enable - if (false) { + if (true) { locations.addAll(locationDao.findAllWithoutReception(warehouse.getBuilding())); }

1 0

r292 - 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
by bleny＠users.forge.codelutin.com 05 Jul '13

05 Jul '13

Author: bleny Date: 2013-07-05 12:14:21 +0200 (Fri, 05 Jul 2013) New Revision: 292 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add a flag in receptionTask for when user must use an extra 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-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.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-04 14:15:09 UTC (rev 291) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-05 10:14:21 UTC (rev 292) @@ -183,47 +183,84 @@ Warehouse warehouse = storedArticle.getLocation().getWarehouse(); - List<Location> locations = findLocationsToReceiveArticle(warehouse, article); + if (log.isTraceEnabled()) { + log.trace("looking for locations to receive for " + article + " in " + warehouse); + } - return new ReceptionTask(storedArticle, quantity, locations); + LocationErrorsService locationErrorsService = + serviceContext.newService(LocationErrorsService.class); - } + Predicate<Location> isAcceptableForReception = + Predicates.and( + ImmutableSet.of( + Locations.isNotReceptionLocation(), + Locations.isNotFullLocation(), + locationErrorsService.getLocationNotReportedInErrorPredicate() + ) + ); - public ReceptionTask getReceptionTaskForPreparedArticleReception(Building building, String barcode) throws PreparedArticleReceptionAlreadyStoredException, InvalidMagalieBarcodeException { + // first step, add fixed locations for this article first - PreparedArticleReception preparedArticleReception = - getPreparedArticleReception(building, barcode); + Set<Location> preferredLocations = getPreferredLocations(warehouse, article); - JpaMagaliePersistenceContext persistenceContext = - serviceContext.getPersistenceContext(); + boolean userMustChooseExtraLocation = preferredLocations.isEmpty(); - StoredArticleJpaDao storedArticleDao = - persistenceContext.getStoredArticleDao(); + // second step, add extra locations - Article article = preparedArticleReception.getArticle(); + Set<Location> extraLocations = getExtraLocations(warehouse); - StoredArticle storedArticle = - storedArticleDao.findInReception(building, article); + Set<Location> locations = Sets.newLinkedHashSet(); - ReceptionTask receptionTask = buildReceptionTask( - storedArticle, - preparedArticleReception.getQuantity()); + Iterables.addAll(locations, Iterables.filter(preferredLocations, isAcceptableForReception)); - if (log.isInfoEnabled()) { - log.info("reception task for prepared article reception '" + barcode + "' is " + receptionTask); + 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, ", ")); } return receptionTask; } - protected List<Location> findLocationsToReceiveArticle(Warehouse warehouse, Article article) { + protected Set<Location> getExtraLocations(Warehouse warehouse) { - if (log.isTraceEnabled()) { - log.trace("looking for locations to receive for " + article + " in " + warehouse); + Set<Location> locations = Sets.newLinkedHashSet(); + + // third step, add extra locations + JpaMagaliePersistenceContext persistenceContext = + serviceContext.getPersistenceContext(); + + LocationDao locationDao = + persistenceContext.getLocationDao(); + + // TODO brendan 04/07/13 probablement l'origine du problème de performance + + // add all locations in the same warehouse + locations.addAll(locationDao.findAllWithoutReception(warehouse)); + + // add all locations in the same building, other warehouses + // FIXME brendan 04/07/13 re-enable + if (false) { + locations.addAll(locationDao.findAllWithoutReception(warehouse.getBuilding())); } + // fourth step, remove reception locations because it's stupid to + // move an article from reception location to another reception location + // also, remove full locations and locations reported in error + + return locations; + + } + + protected Set<Location> getPreferredLocations(Warehouse warehouse, Article article) { + // first step, add fixed locations for this article first + Set<Location> locations = Sets.newLinkedHashSet(); if (article.getFixedLocations() != null) { @@ -256,53 +293,35 @@ sortedStoredArticles, StoredArticles.getLocationFunction())); - // third step, add extra locations - JpaMagaliePersistenceContext persistenceContext = - serviceContext.getPersistenceContext(); + return locations; - LocationDao locationDao = - persistenceContext.getLocationDao(); + } - // TODO brendan 04/07/13 probablement l'origine du problème de performance + public ReceptionTask getReceptionTaskForPreparedArticleReception(Building building, String barcode) throws PreparedArticleReceptionAlreadyStoredException, InvalidMagalieBarcodeException { - // add all locations in the same warehouse - locations.addAll(locationDao.findAllWithoutReception(warehouse)); + PreparedArticleReception preparedArticleReception = + getPreparedArticleReception(building, barcode); - // add all locations in the same building, other warehouses - // FIXME brendan 04/07/13 re-enable - // locations.addAll(locationDao.findAllWithoutReception(warehouse.getBuilding())); + JpaMagaliePersistenceContext persistenceContext = + serviceContext.getPersistenceContext(); - // fourth step, remove reception locations because it's stupid to - // move an article from reception location to another reception location - // also, remove full locations and locations reported in error + StoredArticleJpaDao storedArticleDao = + persistenceContext.getStoredArticleDao(); - LocationErrorsService locationErrorsService = - serviceContext.newService(LocationErrorsService.class); + Article article = preparedArticleReception.getArticle(); - Predicate<Location> isAcceptableForReception = - Predicates.and( - ImmutableSet.of( - Locations.isNotReceptionLocation(), - Locations.isNotFullLocation(), - locationErrorsService.getLocationNotReportedInErrorPredicate() - ) - ); + StoredArticle storedArticle = + storedArticleDao.findInReception(building, article); - List<Location> result = - Lists.newArrayList( - Iterables.filter( - locations, - isAcceptableForReception - ) - ); + ReceptionTask receptionTask = buildReceptionTask( + storedArticle, + preparedArticleReception.getQuantity()); - if (log.isDebugEnabled()) { - log.debug(result.size() + " locations to receive articles for article " - + article + " in warehouse " + warehouse + " are " - + StringUtils.join(result, ", ")); + if (log.isInfoEnabled()) { + log.info("reception task for prepared article reception '" + barcode + "' is " + receptionTask); } - return result; + 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-04 14:15:09 UTC (rev 291) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java 2013-07-05 10:14:21 UTC (rev 292) @@ -26,31 +26,39 @@ import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.StoredArticle; -import java.util.List; +import java.util.Set; public class ReceptionTask { + protected boolean userMustChooseExtraLocation; + protected StoredArticle storedArticle; protected double quantity; - protected List<Location> locations; + protected Set<Location> locations; - public ReceptionTask(StoredArticle storedArticle, double quantity, List<Location> locations) { + public ReceptionTask(StoredArticle storedArticle, double quantity, Set<Location> locations, boolean userMustChooseExtraLocation) { this.storedArticle = storedArticle; this.quantity = quantity; this.locations = locations; + this.userMustChooseExtraLocation = userMustChooseExtraLocation; } public StoredArticle getStoredArticle() { return storedArticle; } - public List<Location> getLocations() { + public Set<Location> getLocations() { return locations; } public double getQuantity() { return quantity; } + + public boolean isUserMustChooseExtraLocation() { + return userMustChooseExtraLocation; + } + } 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-04 14:15:09 UTC (rev 291) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-07-05 10:14:21 UTC (rev 292) @@ -53,6 +53,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Set; public class ReceptionServiceTest extends AbstractMagalieServiceTest { @@ -135,21 +136,21 @@ Location fixedLocation = Iterables.getOnlyElement(article.getFixedLocations()); // fixed location - Assert.assertEquals(fixedLocation, receptionTask.getLocations().get(0)); + Assert.assertEquals(fixedLocation, Iterables.get(receptionTask.getLocations(), 0)); // locations of the same warehouse - Assert.assertEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(1).getWarehouse()); - Assert.assertEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(2).getWarehouse()); - Assert.assertEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(3).getWarehouse()); + Assert.assertEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 1).getWarehouse()); + Assert.assertEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 2).getWarehouse()); + Assert.assertEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 3).getWarehouse()); // locations in another warehouse last - Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(4).getWarehouse()); - Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(5).getWarehouse()); - Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(6).getWarehouse()); - Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(7).getWarehouse()); - Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(8).getWarehouse()); - Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(9).getWarehouse()); - Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(10).getWarehouse()); + 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()) { @@ -282,7 +283,7 @@ // just store the whole quantity in the first location given Map<String, Double> locationIdToStoredQuantities = ImmutableMap.of( - receptionTask.getLocations().get(0).getId(), + Iterables.get(receptionTask.getLocations(), 0).getId(), receptionTask.getQuantity()); receptionConfirmation.setLocationIdToStoredQuantities(locationIdToStoredQuantities); @@ -345,9 +346,15 @@ transaction.commit(); + List<StoredArticle> receivedArticles = + service.getReceivedArticles(building, supplier.getId()); + + StoredArticle receivedArticle = + Iterables.getOnlyElement(receivedArticles); + long time = System.currentTimeMillis(); - List<Location> locations = service.findLocationsToReceiveArticle(u02, article); + Set<Location> locations = service.getReceptionTask(receivedArticle.getId()).getLocations(); if (log.isTraceEnabled()) { log.trace("getting a result of " + locations.size() + 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-04 14:15:09 UTC (rev 291) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-07-05 10:14:21 UTC (rev 292) @@ -98,6 +98,12 @@ receptionTask = service.getReceptionTaskForPreparedArticleReception(building, preparedArticleReceptionBarcode); + if (receptionTask.isUserMustChooseExtraLocation()) { + + addActionMessage("Pas de stock : emplacement libre proposé"); + + } + } catch (PreparedArticleReceptionAlreadyStoredException e) { session.addMessage("Article déjà rangé");

1 0