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

r343 - in trunk/magalie-web: . src
by bleny＠users.forge.codelutin.com 26 Jul '13

26 Jul '13

Author: bleny Date: 2013-07-26 13:51:01 +0200 (Fri, 26 Jul 2013) New Revision: 343 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: move license dir Added: trunk/magalie-web/src/license/ Removed: trunk/magalie-web/license/

1 0

r342 - in trunk: magalie-services/src/main/java/com/franciaflex/magalie/services/exception 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 26 Jul '13

26 Jul '13

Author: bleny Date: 2013-07-26 12:29:20 +0200 (Fri, 26 Jul 2013) New Revision: 342 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: update file headers Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/ArticleNotAvailableForKanbanException.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/PreparedArticleReceptionAlreadyStoredException.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RealTimeStorageMovementTask.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/GetRealTimeStorageMovementTaskJsonAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SaveRealTimeStorageMovementJsonAction.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/ArticleNotAvailableForKanbanException.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/ArticleNotAvailableForKanbanException.java 2013-07-25 14:22:32 UTC (rev 341) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/ArticleNotAvailableForKanbanException.java 2013-07-26 10:29:20 UTC (rev 342) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.services.exception; +/* + * #%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.Article; public class ArticleNotAvailableForKanbanException extends MagalieException { Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/PreparedArticleReceptionAlreadyStoredException.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/PreparedArticleReceptionAlreadyStoredException.java 2013-07-25 14:22:32 UTC (rev 341) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/exception/PreparedArticleReceptionAlreadyStoredException.java 2013-07-26 10:29:20 UTC (rev 342) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.services.exception; +/* + * #%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.PreparedArticleReception; public class PreparedArticleReceptionAlreadyStoredException extends MagalieException { 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-07-25 14:22:32 UTC (rev 341) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RealTimeStorageMovementTask.java 2013-07-26 10:29:20 UTC (rev 342) @@ -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.StoredArticle; import com.google.common.base.Preconditions; 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-25 14:22:32 UTC (rev 341) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-26 10:29:20 UTC (rev 342) @@ -351,6 +351,7 @@ Location destinationLocation = locationDao.findById(locationToStoredQuantity.getKey()); + // TODO brendan 25/07/13 what if destination.isFullLocation ? storageMovement.setDestinationLocation(destinationLocation); storageMovement.setMagalieUser(magalieUser); Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java 2013-07-25 14:22:32 UTC (rev 341) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java 2013-07-26 10:29:20 UTC (rev 342) @@ -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.dao.UnavailableArticleJpaDao; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/GetRealTimeStorageMovementTaskJsonAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/GetRealTimeStorageMovementTaskJsonAction.java 2013-07-25 14:22:32 UTC (rev 341) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/GetRealTimeStorageMovementTaskJsonAction.java 2013-07-26 10:29:20 UTC (rev 342) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.web.action; +/* + * #%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.Building; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.services.service.ArticleStorageService; 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-25 14:22:32 UTC (rev 341) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java 2013-07-26 10:29:20 UTC (rev 342) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.web.action; +/* + * #%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.Building; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SaveRealTimeStorageMovementJsonAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SaveRealTimeStorageMovementJsonAction.java 2013-07-25 14:22:32 UTC (rev 341) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/SaveRealTimeStorageMovementJsonAction.java 2013-07-26 10:29:20 UTC (rev 342) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.web.action; +/* + * #%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.MagalieUser; import com.franciaflex.magalie.persistence.entity.StorageMovement; import com.franciaflex.magalie.services.service.ArticleStorageService;

1 0

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

25 Jul '13

Author: bleny Date: 2013-07-25 16:22:32 +0200 (Thu, 25 Jul 2013) New Revision: 341 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2936 Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-07-25 12:57:07 UTC (rev 340) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-07-25 14:22:32 UTC (rev 341) @@ -155,6 +155,10 @@ // consider storage movements and compute actually available quantities storedArticles = computeActualQuantities(storedArticles, storageMovementsForArticle); + boolean articleAvailable = ! Iterables.isEmpty(storedArticles); + + updateArticleAvailability(building, article, articleAvailable); + // exclude storageMovements on a location reported in error LocationErrorsService locationErrorsService = serviceContext.newService(LocationErrorsService.class); @@ -400,10 +404,6 @@ } - boolean articleAvailable = ! realTimeStorageMovementTask.isArticleUnavailable(); - - updateArticleAvailability(building, article, articleAvailable); - return realTimeStorageMovementTask; }

1 0

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

25 Jul '13

Author: bleny Date: 2013-07-25 14:57:07 +0200 (Thu, 25 Jul 2013) New Revision: 340 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2938 remove one line of space in storage movements block in withdraw-item-input, remove useless space below header 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-07-25 12:43:22 UTC (rev 339) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-07-25 12:57:07 UTC (rev 340) @@ -37,20 +37,22 @@ </head> <header> - <dl class="dl-horizontal"> - <dt>Réf.</dt> - <dd><s:property value="article.code" /></dd> - <dt>Desc.</dt> - <dd><s:property value="article.description" /></dd> - <dt>Prélev.</dt> - <dd> - <span id="withdrawn">0</span> - <s:if test="expectedQuantity"> - / <s:property value="expectedQuantity" /> - </s:if> - <s:property value="article.unit" /> - </dd> - </dl> + <ul class="oneItemPerLine"> + <li> + Réf. : <s:property value="article.code" /> + </li> + <li> + Desc. : <s:property value="article.description" /> + </li> + <li> + Stocké : + <span id="withdrawn">0</span> + <s:if test="expectedQuantity"> + / <s:property value="expectedQuantity" /> + </s:if> + <s:property value="article.unit" /> + </li> + </ul> </header> <section id="storageMovements"> </section> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-07-25 12:43:22 UTC (rev 339) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-07-25 12:57:07 UTC (rev 340) @@ -60,9 +60,13 @@ margin-bottom: 1px; } +.oneItemPerLine { + margin-bottom: 0px; +} + #storageMovements, #locations { - min-height: 120px; + min-height: 100px; /* 5 * 20px for each element */ } #storageMovements div,

