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

r188 - trunk/magalie-persistence/src/main/xmi
by Bavencoff＠users.forge.codelutin.com 23 May '13

23 May '13

Author: Bavencoff Date: 2013-05-23 17:52:28 +0200 (Thu, 23 May 2013) New Revision: 188 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: UML Modified: trunk/magalie-persistence/src/main/xmi/magalie.zargo Modified: trunk/magalie-persistence/src/main/xmi/magalie.zargo =================================================================== (Binary files differ)

1 0

r187 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 23 May '13

23 May '13

Author: bleny Date: 2013-05-23 15:51:39 +0200 (Thu, 23 May 2013) New Revision: 187 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: indent Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 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-23 10:56:04 UTC (rev 186) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-05-23 13:51:39 UTC (rev 187) @@ -51,8 +51,8 @@ <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:param name="supplierId" value="%{id}" /> + </s:url> <s:if test="#stat.index + 1 < shortcuts.size()"> <script type="text/javascript"> $(document).ready(function () {

1 0

r186 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 23 May '13

23 May '13

Author: bleny Date: 2013-05-23 12:56:04 +0200 (Thu, 23 May 2013) New Revision: 186 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix bad camelcase Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-05-23 10:39:57 UTC (rev 185) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-05-23 10:56:04 UTC (rev 186) @@ -40,13 +40,13 @@ <head> <script> $(document).ready(function() { - bindKey('1', function(){ redirectTo($('#fulfilKanbanlink'));}); - bindKey('2', function(){ redirectTo($('#deliverRequestedArticlelink'));}); - bindKey('3', function(){ redirectTo($('#prepareArticleReceptionlink'));}); + bindKey('1', function(){ redirectTo($('#fulfilKanbanLink'));}); + bindKey('2', function(){ redirectTo($('#deliverRequestedArticleLink'));}); + bindKey('3', function(){ redirectTo($('#prepareArticleReceptionLink'));}); <s:if test="movementOrderResume" > - bindKey('4', function(){ redirectTo($('#movementOrderResumelink'));}); + bindKey('4', function(){ redirectTo($('#movementOrderResumeLink'));}); </s:if> - bindKey('Esc', function(){ redirectTo($('#logoutlink'));}); + bindKey('Esc', function(){ redirectTo($('#logoutLink'));}); }); </script> @@ -62,10 +62,10 @@ </dl> </header> -<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="%{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:if test="movementOrderResume" > - <s:a href="%{movementOrderResumeUrl}" cssClass="btn btn-block" id="movementOrderResumelink" >Reprendre l'ordre de mouvement (4)</s:a> + <s:a href="%{movementOrderResumeUrl}" cssClass="btn btn-block" id="movementOrderResumeLink" >Reprendre l'ordre de mouvement (4)</s:a> </s:if> -<s:a href="%{logoutUrl}" cssClass="btn btn-block" id="logoutlink" >Déconnexion (Esc)</s:a> +<s:a href="%{logoutUrl}" cssClass="btn btn-block" id="logoutLink" >Déconnexion (Esc)</s:a>

1 0

r185 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web/action magalie-web/src/main/webapp/WEB-INF/content
by Bavencoff＠users.forge.codelutin.com 23 May '13

23 May '13

Author: Bavencoff Date: 2013-05-23 12:39:57 +0200 (Thu, 23 May 2013) New Revision: 185 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2438 : resume movement order Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/OrderResumeService.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementOrderJpaDao.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java 2013-05-23 07:23:35 UTC (rev 184) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementOrderDao.java 2013-05-23 10:39:57 UTC (rev 185) @@ -23,8 +23,14 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.Building; +import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; +import java.util.List; + public interface StorageMovementOrderDao extends Dao<StorageMovementOrder> { + public List<StorageMovementOrder> findNotConfirmedByUser(MagalieUser magalieUser, Building building); + } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementOrderJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementOrderJpaDao.java 2013-05-23 07:23:35 UTC (rev 184) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StorageMovementOrderJpaDao.java 2013-05-23 10:39:57 UTC (rev 185) @@ -24,9 +24,13 @@ */ import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao; +import com.franciaflex.magalie.persistence.entity.Building; +import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; import javax.persistence.EntityManager; +import javax.persistence.Query; +import java.util.List; public class StorageMovementOrderJpaDao extends AbstractJpaDao<StorageMovementOrder> implements StorageMovementOrderDao { @@ -39,4 +43,17 @@ return StorageMovementOrder.class; } + @Override + public List<StorageMovementOrder> findNotConfirmedByUser(MagalieUser magalieUser, Building building) { + Query query = entityManager.createQuery( + " select distinct smo" + + " from StorageMovementOrder smo" + + " inner join smo.storageMovements as sm" + + " where sm.magalieUser = :magalieUser" + + " and sm.originLocation.warehouse.building = :building" + + " and sm.confirmDate is null" ); + query.setParameter("magalieUser", magalieUser); + query.setParameter("building", building); + return query.getResultList(); + } } Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/OrderResumeService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/OrderResumeService.java (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/OrderResumeService.java 2013-05-23 10:39:57 UTC (rev 185) @@ -0,0 +1,61 @@ +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.MagaliePersistenceContext; +import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao; +import com.franciaflex.magalie.persistence.entity.Building; +import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; +import com.franciaflex.magalie.services.MagalieService; +import com.franciaflex.magalie.services.MagalieServiceContext; + +import java.util.List; + +public class OrderResumeService implements MagalieService { + + protected MagalieServiceContext serviceContext; + + @Override + public void setServiceContext(MagalieServiceContext serviceContext) { + this.serviceContext = serviceContext; + } + + public StorageMovementOrder findMovementOrderResume(MagalieUser magalieUser, Building building) { + + MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); + + StorageMovementOrderDao storageMovementOrderDao = persistenceContext.getStorageMovementOrderDao(); + + List<StorageMovementOrder> notConfirmedByUser = storageMovementOrderDao.findNotConfirmedByUser(magalieUser, building); + + if (notConfirmedByUser.isEmpty()) { + return null; + } else { + return notConfirmedByUser.get(0); + } + } + +} Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java 2013-05-23 07:23:35 UTC (rev 184) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java 2013-05-23 10:39:57 UTC (rev 185) @@ -25,6 +25,8 @@ import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; +import com.franciaflex.magalie.services.service.OrderResumeService; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; @@ -36,10 +38,18 @@ protected Building building; + protected OrderResumeService service; + + protected StorageMovementOrder movementOrderResume; + public void setSession(MagalieSession session) { this.session = session; } + public void setService(OrderResumeService service) { + this.service = service; + } + @Override public String execute() throws Exception { @@ -47,6 +57,8 @@ building = session.getBuilding(); + movementOrderResume = service.findMovementOrderResume(magalieUser, building); + return SUCCESS; } @@ -58,4 +70,13 @@ public Building getBuilding() { return building; } + + public StorageMovementOrder getMovementOrderResume() { + return movementOrderResume; + } + + public OrderResumeService getService() { + return service; + } + } 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-23 07:23:35 UTC (rev 184) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-05-23 10:39:57 UTC (rev 185) @@ -29,6 +29,12 @@ <s:url namespace="/" action="fulfil-kanban!input" id="fulfilKanbanUrl"/> <s:url namespace="/" action="deliver-requested-article!input" id="deliverRequestedArticleUrl"/> <s:url namespace="/" action="prepare-article-reception!input" id="prepareArticleReceptionUrl"/> +<s:if test="movementOrderResume" > + <s:url namespace="/" action="withdraw-item!input" id="movementOrderResumeUrl"> + <s:param name="storageMovementOrderId" value="%{movementOrderResume.id}" /> + </s:url> +</s:if> + <s:url namespace="/" action="logout" id="logoutUrl"/> <head> @@ -37,6 +43,9 @@ bindKey('1', function(){ redirectTo($('#fulfilKanbanlink'));}); bindKey('2', function(){ redirectTo($('#deliverRequestedArticlelink'));}); bindKey('3', function(){ redirectTo($('#prepareArticleReceptionlink'));}); + <s:if test="movementOrderResume" > + bindKey('4', function(){ redirectTo($('#movementOrderResumelink'));}); + </s:if> bindKey('Esc', function(){ redirectTo($('#logoutlink'));}); }); @@ -56,4 +65,7 @@ <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:if test="movementOrderResume" > + <s:a href="%{movementOrderResumeUrl}" cssClass="btn btn-block" id="movementOrderResumelink" >Reprendre l'ordre de mouvement (4)</s:a> +</s:if> <s:a href="%{logoutUrl}" cssClass="btn btn-block" id="logoutlink" >Déconnexion (Esc)</s:a>

1 0

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

23 May '13

Author: Bavencoff Date: 2013-05-23 09:23:35 +0200 (Thu, 23 May 2013) New Revision: 184 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/fulfil-kanban-input.jsp 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-23 07:19:13 UTC (rev 183) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-05-23 07:23:35 UTC (rev 184) @@ -50,8 +50,8 @@ <s:textfield name="quantity" label="Qté" inputAppend="%{article.unit}" cssClass="input-mini" /> </s:if> - <div> + <div class="btn-group"> + <s:a href="%{chooseActivityUrl}" cssClass="btn" id="chooseActivityLink" >Changer d'activité (Esc)</s:a> <s:submit name="next" value="Suivant" cssClass="btn btn-primary" /> - <s:a href="%{chooseActivityUrl}" cssClass="btn" id="chooseActivityLink" >Changer d'activité (Esc)</s:a> </div> </s:form> \ No newline at end of file

1 0

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