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

r383 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/main/java/com/franciaflex/magalie/services magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/test/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web
by bleny＠users.forge.codelutin.com 28 Aug '13

28 Aug '13

Author: bleny Date: 2013-08-28 11:27:04 +0200 (Wed, 28 Aug 2013) New Revision: 383 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: update file headers Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUserNotificationContext.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionLocation.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/StorageTransferServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.java 2013-08-28 09:23:52 UTC (rev 382) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.java 2013-08-28 09:27:04 UTC (rev 383) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.entity; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + public enum DeliveredRequestedListStatus { PENDING, Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUserNotificationContext.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUserNotificationContext.java 2013-08-28 09:23:52 UTC (rev 382) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUserNotificationContext.java 2013-08-28 09:27:04 UTC (rev 383) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.services; +/* + * #%L + * MagaLiE :: Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList; import com.franciaflex.magalie.persistence.entity.MagalieUser; Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionLocation.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionLocation.java 2013-08-28 09:23:52 UTC (rev 382) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionLocation.java 2013-08-28 09:27:04 UTC (rev 383) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.services.service; +/* + * #%L + * MagaLiE :: Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.Warehouse; Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/StorageTransferServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/StorageTransferServiceTest.java 2013-08-28 09:23:52 UTC (rev 382) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/StorageTransferServiceTest.java 2013-08-28 09:27:04 UTC (rev 383) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.services.service; +/* + * #%L + * MagaLiE :: Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java 2013-08-28 09:23:52 UTC (rev 382) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java 2013-08-28 09:27:04 UTC (rev 383) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.web; +/* + * #%L + * MagaLiE :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.services.MagalieUserNotificationContext;

1 0

r382 - trunk/magalie-web
by bleny＠users.forge.codelutin.com 28 Aug '13

28 Aug '13

Author: bleny Date: 2013-08-28 11:23:52 +0200 (Wed, 28 Aug 2013) New Revision: 382 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove unused dependency in web module Modified: trunk/magalie-web/pom.xml Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-08-28 09:11:31 UTC (rev 381) +++ trunk/magalie-web/pom.xml 2013-08-28 09:23:52 UTC (rev 382) @@ -87,11 +87,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency>

1 0

r381 - trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 28 Aug '13

28 Aug '13

Author: bleny Date: 2013-08-28 11:11:31 +0200 (Wed, 28 Aug 2013) New Revision: 381 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix test Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 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-08-27 16:47:15 UTC (rev 380) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-08-28 09:11:31 UTC (rev 381) @@ -140,7 +140,7 @@ Location fixedLocation = Iterables.getOnlyElement(article.getFixedLocations()); // fixed location - Assert.assertEquals(fixedLocation, Iterables.get(receptionTask.getLocations(), 0)); + Assert.assertEquals(fixedLocation, Iterables.get(receptionTask.getLocations(), 0).location); // locations of the same warehouse Assert.assertEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 1).getWarehouse());

1 0

r380 - in trunk/magalie-web/src/main/webapp: WEB-INF/content css
by bleny＠users.forge.codelutin.com 27 Aug '13

27 Aug '13

Author: bleny Date: 2013-08-27 18:47:15 +0200 (Tue, 27 Aug 2013) New Revision: 380 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2997 show button to report error Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 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-08-27 16:41:08 UTC (rev 379) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-08-27 16:47:15 UTC (rev 380) @@ -66,14 +66,12 @@ <s:textfield name="quantity" label="Qté" inputAppend="%{article.unit}" cssClass="input-mini" /> <s:hidden name="confirmation" /> - <div class="btn-group"> - <s:url action="withdraw-item!cancel" id="cancelUrl" /> - <s:a href="%{cancelUrl}" cssClass="btn btn-mini" id="cancelLink" >Abandon (Esc)</s:a> - <div style="display: none"> - <input type="button" id="reportError" value="Ano. (F5)" class="btn btn-danger btn-mini" /> - </div> + <div style="width: 180px"> <s:submit name="next" value="Suivant (⏎)" cssClass="btn btn-primary btn-mini" /> <input type="button" id="confirm" value="Terminer (F4)" class="btn btn-success btn-mini" /> + <input type="button" id="reportError" value="Ano. (F5)" class="btn btn-danger btn-mini" /> + <s:url action="withdraw-item!cancel" id="cancelUrl" /> + <s:a href="%{cancelUrl}" cssClass="btn btn-mini" id="cancelLink" >Abandon (Esc)</s:a> </div> </s:form> <div id="storageMovementTemplate" class="template"> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-08-27 16:41:08 UTC (rev 379) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-08-27 16:47:15 UTC (rev 380) @@ -64,11 +64,14 @@ margin-bottom: 0px; } -#locations, -#storageMovements { +#locations { min-height: 80px; /* 4 * 20px for each element */ } +#storageMovements { + min-height: 60px; /* 3 * 20px for each element */ +} + #storageMovements div, #locations dl { margin: 0;

