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

r183 - in trunk/magalie-web/src/main/webapp: WEB-INF/content js
by Bavencoff＠users.forge.codelutin.com 23 May '13

23 May '13

Author: Bavencoff Date: 2013-05-23 09:19:13 +0200 (Thu, 23 May 2013) New Revision: 183 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2454 : Cancel mouvement order Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 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-05-22 16:04:44 UTC (rev 182) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-05-23 07:19:13 UTC (rev 183) @@ -53,7 +53,7 @@ <s:url namespace="/" action="withdraw-item!cancel" id="cancelUrl" > <s:param name="storageMovementOrderId" value="%{storageMovementOrderId}" /> </s:url> - <s:a href="%{cancelUrl}" cssClass="btn btn-small" id="cancelLink" >Abandonner (Esc)</s:a> + <s:a href="%{cancelUrl}" cssClass="btn btn-small" id="cancelLink" >Quitter (Esc)</s:a> <input type="button" id="reportError" value="Anomalie (F5)" class="btn btn-danger btn-small" /> <s:submit name="next" value="Suivant" cssClass="btn btn-primary btn-small" /> </div> Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-22 16:04:44 UTC (rev 182) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-23 07:19:13 UTC (rev 183) @@ -263,10 +263,6 @@ } }, - onCancel : function() { - - }, - }; // bindings @@ -276,6 +272,6 @@ $('#reportCancel').click(controller.onCancel); $('#withdraw-item_next').click(controller.onNext); bindKey('F5', controller.onReportError); - bindKey('Esc', controller.onCancel); + bindKey('Esc', function(){ redirectTo($('#cancelLink'));}); view.refresh(); });

1 0

r182 - 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 Bavencoff＠users.forge.codelutin.com 22 May '13

22 May '13

Author: Bavencoff Date: 2013-05-22 18:04:44 +0200 (Wed, 22 May 2013) New Revision: 182 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2454 : Cancel mouvement order 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/RequestedArticleService.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 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-05-22 14:25:58 UTC (rev 181) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-05-22 16:04:44 UTC (rev 182) @@ -25,30 +25,14 @@ import com.franciaflex.magalie.persistence.MagaliePersistenceContext; import com.franciaflex.magalie.persistence.StoredArticles; -import com.franciaflex.magalie.persistence.dao.LocationDao; -import com.franciaflex.magalie.persistence.dao.StorageMovementDao; -import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao; -import com.franciaflex.magalie.persistence.dao.StoredArticleDao; -import com.franciaflex.magalie.persistence.dao.UnavailableArticleDao; -import com.franciaflex.magalie.persistence.entity.Article; -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.persistence.entity.StorageMovement; -import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; -import com.franciaflex.magalie.persistence.entity.StoredArticle; -import com.franciaflex.magalie.persistence.entity.UnavailableArticle; +import com.franciaflex.magalie.persistence.dao.*; +import com.franciaflex.magalie.persistence.entity.*; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; import com.franciaflex.magalie.services.StorageMovementConfirmation; import com.franciaflex.magalie.services.StorageMovementTask; import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -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 com.google.common.collect.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -475,4 +459,23 @@ persistenceContext.commit(); } + + public void cancelStorageMovement(String storageMovementOrderId) { + + MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); + + StorageMovementOrderDao storageMovementOrderDao = + persistenceContext.getStorageMovementOrderDao(); + + StorageMovementOrder storageMovementOrder = storageMovementOrderDao.findById(storageMovementOrderId); + + RequestedArticleService requestedArticleService + = serviceContext.newService(RequestedArticleService.class); + + requestedArticleService.cancelStorageMovement(storageMovementOrder); + + storageMovementOrderDao.remove(storageMovementOrder); + + persistenceContext.commit(); + } } 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-05-22 14:25:58 UTC (rev 181) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-05-22 16:04:44 UTC (rev 182) @@ -470,4 +470,21 @@ } + public void cancelStorageMovement(StorageMovementOrder storageMovementOrder) { + + MagaliePersistenceContext persistenceContext = + serviceContext.getPersistenceContext(); + + DeliveredRequestedArticleDao deliveredRequestedArticleDao = + persistenceContext.getDeliveredRequestedArticleDao(); + + DeliveredRequestedArticle deliveredRequestedArticle = + deliveredRequestedArticleDao.find(storageMovementOrder); + + if (deliveredRequestedArticle != null) { + deliveredRequestedArticleDao.remove(deliveredRequestedArticle); + } + + } + } 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-05-22 14:25:58 UTC (rev 181) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-05-22 16:04:44 UTC (rev 182) @@ -91,6 +91,10 @@ } + public String getStorageMovementOrderId() { + return storageMovementOrderId; + } + public StorageMovementTask getStorageMovementTask() { return storageMovementTask; } @@ -129,8 +133,6 @@ articleStorageService.confirmStorageMovement(confirmation, magalieUser); - String resultName = session.getActivity().name(); - DeliveredRequestedList deliveredRequestedList = requestedArticleService.getDeliveredRequestedList(confirmation.getStorageMovementOrderId()); @@ -144,7 +146,19 @@ } + String resultName = session.getActivity().name(); + return resultName; } + + public String cancel(){ + + articleStorageService.cancelStorageMovement(storageMovementOrderId); + + String resultName = session.getActivity().name(); + + return resultName; + + } } 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-05-22 14:25:58 UTC (rev 181) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-05-22 16:04:44 UTC (rev 182) @@ -50,6 +50,10 @@ <s:hidden name="confirmation" /> <div class="btn-group"> + <s:url namespace="/" action="withdraw-item!cancel" id="cancelUrl" > + <s:param name="storageMovementOrderId" value="%{storageMovementOrderId}" /> + </s:url> + <s:a href="%{cancelUrl}" cssClass="btn btn-small" id="cancelLink" >Abandonner (Esc)</s:a> <input type="button" id="reportError" value="Anomalie (F5)" class="btn btn-danger btn-small" /> <s:submit name="next" value="Suivant" cssClass="btn btn-primary btn-small" /> </div> Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-22 14:25:58 UTC (rev 181) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-22 16:04:44 UTC (rev 182) @@ -261,15 +261,21 @@ view.refresh(); } - } + }, + onCancel : function() { + + }, + }; // bindings $(document).ready(function() { $('#withdraw-item').submit(controller.onSubmit); $('#reportError').click(controller.onReportError); + $('#reportCancel').click(controller.onCancel); $('#withdraw-item_next').click(controller.onNext); bindKey('F5', controller.onReportError); + bindKey('Esc', controller.onCancel); view.refresh(); });