1 0

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

25 Jul '13

Author: bleny Date: 2013-07-25 14:43:22 +0200 (Thu, 25 Jul 2013) New Revision: 339 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2939 add missing focus rules, use btn-mini class to fit buttons to the screen, add missing shortcut declaration Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 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-25 12:13:51 UTC (rev 338) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-withdraw-item-input.jsp 2013-07-25 12:43:22 UTC (rev 339) @@ -28,10 +28,10 @@ <head> <title>Traitement des kanbans</title> <script type="text/javascript"> - $(document).ready(function () { - $("#fulfil-kanban_articleBarcode").focus(); - bindKey('Esc', function(){ redirectTo($('#chooseActivityLink'));}); - }); + $(document).ready(function () { + bindKey('Esc', function(){ redirectTo($('#chooseActivityLink'));}); + $('input[name="articleBarcode"]').focus(); + }); </script> </head> 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-25 12:13:51 UTC (rev 338) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-07-25 12:43:22 UTC (rev 339) @@ -26,6 +26,12 @@ <head> <title>Prélèvement immédiat</title> <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> + <script type="text/javascript"> + $(document).ready(function () { + bindKey('Esc', function(){ redirectTo($('#cancelLink'));}); + $('input[name="originLocationBarcode"]').focus(); + }); + </script> </head> <s:url action="prepare-withdraw-item!input" id="cancelUrl" /> @@ -72,9 +78,9 @@ <s:hidden name="articleBarcode" value="%{articleBarcode}" /> <div class="btn-group"> - <s:a href="%{cancelUrl}" cssClass="btn" id="CancelLink" >Quitter (Esc)</s:a> - <s:submit action="simple-withdraw-item!reportError" value="Anomalie (F5)" cssClass="btn btn-danger" /> - <s:submit action="simple-withdraw-item" value="Valider" cssClass="btn btn-primary" /> + <s:a href="%{cancelUrl}" cssClass="btn btn-mini" id="cancelLink" >Quitter (Esc)</s:a> + <s:submit action="simple-withdraw-item" value="Valider" cssClass="btn btn-mini btn-primary" /> + <s:submit action="simple-withdraw-item!reportError" value="Anomalie (F5)" cssClass="btn btn-mini btn-danger" /> </div> </s:form>