1 0

r379 - 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/css magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 27 Aug '13

27 Aug '13

Author: bleny Date: 2013-08-27 18:41:08 +0200 (Tue, 27 Aug 2013) New Revision: 379 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2992 fixes #2993 reuse withdraw item UI in reception to add a confirm and cancel buttons Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 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-08-27 09:03:16 UTC (rev 378) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-08-27 16:41:08 UTC (rev 379) @@ -352,7 +352,6 @@ Location destinationLocation = locationDao.findById(locationToStoredQuantity.getKey()); - // TODO brendan 25/07/13 what if destination.isFullLocation ? storageMovement.setDestinationLocation(destinationLocation); storageMovement.setMagalieUser(magalieUser); @@ -361,8 +360,16 @@ storageMovement.setActualQuantity(locationToStoredQuantity.getValue()); + storageMovement.setMovementDate(now); + storageMovement.setConfirmDate(now); + if (log.isWarnEnabled()) { + if (destinationLocation.isFullLocation()) { + log.warn("stored article in full destination location, should never occur " + storageMovement); + } + } + storageMovementDao.persist(storageMovement); storageMovements.add(storageMovement); @@ -459,8 +466,7 @@ /** * On cherche à savoir si pour un storedArticle donné, il y a encore des articles à recevoir pour le même fournisseur */ - public Optional<Supplier> isSupplierHaveOtherArticlesToReceive(Building building, String - storedArticleId) { + public Optional<Supplier> isSupplierHaveOtherArticlesToReceive(Building building, String storedArticleId) { JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java 2013-08-27 09:03:16 UTC (rev 378) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java 2013-08-27 16:41:08 UTC (rev 379) @@ -30,6 +30,7 @@ import com.franciaflex.magalie.web.Activity; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; +import com.google.common.base.Strings; import java.util.List; @@ -46,7 +47,7 @@ protected SuppliersToReceive suppliersToReceive; public void setSupplierId(String supplierId) { - this.supplierId = supplierId; + this.supplierId = Strings.emptyToNull(supplierId); } public void setService(ReceptionService service) { 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-08-27 09:03:16 UTC (rev 378) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-08-27 16:41:08 UTC (rev 379) @@ -29,6 +29,7 @@ import com.franciaflex.magalie.persistence.entity.Supplier; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; +import com.franciaflex.magalie.services.service.ArticleStorageService; import com.franciaflex.magalie.services.service.ReceptionConfirmation; import com.franciaflex.magalie.services.service.ReceptionService; import com.franciaflex.magalie.services.service.ReceptionTask; @@ -61,6 +62,8 @@ protected ReceptionService service; + protected ArticleStorageService articleStorageService; + protected String storedArticleId; protected String preparedArticleReceptionBarcode; @@ -79,6 +82,10 @@ this.service = service; } + public void setArticleStorageService(ArticleStorageService articleStorageService) { + this.articleStorageService = articleStorageService; + } + public void setStoredArticleId(String storedArticleId) { this.storedArticleId = storedArticleId; } @@ -132,10 +139,20 @@ } + Supplier supplier = receptionTask.getStoredArticle().getArticle().getSupplier(); + + if (supplier != null) { + supplierId = supplier.getId(); + } + return INPUT; } + public String getSupplierId() { + return supplierId; + } + public ReceptionTask getReceptionTask() { return receptionTask; } @@ -209,8 +226,31 @@ } - public String getSupplierId() { - return supplierId; + public void setSupplierId(String supplierId) { + this.supplierId = supplierId; } + public String cancel() { + + MagalieUser magalieUser = session.getMagalieUser(); + + // pas besoin, on stocke pas de mouvements non confirmés + // articleStorageService.cancelStorageMovements(magalieUser); + + String result; + + if (Activity.PREPARED_RECEPTIONS.equals(session.getActivity())) { + + result = Activity.PREPARED_RECEPTIONS.name(); + + } else { + + result = "REDIRECT_TO_ARTICLES"; + + } + + return result; + + } + } 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-08-27 09:03:16 UTC (rev 378) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-08-27 16:41:08 UTC (rev 379) @@ -55,11 +55,15 @@ <s:textfield name="locationBarcode" label="Empl." inputAppendIcon="barcode" cssClass="input-small" /> <s:textfield name="quantity" label="Qté" inputAppend="%{receptionTask.storedArticle.article.unit}" cssClass="input-mini" /> <s:hidden name="preparedArticleReceptionBarcode" value="%{preparedArticleReceptionBarcode}" /> + <s:hidden name="supplierId" value="%{supplierId}" /> <s:hidden name="confirmation" /> - <div class="btn-group"> - <input type="button" name="full" value="Plein (F5)" class="btn btn-danger btn-small" id="receive-article_full" /> - <s:submit name="next" value="Suivant" cssClass="btn btn-primary btn-small" /> + <div style="width: 180px"> + <s:url action="receive-article!cancel" id="cancelUrl" /> + <s:a href="%{cancelUrl}" cssClass="btn btn-mini" id="cancelLink">Abandon (Esc)</s:a> + <input type="button" name="full" value="Plein (F5)" class="btn btn-danger btn-mini" id="receive-article_full" /> + <s:submit name="next" value="Suivant (⏎)" cssClass="btn btn-primary btn-mini" /> + <input type="button" id="confirm" value="Terminer (F4)" class="btn btn-success btn-mini" /> </div> </s:form> <div id="locationTemplate" class="template"> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-08-27 09:03:16 UTC (rev 378) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-08-27 16:41:08 UTC (rev 379) @@ -64,10 +64,7 @@ margin-bottom: 0px; } -#locations { - min-height: 100px; /* 5 * 20px for each element */ -} - +#locations, #storageMovements { min-height: 80px; /* 4 * 20px for each element */ } Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-08-27 09:03:16 UTC (rev 378) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-08-27 16:41:08 UTC (rev 379) @@ -97,9 +97,6 @@ } model.getConfirmation = function() { - if (this.remainingQuantity() > 0.) { - throw new Error("Tout n'a pas été stocké"); - } var locationIdToStoredQuantities = {}; $.each(model.locations, function(key, location) { if (location.used && location.stored > 0.) { @@ -113,6 +110,20 @@ return confirmation; } +model.newEmptyStorageMovementForNextLocation = function() { + var quantityIsRemaining = model.remainingQuantity() > 0.; + var allIsUsed = true; + for (var i = 0; i < this.locations.length; i++) { + if ( ! this.locations[i].used) { + allIsUsed = false; + } + } + var proposeAnotherLocation = quantityIsRemaining && allIsUsed; + if (proposeAnotherLocation) { + this.locationsIndex += 1; + } +} + var view = { refreshSummary : function() { @@ -160,19 +171,10 @@ } }, - refreshButtons : function() { - if (model.allowSubmit) { - $('#receive-article_next').val('Terminer').removeClass('btn-primary').addClass('btn-success'); - } else { - $('#receive-article_next').val('Suivant').removeClass('btn-success').addClass('btn-primary'); - } - }, - refresh : function() { this.refreshSummary(); this.refreshLocations(); this.refreshForm(); - this.refreshButtons(); $('#receive-article_locationBarcode').focus(); } @@ -180,26 +182,65 @@ var controller = { + onShowFirstLocation : function () { + + model.newEmptyStorageMovementForNextLocation(); + + }, + + next : function(full) { + + var barcode = $('#receive-article_locationBarcode').val(); + + var quantity; + if (full) { + quantity = 0; + } else { + quantity = parseFloat($('#receive-article_quantity').val()); + } + + model.store(barcode, quantity); + + // if used location focused as current, highlight next location to go + if (barcode == model.locations[model.locationsIndex].barcode) { + model.nextLocation(); + } + + view.refresh(); + + }, + onNext : function() { try { - if (model.allowSubmit) { + controller.next(false); + model.newEmptyStorageMovementForNextLocation(); + + view.refresh(); + + } catch (ex) { + + if (ex instanceof ValidationError) { + handleValidationError(ex); } else { + throw ex; + } + } - var barcode = $('#receive-article_locationBarcode').val(); - var quantity = parseFloat($('#receive-article_quantity').val()); + }, - model.store(barcode, quantity); + onReportError : function() { - // if used location focused as current, highlight next location to go - if (barcode == model.locations[model.locationsIndex].barcode) { - model.nextLocation(); - } + try { - } + controller.next(true); + model.newEmptyStorageMovementForNextLocation(); + + view.refresh(); + } catch (ex) { if (ex instanceof ValidationError) { @@ -208,27 +249,47 @@ throw ex; } } + }, - onReportError : function() { + onConfirm : function() { try { - if (model.allowSubmit) { + var barcode = $('#receive-article_locationBarcode').val(); - } else { + if (barcode.length > 0) { - var barcode = $('#receive-article_locationBarcode').val(); + controller.next(false); - model.store(barcode, 0.); + } - // if used location focused as current, highlight next location to go - if (barcode == model.locations[model.locationsIndex].barcode) { - model.nextLocation(); + var confirmation = model.getConfirmation(); + + var storageMovementCount = Object.keys(confirmation.locationIdToStoredQuantities).length; + + if (storageMovementCount > 0) { + + var confirmMessage = 'Confirmer ' + storageMovementCount + ' mouvements ?'; + + if (confirm(confirmMessage)) { + + // push model as Json in a hidden field + $('#receive-article_confirmation').val(JSON.stringify(confirmation)); + + model.forceConfirm = true; + + $('#receive-article').submit(); + + } else { + + model.newEmptyStorageMovementForNextLocation(); + + view.refresh(); + } } - view.refresh(); } catch (ex) { @@ -237,31 +298,62 @@ } else { throw ex; } + } + }, + onCancel : function(e) { + + var confirmation = model.getConfirmation(); + + var confirmMessage = 'Annuler ' + Object.keys(confirmation.locationIdToStoredQuantities).length + ' mouvements ?'; + + var redirect = confirmation.locationIdToStoredQuantities.length == 0 + || confirm(confirmMessage); + + if (redirect) { + + redirectTo($('#cancelLink')); + + } else { + + if (e) { + e.preventDefault(); + } + + } + + }, + onSubmit : function(e) { - if (model.allowSubmit) { - // push model as Json in a hidden field - $('#receive-article_confirmation').val(JSON.stringify(model.getConfirmation())); + + if (model.forceConfirm) { + } else { + e.preventDefault(); - if (model.canTerminate()) { - model.allowSubmit = true; - } + } - view.refresh(); - } } }; // bindings $(document).ready(function() { + $('#receive-article').submit(controller.onSubmit); $('#receive-article_full').click(controller.onReportError); $('#receive-article_next').click(controller.onNext); + $('#confirm').click(controller.onConfirm); + $('#cancelLink').click(controller.onCancel); + + bindKey('F1', controller.onConfirm); + bindKey('F4', controller.onConfirm); bindKey('F5', controller.onReportError); + bindKey('Esc', controller.onCancel); + view.refresh(); + });