1 0

r181 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-web/src/main/webapp/css
by bleny＠users.forge.codelutin.com 22 May '13

22 May '13

Author: bleny Date: 2013-05-22 16:25:58 +0200 (Wed, 22 May 2013) New Revision: 181 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/Articles.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/PreparedReceptionService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SuppliersToReceive.java trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Articles.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Articles.java 2013-05-22 13:35:07 UTC (rev 180) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Articles.java 2013-05-22 14:25:58 UTC (rev 181) @@ -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.Article; import com.franciaflex.magalie.persistence.entity.Supplier; import com.google.common.base.Function; Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/PreparedReceptionService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/PreparedReceptionService.java 2013-05-22 13:35:07 UTC (rev 180) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/PreparedReceptionService.java 2013-05-22 14:25:58 UTC (rev 181) @@ -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.services.MagalieServiceContext; public class PreparedReceptionService { Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SuppliersToReceive.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SuppliersToReceive.java 2013-05-22 13:35:07 UTC (rev 180) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SuppliersToReceive.java 2013-05-22 14:25:58 UTC (rev 181) @@ -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.Supplier; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-05-22 13:35:07 UTC (rev 180) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-05-22 14:25:58 UTC (rev 181) @@ -1,3 +1,25 @@ +/* + * #%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% + */ @media screen and (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { dl,

1 0

r180 - trunk/magalie-web/src/main/webapp/css
by Bavencoff＠users.forge.codelutin.com 22 May '13

22 May '13

Author: Bavencoff Date: 2013-05-22 15:35:07 +0200 (Wed, 22 May 2013) New Revision: 180 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2431 : margin bottom Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-22 13:09:34 UTC (rev 179) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-22 13:35:07 UTC (rev 180) @@ -32,6 +32,7 @@ margin-top: 30px; margin-left: 5px; margin-right: 5px; + margin-bottom: 5px; } .dl-horizontal dt,

1 0

r179 - in trunk/magalie-web/src/main/webapp: WEB-INF/content css js
by Bavencoff＠users.forge.codelutin.com 22 May '13

22 May '13

Author: Bavencoff Date: 2013-05-22 15:09:34 +0200 (Wed, 22 May 2013) New Revision: 179 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2431 : user experience Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css trunk/magalie-web/src/main/webapp/js/magalie.js trunk/magalie-web/src/main/webapp/js/receive-article-input.js trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-05-22 12:30:18 UTC (rev 178) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-05-22 13:09:34 UTC (rev 179) @@ -50,8 +50,8 @@ <s:textfield name="quantity" label="Qté" inputAppend="%{article.unit}" cssClass="input-mini" /> </s:if> - <div class="btn-group"> + <div> + <s:submit name="next" value="Suivant" cssClass="btn btn-primary" /> <s:a href="%{chooseActivityUrl}" cssClass="btn" id="chooseActivityLink" >Changer d'activité (Esc)</s:a> - <s:submit name="next" value="Suivant" cssClass="btn btn-primary" /> </div> </s:form> \ No newline at end of file Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-05-22 12:30:18 UTC (rev 178) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-05-22 13:09:34 UTC (rev 179) @@ -40,8 +40,7 @@ #storageMovements, #locations { - overflow-y: scroll; - height: 120px; + min-height: 120px; } #storageMovements div, Modified: trunk/magalie-web/src/main/webapp/js/magalie.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/magalie.js 2013-05-22 12:30:18 UTC (rev 178) +++ trunk/magalie-web/src/main/webapp/js/magalie.js 2013-05-22 13:09:34 UTC (rev 179) @@ -75,6 +75,7 @@ function bindKey(key, handler) { $(document).keydown(function(event) { if (event.which == KEYS[key]) { + event.preventDefault(); handler(); } }) Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-05-22 12:30:18 UTC (rev 178) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-05-22 13:09:34 UTC (rev 179) @@ -124,12 +124,11 @@ } } else if (location.id === model.locations[model.locationsIndex].id && ! model.canTerminate()) { $(locationElement).addClass('pending'); - locationsElement.scrollTop(locationElement[0].offsetTop); } else { $(locationElement).hide(); } }); - + $("body").scrollTop($("#container").height()); }, refreshForm : function() { @@ -209,6 +208,7 @@ } } + view.refresh(); } catch (ex) { Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-22 12:30:18 UTC (rev 178) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-22 13:09:34 UTC (rev 179) @@ -147,11 +147,11 @@ } } else if (storageMovement.originLocation.id === model.storageMovements[model.storageMovementsIndex].originLocation.id && ! model.canTerminate()) { $(storageMovementElement).addClass('pending'); - storageMovementsElement.scrollTop(storageMovementElement[0].offsetTop); } else { $(storageMovementElement).hide(); } }); + $("body").scrollTop($("#container").height()); },

1 0

r178 - 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 22 May '13

22 May '13

Author: bleny Date: 2013-05-22 14:30:18 +0200 (Wed, 22 May 2013) New Revision: 178 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2452 notify user when requested list is complete Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 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-05-22 09:01:57 UTC (rev 177) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-05-22 12:30:18 UTC (rev 178) @@ -30,6 +30,7 @@ import com.franciaflex.magalie.persistence.dao.DeliveredRequestedListDao; import com.franciaflex.magalie.persistence.dao.RequestedArticleDao; import com.franciaflex.magalie.persistence.dao.RequestedListDao; +import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.DeliveredRequestedArticle; @@ -326,26 +327,23 @@ public void onStorageMovementConfirmation(StorageMovementOrder storageMovementOrder) { - MagaliePersistenceContext persistenceContext = - serviceContext.getPersistenceContext(); + MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); - DeliveredRequestedArticleDao deliveredRequestedArticleDao = - persistenceContext.getDeliveredRequestedArticleDao(); + DeliveredRequestedList deliveredRequestedList = getDeliveredRequestedList(storageMovementOrder.getId()); - DeliveredRequestedArticle deliveredRequestedArticle = - deliveredRequestedArticleDao.find(storageMovementOrder); + if (deliveredRequestedList != null) { - if (deliveredRequestedArticle != null) { - // a order is confirmed and this order is about a requested article // so we may update the status of the list - RequestedList requestedList = - deliveredRequestedArticle.getRequestedArticle().getRequestedList(); + RequestedList requestedList = deliveredRequestedList.getRequestedList(); RequestedArticleDao requestedArticleDao = persistenceContext.getRequestedArticleDao(); + DeliveredRequestedArticleDao deliveredRequestedArticleDao = + persistenceContext.getDeliveredRequestedArticleDao(); + List<RequestedArticle> requestedArticles = requestedArticleDao.findAll(requestedList); @@ -364,16 +362,8 @@ + requestedList.getCode() + " as complete"); } - DeliveredRequestedListDao deliveredRequestedListDao = - persistenceContext.getDeliveredRequestedListDao(); - - DeliveredRequestedList deliveredRequestedList = - deliveredRequestedListDao.findByRequestedList(requestedList); - deliveredRequestedList.setStatus(DeliveredRequestedListStatus.COMPLETE); - // TODO brendan 25/04/13 notify user - } } @@ -440,4 +430,44 @@ return allDistinctListTypes; } + + /** + * @return null if storage movement order is not about a requested-list (for example, kanban) + */ + public DeliveredRequestedList getDeliveredRequestedList(String storageMovementOrderId) { + + MagaliePersistenceContext persistenceContext = + serviceContext.getPersistenceContext(); + + DeliveredRequestedArticleDao deliveredRequestedArticleDao = + persistenceContext.getDeliveredRequestedArticleDao(); + + StorageMovementOrderDao storageMovementOrderDao = + persistenceContext.getStorageMovementOrderDao(); + + StorageMovementOrder storageMovementOrder = + storageMovementOrderDao.findById(storageMovementOrderId); + + DeliveredRequestedArticle deliveredRequestedArticle = + deliveredRequestedArticleDao.find(storageMovementOrder); + + DeliveredRequestedList deliveredRequestedList = null; + + if (deliveredRequestedArticle != null) { + + RequestedList requestedList = + deliveredRequestedArticle.getRequestedArticle().getRequestedList(); + + DeliveredRequestedListDao deliveredRequestedListDao = + persistenceContext.getDeliveredRequestedListDao(); + + deliveredRequestedList = + deliveredRequestedListDao.findByRequestedList(requestedList); + + } + + return deliveredRequestedList; + + } + } Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-05-22 09:01:57 UTC (rev 177) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-05-22 12:30:18 UTC (rev 178) @@ -24,8 +24,11 @@ */ import com.franciaflex.magalie.persistence.entity.Building; +import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList; +import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.RequestedArticle; +import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; import com.franciaflex.magalie.services.AbstractMagalieServiceTest; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; @@ -223,4 +226,47 @@ } + @Test + public void testCompleteStatusIsReachable() throws Exception { + + FindOrderToExecuteResult orderToExecute; + StorageMovementOrder storageMovementOrder; + DeliveredRequestedList deliveredRequestedList; + + // we will process a requested list with to articles to checks that the state is updated + + // first article + + { + + orderToExecute = service.findOrderToExecute(magalieUser, building, LIST_TYPE); + + Preconditions.checkState(orderToExecute.isSuccess()); + + storageMovementOrder = orderToExecute.getStorageMovementOrder(); + + service.onStorageMovementConfirmation(storageMovementOrder); + + deliveredRequestedList = service.getDeliveredRequestedList(storageMovementOrder.getId()); + + Assert.assertNotEquals(DeliveredRequestedListStatus.COMPLETE, deliveredRequestedList.getStatus()); + + } + + // now treat last article of the list to make it complete + + orderToExecute = service.findOrderToExecute(magalieUser, building, LIST_TYPE); + + Preconditions.checkState(orderToExecute.isSuccess()); + + storageMovementOrder = orderToExecute.getStorageMovementOrder(); + + service.onStorageMovementConfirmation(storageMovementOrder); + + deliveredRequestedList = service.getDeliveredRequestedList(storageMovementOrder.getId()); + + Assert.assertNotEquals(DeliveredRequestedListStatus.COMPLETE, deliveredRequestedList.getStatus()); + + } + } 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-05-22 09:01:57 UTC (rev 177) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-05-22 12:30:18 UTC (rev 178) @@ -24,10 +24,13 @@ */ import com.franciaflex.magalie.MagalieTechnicalException; +import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList; +import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.services.StorageMovementConfirmation; import com.franciaflex.magalie.services.StorageMovementTask; import com.franciaflex.magalie.services.service.ArticleStorageService; +import com.franciaflex.magalie.services.service.RequestedArticleService; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; import com.google.common.base.Preconditions; @@ -49,8 +52,10 @@ private static final Log log = LogFactory.getLog(WithdrawItemAction.class); - protected ArticleStorageService service; + protected ArticleStorageService articleStorageService; + protected RequestedArticleService requestedArticleService; + protected String storageMovementOrderId; protected StorageMovementTask storageMovementTask; @@ -63,10 +68,14 @@ this.session = session; } - public void setService(ArticleStorageService service) { - this.service = service; + public void setArticleStorageService(ArticleStorageService articleStorageService) { + this.articleStorageService = articleStorageService; } + public void setRequestedArticleService(RequestedArticleService requestedArticleService) { + this.requestedArticleService = requestedArticleService; + } + public void setStorageMovementOrderId(String storageMovementOrderId) { this.storageMovementOrderId = storageMovementOrderId; } @@ -76,7 +85,7 @@ Preconditions.checkNotNull(storageMovementOrderId); - storageMovementTask = service.getStorageMovementTask(storageMovementOrderId); + storageMovementTask = articleStorageService.getStorageMovementTask(storageMovementOrderId); return INPUT; @@ -118,10 +127,23 @@ MagalieUser magalieUser = session.getMagalieUser(); - service.confirmStorageMovement(confirmation, magalieUser); + articleStorageService.confirmStorageMovement(confirmation, magalieUser); String resultName = session.getActivity().name(); + DeliveredRequestedList deliveredRequestedList = + requestedArticleService.getDeliveredRequestedList(confirmation.getStorageMovementOrderId()); + + if (deliveredRequestedList != null) { + + if (deliveredRequestedList.getStatus() == DeliveredRequestedListStatus.COMPLETE) { + + session.addMessage("La liste " + deliveredRequestedList.getRequestedList().getCode() + " est terminée"); + + } + + } + return resultName; }

1 0

r177 - trunk/magalie-web/src/main/webapp/css
by bleny＠users.forge.codelutin.com 22 May '13

22 May '13

Author: bleny Date: 2013-05-22 11:01:57 +0200 (Wed, 22 May 2013) New Revision: 177 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2431 prevent bad vertical scrolling Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-22 08:53:50 UTC (rev 176) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-22 09:01:57 UTC (rev 177) @@ -28,8 +28,6 @@ #container { position: absolute; width: 230px; - height: 320px; - overflow: auto; background-color: white; margin-top: 30px; margin-left: 5px;

1 0

r176 - in trunk/magalie-web/src/main: java/com/franciaflex/magalie/web webapp/WEB-INF/content webapp/WEB-INF/decorators webapp/css
by Bavencoff＠users.forge.codelutin.com 22 May '13

22 May '13

Author: Bavencoff Date: 2013-05-22 10:53:50 +0200 (Wed, 22 May 2013) New Revision: 176 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2431 : user experience Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java 2013-05-22 07:19:40 UTC (rev 175) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java 2013-05-22 08:53:50 UTC (rev 176) @@ -42,4 +42,9 @@ public List<String> getShortcuts () { return SHORTCUTS; } + + public boolean isWithMessages() { + return super.hasActionErrors() || super.hasActionMessages(); + } + } 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-05-22 07:19:40 UTC (rev 175) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-05-22 08:53:50 UTC (rev 176) @@ -55,10 +55,9 @@ </div> </s:form> <div id="locationTemplate" class="template"> - <dl class="dl-horizontal"> - <dt>Empl.</dt> - <dd><span data="warehouse.code"></span> <span data="code"></span></dd> - <dt>Prélev.</dt> - <dd><span data="stored">0</span> <s:property value="receptionTask.storedArticle.article.unit" /></dd> - </dl> + <div> + <span data="warehouse.code"></span> + <span data="code"></span> + <span data="stored">0</span> <s:property value="receptionTask.storedArticle.article.unit" /> + </div> </div> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2013-05-22 07:19:40 UTC (rev 175) +++ trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2013-05-22 08:53:50 UTC (rev 176) @@ -41,11 +41,18 @@ </head> <body> <div id="container"> - - <s:actionerror theme="bootstrap"/> - <s:actionmessage theme="bootstrap"/> - <s:fielderror theme="bootstrap"/> - + <s:if test="withMessages" > + <script type="text/javascript"> + $(document).ready(function () { + <s:iterator value="actionMessages" var="actionMessage" > + alert('<s:property value="#actionMessage" escapeJavaScript="true" escapeHtml="false" />'); + </s:iterator> + <s:iterator value="actionErrors" var="actionError" > + alert('<s:property value="#actionError" escapeJavaScript="true" escapeHtml="false"/>'); + </s:iterator> + }); + </script> + </s:if> <decorator:body /> </div> </body> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-22 07:19:40 UTC (rev 175) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-22 08:53:50 UTC (rev 176) @@ -27,8 +27,6 @@ #container { position: absolute; - #left: 5px; - #top: 5px; width: 230px; height: 320px; overflow: auto;

1 0

r175 - trunk/magalie-web/src/main/webapp/css
by Bavencoff＠users.forge.codelutin.com 22 May '13

22 May '13

Author: Bavencoff Date: 2013-05-22 09:19:40 +0200 (Wed, 22 May 2013) New Revision: 175 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2431 : user experience Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-22 07:02:15 UTC (rev 174) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-22 07:19:40 UTC (rev 175) @@ -27,8 +27,8 @@ #container { position: absolute; - left: 5px; - top: 5px; + #left: 5px; + #top: 5px; width: 230px; height: 320px; overflow: auto;

1 0

r174 - in trunk/magalie-web/src/main: java/com/franciaflex/magalie/web webapp/WEB-INF/content webapp/WEB-INF/decorators webapp/js
by Bavencoff＠users.forge.codelutin.com 22 May '13

22 May '13

Author: Bavencoff Date: 2013-05-22 09:02:15 +0200 (Wed, 22 May 2013) New Revision: 174 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2431 : shortcuts Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-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/receive-article-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/magalie-web/src/main/webapp/js/magalie.js trunk/magalie-web/src/main/webapp/js/receive-article-input.js trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java 2013-05-21 15:20:38 UTC (rev 173) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieActionSupport.java 2013-05-22 07:02:15 UTC (rev 174) @@ -27,10 +27,19 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.Arrays; +import java.util.List; + public class MagalieActionSupport extends ActionSupport { private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(MagalieActionSupport.class); + public static final List<String> SHORTCUTS = Arrays.asList(new String[]{ "0", "1", "2", "3", "5", "6", "7", "8", "9", + "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", + "w", "x", "y", "z" }); + public List<String> getShortcuts () { + return SHORTCUTS; + } } 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-05-21 15:20:38 UTC (rev 173) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-05-22 07:02:15 UTC (rev 174) @@ -33,9 +33,13 @@ <head> <script> -$(document).keydown(function(event) { -alert('Touche :' + event.which); +$(document).ready(function() { + bindKey('1', function(){ redirectTo($('#fulfilKanbanlink'));}); + bindKey('2', function(){ redirectTo($('#deliverRequestedArticlelink'));}); + bindKey('3', function(){ redirectTo($('#prepareArticleReceptionlink'));}); + bindKey('Esc', function(){ redirectTo($('#logoutlink'));}); }); + </script> </head> @@ -49,7 +53,7 @@ </dl> </header> -<s:a href="%{fulfilKanbanUrl}" cssClass="btn btn-block">Traiter kanbans</s:a> -<s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block">Traiter listes à servir</s:a> -<s:a href="%{prepareArticleReceptionUrl}" cssClass="btn btn-block">Traiter les réceptions fournisseurs</s:a> -<s:a href="%{logoutUrl}" cssClass="btn btn-block">Déconnexion</s:a> +<s:a href="%{fulfilKanbanUrl}" cssClass="btn btn-block" id="fulfilKanbanlink">Traiter kanbans (1)</s:a> +<s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="deliverRequestedArticlelink">Traiter listes à servir (2)</s:a> +<s:a href="%{prepareArticleReceptionUrl}" cssClass="btn btn-block" id="prepareArticleReceptionlink" >Traiter les réceptions fournisseurs (3)</s:a> +<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/deliver-requested-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-05-21 15:20:38 UTC (rev 173) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-05-22 07:02:15 UTC (rev 174) @@ -24,13 +24,12 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <s:if test="requestedList"> - <head> <script type="text/javascript"> $(document).ready(function () { $("#requestedArticle").focus(); + bindKey('0', function(){ redirectTo($('#requestedArticle'));}); }); - </script> - </head> + </script> <p> Vous êtes affecté à la liste <s:property value="requestedList.code" /> @@ -38,18 +37,40 @@ <s:url namespace="/" 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</s:a> + <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="requestedArticle" >Demander un article à servir (0)</s:a> </s:if> <s:else> - <s:iterator value="listTypes" var="listType"> + <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:param name="listType" value="#listType" /> </s:url> - <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block"> - Commencer à traiter une liste « <s:property value="#listType" /> » - </s:a> + <s:if test="#stat.index < shortcuts.size()"> + <script type="text/javascript"> + $(document).ready(function () { + var id = '<s:property value="deliverRequestedArticleId" />'; + bindKey(<s:property value="shortcuts.get(#stat.index)" />, function(){ redirectTo($('#' + id));}); + }); + </script> + <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="%{deliverRequestedArticleId}"> + Commencer à traiter une liste « <s:property value="#listType" /> » + (<s:property value="shortcuts.get(#stat.index)" />) + </s:a> + </s:if> + <s:else> + <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block"> + Commencer à traiter une liste « <s:property value="#listType" /> » + </s:a> + </s:else> </s:iterator> </s:else> +<script type="text/javascript"> + $(document).ready(function () { + $("#requestedArticle").focus(); + bindKey('Esc', function(){ redirectTo($('#removeUserAffectationLink'));}); + }); +</script> + <s:url namespace="/" action="remove-user-affectation" id="removeUserAffectationUrl"/> -<s:a href="%{removeUserAffectationUrl}" cssClass="btn btn-block">Changer d'activité</s:a> +<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/fulfil-kanban-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-05-21 15:20:38 UTC (rev 173) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-05-22 07:02:15 UTC (rev 174) @@ -28,6 +28,7 @@ <script type="text/javascript"> $(document).ready(function () { $("#fulfil-kanban_articleBarcode").focus(); + bindKey('Esc', function(){ redirectTo($('#chooseActivityLink'));}); }); </script> </head> @@ -50,7 +51,7 @@ </s:if> <div class="btn-group"> - <s:a href="%{chooseActivityUrl}" cssClass="btn">Changer d'activité</s:a> + <s:a href="%{chooseActivityUrl}" cssClass="btn" id="chooseActivityLink" >Changer d'activité (Esc)</s:a> <s:submit name="next" value="Suivant" cssClass="btn btn-primary" /> </div> </s:form> \ No newline at end of file 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-05-21 15:20:38 UTC (rev 173) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-05-22 07:02:15 UTC (rev 174) @@ -23,24 +23,57 @@ <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> + + +<head> + <script type="text/javascript"> + $(document).ready(function () { + bindKey('Esc', function(){ redirectTo($('#chooseActivityLink'));}); + }); + </script> +</head> + <s:if test="suppliersToReceive.somethingToReceive"> <ul> - <s:iterator value="suppliersToReceive.suppliers"> + <li> + <script type="text/javascript"> + $(document).ready(function () { + bindKey(<s:property value="shortcuts.get(0)" />, function(){ redirectTo($('#prepareArticleReceptionLink'));}); + }); + </script> + <s:url namespace="/" action="prepare-article-reception" id="prepareArticleReceptionUrl" /> + <s:a href="%{prepareArticleReceptionUrl}" id="prepareArticleReceptionLink"> + Tous les fournisseurs (<s:property value="shortcuts.get(0)" />) + </s:a> + </li> + + <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:param name="supplierId" value="%{id}" /> - </s:url> - <s:a href="%{prepareArticleReceptionUrl}"><s:property value="name" /></s:a> + <s:param name="supplierId" value="%{id}" /> + </s:url> + <s:if test="#stat.index + 1 < shortcuts.size()"> + <script type="text/javascript"> + $(document).ready(function () { + var id = '<s:property value="prepareArticleReceptionId" />'; + bindKey(<s:property value="shortcuts.get(#stat.index + 1)" />, function(){ redirectTo($('#' + id));}); + }); + </script> + <s:a href="%{prepareArticleReceptionUrl}" id="%{prepareArticleReceptionId}"> + <s:property value="name" /> (<s:property value="shortcuts.get(#stat.index + 1)" />) + </s:a> + </s:if> + <s:else> + <s:a href="%{prepareArticleReceptionUrl}" > + <s:property value="name" /> + </s:a> + </s:else> </li> </s:iterator> - <li> - <s:url namespace="/" action="prepare-article-reception" id="prepareArticleReceptionUrl" /> - <s:a href="%{prepareArticleReceptionUrl}"> - Tous les fournisseurs - </s:a> - </li> + </ul> </s:if> <s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/> -<s:a href="%{chooseActivityUrl}" cssClass="btn">Changer d'activité</s:a> +<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-05-21 15:20:38 UTC (rev 173) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-05-22 07:02:15 UTC (rev 174) @@ -24,17 +24,37 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <ul> - <s:iterator value="receivedArticles"> - <li> - <s:url namespace="/" action="receive-article!input" id="receiveArticleUrl"> - <s:param name="storedArticleId" value="%{id}" /> - </s:url> - <s:a href="%{receiveArticleUrl}"> - <s:property value="quantity" /> - <s:property value="article.unit" /> - <s:property value="article.description" /> - (Réf <s:property value="article.code" />) - </s:a> - </li> + <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:param name="storedArticleId" value="%{id}" /> + </s:url> + <s:if test="#stat.index < shortcuts.size()"> + <script type="text/javascript"> + $(document).ready(function () { + var id = '<s:property value="receiveArticleId" />'; + bindKey(<s:property value="shortcuts.get(#stat.index)" />, function(){ redirectTo($('#' + id));}); + }); + </script> + <li> + <s:a href="%{receiveArticleUrl}" id="%{receiveArticleId}"> + <s:property value="quantity" /> + <s:property value="article.unit" /> + <s:property value="article.description" /> + (Réf <s:property value="article.code" />) + (<s:property value="shortcuts.get(#stat.index)" />) + </s:a> + </li> + </s:if> + <s:else> + <li> + <s:a href="%{receiveArticleUrl}"> + <s:property value="quantity" /> + <s:property value="article.unit" /> + <s:property value="article.description" /> + (Réf <s:property value="article.code" />) + </s:a> + </li> + </s:else> </s:iterator> </ul> 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-05-21 15:20:38 UTC (rev 173) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-05-22 07:02:15 UTC (rev 174) @@ -24,7 +24,6 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <head> - <script src="<s:url value='/js/magalie.js' />"></script> <script> var model = <s:property value="modelAsJson" escapeHtml="false" />; </script> @@ -51,7 +50,7 @@ <s:hidden name="confirmation" /> <div class="btn-group"> - <s:submit name="full" value="Plein" cssClass="btn btn-danger btn-small" /> + <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> </s:form> 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-05-21 15:20:38 UTC (rev 173) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-05-22 07:02:15 UTC (rev 174) @@ -24,7 +24,6 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <head> - <script src="<s:url value='/js/magalie.js' />"></script> <script> var model = <s:property value="modelAsJson" escapeHtml="false" />; </script> @@ -51,7 +50,7 @@ <s:hidden name="confirmation" /> <div class="btn-group"> - <input type="button" id="reportError" value="Anomalie" class="btn btn-danger btn-small" /> + <input type="button" id="reportError" value="Anomalie (F5)" class="btn btn-danger btn-small" /> <s:submit name="next" value="Suivant" cssClass="btn btn-primary btn-small" /> </div> </s:form> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2013-05-21 15:20:38 UTC (rev 173) +++ trunk/magalie-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2013-05-22 07:02:15 UTC (rev 174) @@ -33,6 +33,7 @@ <sj:head locale="fr" jqueryui="false" jquerytheme="start" /> <sb:head /> <title><decorator:title default="MagaLiE"/> - MagaLiE</title> + <script src="<s:url value='/js/magalie.js' />"></script> <link rel="stylesheet" href="<s:url value='/css/magalie.css' />"/> <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x.css' />"/>  Modified: trunk/magalie-web/src/main/webapp/js/magalie.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/magalie.js 2013-05-21 15:20:38 UTC (rev 173) +++ trunk/magalie-web/src/main/webapp/js/magalie.js 2013-05-22 07:02:15 UTC (rev 174) @@ -20,6 +20,71 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ + +// declaration des constantes de touche clavier + +KEYS = {"F1": 112, + "F2": 113, + "F3" : 114 , + "F4" : 115 , + "F5" : 116 , + "tab" : 9 , + "del" : 8 , + "Esc" : 27 , + "0" : 48, + "1" : 49, + "2" : 50, + "3" : 51, + "4" : 52, + "5" : 53, + "6" : 54, + "7" : 55, + "8" : 56, + "9" : 57, + "." : 190, + "a" : 65, + "b" : 66, + "c" : 67, + "d" : 68, + "e" : 69, + "f" : 70, + "g" : 71, + "h" : 72, + "i" : 73, + "j" : 74, + "k" : 75, + "l" : 76, + "m" : 77, + "n" : 78, + "o" : 79, + "p" : 80, + "q" : 81, + "r" : 82, + "s" : 83, + "t" : 84, + "u" : 85, + "v" : 86, + "w" : 87, + "x" : 88, + "y" : 89, + "z" : 90 }; + +SHORTCUTS = ["1", "2", "3", "5", "6", "7", "8", "9", "O", "a", "b", "c", "d", "e", "f", "g", "h", "i", + "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"]; + +function bindKey(key, handler) { + $(document).keydown(function(event) { + if (event.which == KEYS[key]) { + handler(); + } + }) + +} + +function redirectTo(a) { + window.location = a.attr('href'); +} + function processTemplate(templateId, model) { var processing = $('#' + templateId).clone().children(); var elementsWithData = $(processing).find('*[data]'); Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-05-21 15:20:38 UTC (rev 173) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-05-22 07:02:15 UTC (rev 174) @@ -242,6 +242,6 @@ $('#receive-article').submit(controller.onSubmit); $('#receive-article_full').click(controller.onReportError); $('#receive-article_next').click(controller.onNext); - + bindKey('F5', controller.onReportError); view.refresh(); }); Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-21 15:20:38 UTC (rev 173) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-22 07:02:15 UTC (rev 174) @@ -270,6 +270,6 @@ $('#withdraw-item').submit(controller.onSubmit); $('#reportError').click(controller.onReportError); $('#withdraw-item_next').click(controller.onNext); - + bindKey('F5', controller.onReportError); view.refresh(); });

1 0