1 0

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

25 Jul '13

Author: bleny Date: 2013-07-25 14:13:51 +0200 (Thu, 25 Jul 2013) New Revision: 338 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2941 destination du retour dans les sorties toiles Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-07-25 12:10:11 UTC (rev 337) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/simple-withdraw-item-input.jsp 2013-07-25 12:13:51 UTC (rev 338) @@ -28,7 +28,7 @@ <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> </head> -<s:url action="choose-activity" id="cancelUrl" /> +<s:url action="prepare-withdraw-item!input" id="cancelUrl" /> <ul class="oneItemPerLine"> <li>

1 0

r337 - trunk/magalie-services/src/main/resources
by bleny＠users.forge.codelutin.com 25 Jul '13

25 Jul '13

Author: bleny Date: 2013-07-25 14:10:11 +0200 (Thu, 25 Jul 2013) New Revision: 337 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2940 add another destination warehouse to check that the selection in UI in conserved over time Modified: trunk/magalie-services/src/main/resources/fixtures.yaml Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-07-25 11:25:55 UTC (rev 336) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-07-25 12:10:11 UTC (rev 337) @@ -112,6 +112,13 @@ building: *B1 withdrawAllowed: true +B02: + &B02 !warehouse + id: warehouse_b02 + code: B02 + building: *B1 + withdrawAllowed: true + warehouses: - *U01 - *U02 @@ -119,6 +126,7 @@ - *U04 - *SOM - *B01 + - *B02 location1: &location1 !location @@ -224,6 +232,14 @@ requiredAccreditationLevel: 0 requiredCraneMan : false +location15: + &location15 !location + id: location15 + warehouse: *B02 + code: " SANS" + requiredAccreditationLevel: 0 + requiredCraneMan : false + locationRecU01: &locationRecU01 !location id: locationRecU01 @@ -295,6 +311,7 @@ - *location11 - *location12 - *location14 + - *location15 - *locationRecU01 - *locationRecU02 - *locationRecU03 @@ -427,6 +444,12 @@ warehouse: *B01 requiredQuantity: 10 +kanban6: + &kanban5 !kanban + article: *article1 + warehouse: *B02 + requiredQuantity: 15 + kanbans: - *kanban1 - *kanban2

1 0

r336 - in trunk/magalie-web/src/main: java/com/franciaflex/magalie/web/action webapp/js
by bleny＠users.forge.codelutin.com 25 Jul '13

25 Jul '13