1 0

r378 - trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 27 Aug '13

27 Aug '13

Author: bleny Date: 2013-08-27 11:03:16 +0200 (Tue, 27 Aug 2013) New Revision: 378 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix typo in logging statement in ReceptionService 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-08-27 08:53:32 UTC (rev 377) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-08-27 09:03:16 UTC (rev 378) @@ -136,8 +136,8 @@ List<StoredArticle> result = Lists.newArrayList(receivedArticles); if (log.isTraceEnabled()) { - log.trace(result.size() + "stored articles found in reception for building " - + building + " and supplierId " + supplierId + ": \n" + log.trace(result.size() + " stored articles found in reception for building " + + building + " and supplierId " + supplierId + ": " + result); }

1 0

r377 - trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 27 Aug '13

27 Aug '13

Author: bleny Date: 2013-08-27 10:53:32 +0200 (Tue, 27 Aug 2013) New Revision: 377 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add logs in ArticleStorageService 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/RealTimeStorageMovementTask.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-08-27 08:45:30 UTC (rev 376) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-08-27 08:53:32 UTC (rev 377) @@ -301,8 +301,8 @@ } - if (log.isDebugEnabled()) { - log.debug("cancelled " + unconfirmedStorageMovements.size() + + if (log.isInfoEnabled()) { + log.info("cancelled " + unconfirmedStorageMovements.size() + " storage movements " + unconfirmedStorageMovements); } @@ -405,6 +405,10 @@ } + if (log.isInfoEnabled()) { + log.info("will return real time storage movement task " + realTimeStorageMovementTask); + } + return realTimeStorageMovementTask; } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RealTimeStorageMovementTask.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RealTimeStorageMovementTask.java 2013-08-27 08:45:30 UTC (rev 376) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RealTimeStorageMovementTask.java 2013-08-27 08:53:32 UTC (rev 377) @@ -25,6 +25,7 @@ import com.franciaflex.magalie.persistence.entity.StoredArticle; import com.google.common.base.Preconditions; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; public class RealTimeStorageMovementTask { @@ -67,4 +68,10 @@ public boolean isSuccess() { return storedArticle != null; } + + @Override + public String toString() { + return ReflectionToStringBuilder.toString(this); + } + }