Author: bleny Date: 2013-07-25 13:25:55 +0200 (Thu, 25 Jul 2013) New Revision: 336 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2942 trying to prevent bad confirmation calculation Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 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-07-25 10:02:34 UTC (rev 335) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-07-25 11:25:55 UTC (rev 336) @@ -184,6 +184,16 @@ @Override public String execute() { + if (confirmation.getStorageMovementIds().contains(null)) { + + if (log.isErrorEnabled()) { + log.error("confirmation " + confirmation + " is malformed. session = " + session); + } + + throw new MagalieTechnicalException("confirmation " + confirmation + " is malformed"); + + } + MagalieUser magalieUser = session.getMagalieUser(); articleStorageService.confirmStorageMovement(confirmation, magalieUser); Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-07-25 10:02:34 UTC (rev 335) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-07-25 11:25:55 UTC (rev 336) @@ -220,29 +220,35 @@ }, - onNext : function(reportError) { + next : function(reportError) { - try { + var barcode = $('#withdraw-item_locationBarcode').val(); + var quantity = parseFloat($('#withdraw-item_quantity').val()); - var barcode = $('#withdraw-item_locationBarcode').val(); - var quantity = parseFloat($('#withdraw-item_quantity').val()); + model.withdraw(barcode, quantity); - model.withdraw(barcode, quantity); + if (reportError === true) { + model.reportError(barcode); + } - if (reportError === true) { - model.reportError(barcode); - } + view.refresh(); - view.refresh(); + var proposeAnotherLocation = ! model.expectedQuantity // pas de quantité demandée précisée au départ donc on ne sait pas s'il faut s'arrêter donc on propose au cas où + || model.withdrawn() < model.expectedQuantity // on a une quantité demandée mais on ne l'a pas encore atteinte + if (proposeAnotherLocation) { + model.newEmptyStorageMovementForNextLocation(); + } - var proposeAnotherLocation = ! model.expectedQuantity // pas de quantité demandée précisée au départ donc on ne sait pas s'il faut s'arrêter donc on propose au cas où - || model.withdrawn() < model.expectedQuantity // on a une quantité demandée mais on ne l'a pas encore atteinte - if (proposeAnotherLocation) { - model.newEmptyStorageMovementForNextLocation(); - } + view.refresh(); - view.refresh(); + }, + onNext : function() { + + try { + + controller.next(false); + } catch (ex) { if (ex instanceof ValidationError) { @@ -256,33 +262,62 @@ onReportError : function() { - controller.onNext(true); + try { + controller.next(true); + + } catch (ex) { + + if (ex instanceof ValidationError) { + handleValidationError(ex); + } else { + throw ex; + } + } + }, onConfirm : function() { - var barcode = $('#withdraw-item_locationBarcode').val(); + try { - if (barcode.length > 0) { + var barcode = $('#withdraw-item_locationBarcode').val(); - controller.onNext(); + if (barcode.length > 0) { - } + controller.next(false); - var confirmation = model.getConfirmation(); + } - var confirmMessage = 'Confirmer ' + confirmation.storageMovementIds.length + ' mouvements ?'; + var confirmation = model.getConfirmation(); - if (confirm(confirmMessage)) { + var storageMovementCount = confirmation.storageMovementIds.length; - // push model as Json in a hidden field - $('#withdraw-item_confirmation').val(JSON.stringify(confirmation)); + if (storageMovementCount > 0) { - model.forceConfirm = true; + var confirmMessage = 'Confirmer ' + storageMovementCount + ' mouvements ?'; - $('#withdraw-item').submit(); + if (confirm(confirmMessage)) { + // push model as Json in a hidden field + $('#withdraw-item_confirmation').val(JSON.stringify(confirmation)); + + model.forceConfirm = true; + + $('#withdraw-item').submit(); + + } + + } + + } catch (ex) { + + if (ex instanceof ValidationError) { + handleValidationError(ex); + } else { + throw ex; + } + } },

1 0

r335 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 25 Jul '13

25 Jul '13

Author: bleny Date: 2013-07-25 12:02:34 +0200 (Thu, 25 Jul 2013) New Revision: 335 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2937 bind 'F1' key to confirmation Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-07-23 17:20:13 UTC (rev 334) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-07-25 10:02:34 UTC (rev 335) @@ -333,6 +333,7 @@ $('#confirm').click(controller.onConfirm); $('#cancelLink').click(controller.onCancel); + bindKey('F1', controller.onConfirm); bindKey('F4', controller.onConfirm); bindKey('F5', controller.onReportError); bindKey('Esc', controller.onCancel);

1 0

r334 - in trunk/magalie-persistence/src: main/java/com/franciaflex/magalie/persistence main/java/com/franciaflex/magalie/persistence/dao test/java/com/franciaflex/magalie/persistence
by bleny＠users.forge.codelutin.com 23 Jul '13

23 Jul '13

Author: bleny Date: 2013-07-23 19:20:13 +0200 (Tue, 23 Jul 2013) New Revision: 334 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add missing file headers Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java 2013-07-23 17:18:42 UTC (rev 333) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java 2013-07-23 17:20:13 UTC (rev 334) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence; +/* + * #%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% + */ + import com.franciaflex.magalie.persistence.entity.Supplier; import com.google.common.base.Function; import com.google.common.collect.Ordering; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java 2013-07-23 17:18:42 UTC (rev 333) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java 2013-07-23 17:20:13 UTC (rev 334) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.dao; +/* + * #%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% + */ + import com.franciaflex.magalie.persistence.entity.Company; import javax.persistence.EntityManager; Modified: trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java =================================================================== --- trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java 2013-07-23 17:18:42 UTC (rev 333) +++ trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java 2013-07-23 17:20:13 UTC (rev 334) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence; +/* + * #%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% + */ + import com.franciaflex.magalie.persistence.entity.Supplier; import com.google.common.base.Function; import com.google.common.collect.ImmutableList;

1 0