1 0

r376 - trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 27 Aug '13

27 Aug '13

Author: bleny Date: 2013-08-27 10:45:30 +0200 (Tue, 27 Aug 2013) New Revision: 376 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix tests compilation Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 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-08-26 15:58:30 UTC (rev 375) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-08-27 08:45:30 UTC (rev 376) @@ -147,7 +147,7 @@ Assert.assertEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 2).getWarehouse()); Assert.assertEquals(receivedArticle.getLocation().getWarehouse(), Iterables.get(receptionTask.getLocations(), 3).getWarehouse()); - for (Location location : receptionTask.getLocations()) { + for (ReceptionLocation location : receptionTask.getLocations()) { if (log.isDebugEnabled()) { log.debug("location " + location.getBarcode()); @@ -349,7 +349,7 @@ long time = System.currentTimeMillis(); - Set<Location> locations = service.getReceptionTask(receivedArticle.getId()).getLocations(); + Set<ReceptionLocation> locations = service.getReceptionTask(receivedArticle.getId()).getLocations(); if (log.isTraceEnabled()) { log.trace("getting a result of " + locations.size() +

1 0

r375 - 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/css
by bleny＠users.forge.codelutin.com 26 Aug '13

26 Aug '13

Author: bleny Date: 2013-08-26 17:58:30 +0200 (Mon, 26 Aug 2013) New Revision: 375 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2998 show listCode on withdraw screen, after confirmation of withdraw for requestedArticle jump to another requestedArticle Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-08-26 10:09:03 UTC (rev 374) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-08-26 15:58:30 UTC (rev 375) @@ -467,7 +467,7 @@ } - public RequestedList getAffectationForUser(MagalieUser magalieUser) { + public Optional<RequestedList> getAffectationForUser(MagalieUser magalieUser) { JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); @@ -475,15 +475,19 @@ DeliveredRequestedList deliveredRequestedList = dao.findByAffectedTo(magalieUser); - RequestedList requestedList = null; + Optional<RequestedList> affectationForUser; - if (deliveredRequestedList != null) { + if (deliveredRequestedList == null) { - requestedList = deliveredRequestedList.getRequestedList(); + affectationForUser = Optional.absent(); + } else { + + affectationForUser = Optional.of(deliveredRequestedList.getRequestedList()); + } - return requestedList; + return affectationForUser; } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-26 10:09:03 UTC (rev 374) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-26 15:58:30 UTC (rev 375) @@ -32,7 +32,9 @@ import com.franciaflex.magalie.web.Activity; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; +import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import com.opensymphony.xwork2.Preparable; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.convention.annotation.Result; @@ -43,7 +45,7 @@ @Results({ @Result(name="success", type="redirectAction", params = { "actionName", "withdraw-item!input", "requestedArticleId", "${requestedArticleId}" }) }) -public class DeliverRequestedArticleAction extends MagalieActionSupport { +public class DeliverRequestedArticleAction extends MagalieActionSupport implements Preparable { private static final Log log = LogFactory.getLog(DeliverRequestedArticleAction.class); @@ -68,16 +70,27 @@ } @Override - public String input() { + public void prepare() { MagalieUser magalieUser = session.getMagalieUser(); - requestedList = service.getAffectationForUser(magalieUser); + Optional<RequestedList> affectationForUser = service.getAffectationForUser(magalieUser); + if (affectationForUser.isPresent()) { + + requestedList = affectationForUser.get(); + + } + Building building = session.getBuilding(); listTypes = service.getListTypes(building); + } + + @Override + public String input() { + return INPUT; } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-26 10:09:03 UTC (rev 374) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-26 15:58:30 UTC (rev 375) @@ -47,7 +47,7 @@ @Results({ @Result(name="KANBANS", type="redirectAction", params = { "actionName", "fulfil-kanban!input" }), - @Result(name="REQUESTED_LISTS", type="redirectAction", params = { "actionName", "deliver-requested-article!input" }) + @Result(name="REQUESTED_LISTS", type="redirectAction", params = { "actionName", "deliver-requested-article", "listType", "%{listType}" }) }) public class WithdrawItemAction extends MagalieActionSupport implements Preparable { @@ -71,6 +71,10 @@ protected Article article; + protected String requestedListCode; + + protected String listType; + public void setArticleId(String articleId) { this.articleId = articleId; } @@ -120,6 +124,8 @@ articleId = article.getId(); + requestedListCode = requestedArticle.getRequestedList().getCode(); + } Preconditions.checkNotNull(articleId); @@ -144,6 +150,10 @@ return expectedQuantity; } + public String getRequestedListCode() { + return requestedListCode; + } + public String getModelAsJson() throws JSONException { Map<String,Object> model = Maps.newHashMap(); @@ -195,12 +205,25 @@ articleStorageService.confirmStorageMovement(confirmation, magalieUser); + if (confirmation.getRequestedArticleId() != null) { + + RequestedArticle requestedArticle = + requestedArticleService.getRequestedArticle(confirmation.getRequestedArticleId()); + + listType = requestedArticle.getRequestedList().getListType(); + + } + String resultName = session.getActivity().name(); return resultName; } + public String getListType() { + return listType; + } + public String cancel() { MagalieUser magalieUser = session.getMagalieUser(); 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-08-26 10:09:03 UTC (rev 374) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-08-26 15:58:30 UTC (rev 375) @@ -46,6 +46,12 @@ <s:a href="%{removeUserAffectationUrl}" cssClass="btn btn-block" id="removeUserAffectationLink">Abandonner la liste (Esc)</s:a> </s:if> <s:else> + <script type="text/javascript"> + $(document).ready(function () { + bindKey('Esc', function(){ redirectTo($('#removeUserAffectationLink'));}); + }); + </script> + <s:if test="listTypes.empty"> Aucune liste à servir à traiter </s:if> 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-08-26 10:09:03 UTC (rev 374) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-08-26 15:58:30 UTC (rev 375) @@ -38,6 +38,11 @@ <header> <ul class="oneItemPerLine"> + <s:if test="%{requestedListCode != null}"> + <li> + Liste : <s:property value="requestedListCode" /> + </li> + </s:if> <li> Réf. : <s:property value="article.code" /> </li> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-08-26 10:09:03 UTC (rev 374) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-08-26 15:58:30 UTC (rev 375) @@ -64,11 +64,14 @@ margin-bottom: 0px; } -#storageMovements, #locations { min-height: 100px; /* 5 * 20px for each element */ } +#storageMovements { + min-height: 80px; /* 4 * 20px for each element */ +} + #storageMovements div, #locations dl { margin: 0;

1 0

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

26 Aug '13

Author: bleny Date: 2013-08-26 12:09:03 +0200 (Mon, 26 Aug 2013) New Revision: 374 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2991 show already stored quantity Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionLocation.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/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/LocationJsonAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionLocation.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionLocation.java (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionLocation.java 2013-08-26 10:09:03 UTC (rev 374) @@ -0,0 +1,52 @@ +package com.franciaflex.magalie.services.service; + +import com.franciaflex.magalie.persistence.entity.Location; +import com.franciaflex.magalie.persistence.entity.Warehouse; + +public class ReceptionLocation { + + protected Location location; + + protected double alreadyStoredQuantity; + + public ReceptionLocation(Location location) { + this.location = location; + } + + public String getBarcode() { + return location.getBarcode(); + } + + public String getCode() { + return location.getCode(); + } + + public boolean isRequiredCraneMan() { + return location.isRequiredCraneMan(); + } + + public Warehouse getWarehouse() { + return location.getWarehouse(); + } + + public boolean isFullLocation() { + return location.isFullLocation(); + } + + public int getRequiredAccreditationLevel() { + return location.getRequiredAccreditationLevel(); + } + + public String getId() { + return location.getId(); + } + + public double getAlreadyStoredQuantity() { + return alreadyStoredQuantity; + } + + public void setAlreadyStoredQuantity(double alreadyStoredQuantity) { + this.alreadyStoredQuantity = alreadyStoredQuantity; + } + +} 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-08-21 13:59:15 UTC (rev 373) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-08-26 10:09:03 UTC (rev 374) @@ -52,9 +52,11 @@ import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; import org.apache.commons.lang3.StringUtils; @@ -195,6 +197,10 @@ LocationErrorsService locationErrorsService = serviceContext.newService(LocationErrorsService.class); + // a predicate to 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 + Predicate<Location> isAcceptableForReception = Predicates.and( ImmutableSet.of( @@ -204,24 +210,39 @@ ) ); + ReceptionTask receptionTask = new ReceptionTask(storedArticle, quantity); + // first step, add fixed locations for this article first - Set<Location> preferredLocations = getPreferredLocations(warehouse, article); + Set<Location> fixedLocations = article.getFixedLocationsInBuilding(warehouse.getBuilding()); - Iterable<Location> acceptablePreferredLocations = Iterables.filter(preferredLocations, isAcceptableForReception); + Iterable<Location> acceptableFixedLocations = Iterables.filter(fixedLocations, isAcceptableForReception); - // second step, add extra locations + receptionTask.setFixedLocations(acceptableFixedLocations); + // second step, add locations with already stored quantities + + Set<StoredArticle> alreadyUsedLocations = getAlreadyUsedLocations(warehouse, article); + + Iterable<StoredArticle> acceptableAlreadyUsedLocations = + Iterables.filter( + alreadyUsedLocations, + Predicates.compose(isAcceptableForReception, StoredArticles.getLocationFunction())); + + receptionTask.setAlreadyUsedLocations(acceptableAlreadyUsedLocations); + + // third step, add extra locations + Set<Location> extraLocations = getExtraLocations(warehouse); Iterable<Location> acceptableExtraLocations = Iterables.filter(extraLocations, isAcceptableForReception); - ReceptionTask receptionTask = new ReceptionTask(storedArticle, quantity, acceptablePreferredLocations, acceptableExtraLocations); + receptionTask.setExtraLocations(acceptableExtraLocations); if (log.isDebugEnabled()) { log.debug("locations to receive articles for article " + article + " in warehouse " + warehouse + " are acceptable = " - + StringUtils.join(acceptablePreferredLocations, ", ") + + + StringUtils.join(acceptableAlreadyUsedLocations, ", ") + " extra = " + StringUtils.join(acceptableExtraLocations, ", ")); } @@ -243,27 +264,15 @@ // add all locations in the same warehouse locations.addAll(locationDao.findAllWithoutReception(warehouse, LIMIT_EXTRA_LOCATIONS_TO_50)); - // 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) { + protected Set<StoredArticle> getAlreadyUsedLocations(Warehouse warehouse, Article article) { - // first step, add fixed locations for this article first + // add locations where there is already quantities stored + // we will suggest locations with highest quantities first - Set<Location> locations = Sets.newLinkedHashSet(); - - Set<Location> fixedLocationsInBuilding = - article.getFixedLocationsInBuilding(warehouse.getBuilding()); - - locations.addAll(fixedLocationsInBuilding); - - // second step, add locations where there is already quantities stored - // we will suggest locations with highest quantities first ArticleStorageService articleStorageService = serviceContext.newService(ArticleStorageService.class); @@ -280,14 +289,8 @@ Iterables.addAll(sortedStoredArticles, storedArticles); - Iterables.addAll( - locations, - Iterables.transform( - sortedStoredArticles, - StoredArticles.getLocationFunction())); + return sortedStoredArticles; - return locations; - } public ReceptionTask getReceptionTaskForPreparedArticleReception(Building building, String barcode) throws PreparedArticleReceptionAlreadyStoredException, InvalidMagalieBarcodeException { @@ -404,8 +407,12 @@ } - public Location getLocationToStoreSomething(Building building, MagalieUser magalieUser, String locationBarcode, String articleId) throws InvalidMagalieBarcodeException { + public ReceptionLocation getReceptionLocation(Building building, MagalieUser magalieUser, String locationBarcode, String articleId) throws InvalidMagalieBarcodeException { + ArticleJpaDao articleDao = serviceContext.getPersistenceContext().getArticleDao(); + + Article article = articleDao.findById(articleId); + MagalieBarcodeService magalieBarcodeService = serviceContext.newService(MagalieBarcodeService.class); @@ -420,22 +427,40 @@ LocationErrorsService locationErrorsService = serviceContext.newService(LocationErrorsService.class); - ArticleJpaDao articleDao = serviceContext.getPersistenceContext().getArticleDao(); + locationErrorsService.reportError(location, article, magalieUser); - Article article = articleDao.findById(articleId); + } - locationErrorsService.reportError(location, article, magalieUser); + ReceptionLocation receptionLocation = new ReceptionLocation(location); + // on essaie de déterminer la quantité qui se trouve dans cet emplacement + + ArticleStorageService articleStorageService = + serviceContext.newService(ArticleStorageService.class); + + Iterable<StoredArticle> storedArticles = + articleStorageService.getStoredArticles(building, article); + + ImmutableMap<Location,StoredArticle> storedArticlesByLocation = + Maps.uniqueIndex(storedArticles, StoredArticles.getLocationFunction()); + + StoredArticle storedArticle = storedArticlesByLocation.get(location); + + if (storedArticle == null) { + receptionLocation.setAlreadyStoredQuantity(0.); + } else { + receptionLocation.setAlreadyStoredQuantity(storedArticle.getQuantity()); } - return location; + return receptionLocation; } /** * On cherche à savoir si pour un storedArticle donné, il y a encore des articles à recevoir pour le même fournisseur */ - public Optional<Supplier> isSupplierHaveOtherArticlesToReceive(Building building, String storedArticleId) { + public Optional<Supplier> isSupplierHaveOtherArticlesToReceive(Building building, String + storedArticleId) { JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); 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-08-21 13:59:15 UTC (rev 373) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java 2013-08-26 10:09:03 UTC (rev 374) @@ -23,9 +23,13 @@ * #L% */ +import com.franciaflex.magalie.persistence.StoredArticles; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.StoredArticle; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; +import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -33,36 +37,46 @@ public class ReceptionTask { - protected boolean userMustChooseExtraLocation; - protected StoredArticle storedArticle; protected double quantity; - protected Iterable<Location> preferredLocations; + protected Iterable<Location> fixedLocations; + protected Iterable<StoredArticle> alreadyUsedLocations; + protected Iterable<Location> extraLocations; - protected Set<Location> locations; - - public ReceptionTask(StoredArticle storedArticle, double quantity, Iterable<Location> preferredLocations, Iterable<Location> extraLocations) { + public ReceptionTask(StoredArticle storedArticle, double quantity) { this.storedArticle = storedArticle; this.quantity = quantity; - this.preferredLocations = preferredLocations; - this.extraLocations = extraLocations; } public StoredArticle getStoredArticle() { return storedArticle; } - public Set<Location> getLocations() { - if (locations == null) { - locations = Sets.newLinkedHashSet(); - Iterables.addAll(locations, preferredLocations); - Iterables.addAll(locations, extraLocations); + public Set<ReceptionLocation> getLocations() { + ImmutableMap<Location, StoredArticle> locationToStoredArticle = + Maps.uniqueIndex(alreadyUsedLocations, StoredArticles.getLocationFunction()); + Set<ReceptionLocation> receptionLocations = Sets.newLinkedHashSet(); + ImmutableSet<Location> allLocations = + ImmutableSet.<Location> builder() + .addAll(fixedLocations) + .addAll(Iterables.transform(alreadyUsedLocations, StoredArticles.getLocationFunction())) + .addAll(extraLocations) + .build(); + for (Location location : allLocations) { + ReceptionLocation receptionLocation = new ReceptionLocation(location); + StoredArticle storedArticleInLocation = locationToStoredArticle.get(location); + if (storedArticleInLocation == null) { + receptionLocation.setAlreadyStoredQuantity(0.); + } else { + receptionLocation.setAlreadyStoredQuantity(storedArticleInLocation.getQuantity()); + } + receptionLocations.add(receptionLocation); } - return locations; + return receptionLocations; } public double getQuantity() { @@ -70,9 +84,21 @@ } public boolean isUserMustChooseExtraLocation() { - return Iterables.isEmpty(preferredLocations); + return Iterables.isEmpty(fixedLocations) && Iterables.isEmpty(alreadyUsedLocations); } + public void setFixedLocations(Iterable<Location> fixedLocations) { + this.fixedLocations = fixedLocations; + } + + public void setAlreadyUsedLocations(Iterable<StoredArticle> alreadyUsedLocations) { + this.alreadyUsedLocations = alreadyUsedLocations; + } + + public void setExtraLocations(Iterable<Location> extraLocations) { + this.extraLocations = extraLocations; + } + @Override public String toString() { return ReflectionToStringBuilder.toString(this); 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-08-21 13:59:15 UTC (rev 373) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-08-26 10:09:03 UTC (rev 374) @@ -363,7 +363,7 @@ Location fullLocation = fixture("locationFull1"); - service.getLocationToStoreSomething(building, magalieUser, fullLocation.getBarcode(), article.getId()); + service.getReceptionLocation(building, magalieUser, fullLocation.getBarcode(), article.getId()); EntityManager entityManager = getJpaEntityManagerRule().newEntityManager(); 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-08-21 13:59:15 UTC (rev 373) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java 2013-08-26 10:09:03 UTC (rev 374) @@ -24,9 +24,9 @@ */ import com.franciaflex.magalie.persistence.entity.Building; -import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; +import com.franciaflex.magalie.services.service.ReceptionLocation; import com.franciaflex.magalie.services.service.ReceptionService; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; @@ -44,14 +44,14 @@ protected ReceptionService service; - protected Location location; - protected String locationBarcode; protected MagalieSession session; protected String articleId; + protected ReceptionLocation receptionLocation; + public void setSession(MagalieSession session) { this.session = session; } @@ -79,14 +79,14 @@ Building building = session.getBuilding(); - location = service.getLocationToStoreSomething(building, magalieUser, locationBarcode, articleId); + receptionLocation = service.getReceptionLocation(building, magalieUser, locationBarcode, articleId); return SUCCESS; } - public Location getLocation() { - return location; + public ReceptionLocation getReceptionLocation() { + return receptionLocation; } } 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-08-21 13:59:15 UTC (rev 373) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-08-26 10:09:03 UTC (rev 374) @@ -66,6 +66,6 @@ <div> <span data="warehouse.code"></span> <span data="code"></span> - <span data="stored">0</span> <s:property value="receptionTask.storedArticle.article.unit" /> + <span data="stored">0</span> / <span data="alreadyStoredQuantity"></span> <s:property value="receptionTask.storedArticle.article.unit" /> </div> </div>

1 0