Author: bleny Date: 2013-05-23 18:25:34 +0200 (Thu, 23 May 2013) New Revision: 189 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refs #2167 implementation with a fixme Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/PreparedArticleReceptionJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/PreparedArticleReception.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-services/src/main/resources/fixtures2.yaml trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp trunk/magalie-web/src/main/webapp/js/receive-article-input.js Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-05-23 15:52:28 UTC (rev 188) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/JpaMagaliePersistenceContext.java 2013-05-23 16:25:34 UTC (rev 189) @@ -29,6 +29,7 @@ import com.franciaflex.magalie.persistence.dao.DeliveredRequestedListDao; import com.franciaflex.magalie.persistence.dao.KanbanDao; import com.franciaflex.magalie.persistence.dao.MagalieUserDao; +import com.franciaflex.magalie.persistence.dao.PreparedArticleReceptionDao; import com.franciaflex.magalie.persistence.dao.RequestedArticleDao; import com.franciaflex.magalie.persistence.dao.LocationDao; import com.franciaflex.magalie.persistence.dao.LocationErrorDao; @@ -47,6 +48,7 @@ import com.franciaflex.magalie.persistence.dao.jpa.LocationErrorJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.LocationJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.MagalieUserJpaDao; +import com.franciaflex.magalie.persistence.dao.jpa.PreparedArticleReceptionJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.RequestedArticleJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.RequestedListJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.StorageMovementJpaDao; @@ -173,4 +175,9 @@ public UnavailableArticleDao getUnavailableArticleDao() { return new UnavailableArticleJpaDao(entityManager); } + + @Override + public PreparedArticleReceptionDao getPreparedArticleReceptionDao() { + return new PreparedArticleReceptionJpaDao(entityManager); + } } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java 2013-05-23 15:52:28 UTC (rev 188) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/MagaliePersistenceContext.java 2013-05-23 16:25:34 UTC (rev 189) @@ -31,6 +31,7 @@ import com.franciaflex.magalie.persistence.dao.LocationDao; import com.franciaflex.magalie.persistence.dao.LocationErrorDao; import com.franciaflex.magalie.persistence.dao.MagalieUserDao; +import com.franciaflex.magalie.persistence.dao.PreparedArticleReceptionDao; import com.franciaflex.magalie.persistence.dao.RequestedArticleDao; import com.franciaflex.magalie.persistence.dao.RequestedListDao; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; @@ -83,4 +84,6 @@ UnavailableArticleDao getUnavailableArticleDao(); + PreparedArticleReceptionDao getPreparedArticleReceptionDao(); + } Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionDao.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/PreparedArticleReceptionDao.java 2013-05-23 16:25:34 UTC (rev 189) @@ -0,0 +1,12 @@ +package com.franciaflex.magalie.persistence.dao; + +import com.franciaflex.magalie.persistence.entity.PreparedArticleReception; + +/** + * @author bleny + */ +public interface PreparedArticleReceptionDao extends Dao<PreparedArticleReception> { + + PreparedArticleReception findByBarcode(String barcode); + +} Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/PreparedArticleReceptionJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/PreparedArticleReceptionJpaDao.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/PreparedArticleReceptionJpaDao.java 2013-05-23 16:25:34 UTC (rev 189) @@ -0,0 +1,26 @@ +package com.franciaflex.magalie.persistence.dao.jpa; + +import com.franciaflex.magalie.persistence.dao.PreparedArticleReceptionDao; +import com.franciaflex.magalie.persistence.entity.PreparedArticleReception; + +import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; + +public class PreparedArticleReceptionJpaDao extends AbstractJpaDao<PreparedArticleReception> implements PreparedArticleReceptionDao { + + public PreparedArticleReceptionJpaDao(EntityManager entityManager) { + super(entityManager); + } + + @Override + protected Class<PreparedArticleReception> getEntityClass() { + return PreparedArticleReception.class; + } + + @Override + public PreparedArticleReception findByBarcode(String barcode) { + TypedQuery<PreparedArticleReception> query = createQuery("from PreparedArticleReception par where par.barcode = :barcode"); + query.setParameter("barcode", barcode); + return findUniqueOrNull(query); + } +} Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/PreparedArticleReception.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/PreparedArticleReception.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/PreparedArticleReception.java 2013-05-23 16:25:34 UTC (rev 189) @@ -0,0 +1,52 @@ +package com.franciaflex.magalie.persistence.entity; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; + +@Entity +public class PreparedArticleReception extends AbstractEntity { + + @Id + protected String id; + + protected String barcode; + + @ManyToOne + protected StoredArticle storedArticle; + + protected double quantity; + + @Override + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getBarcode() { + return barcode; + } + + public void setBarcode(String barcode) { + this.barcode = barcode; + } + + public StoredArticle getStoredArticle() { + return storedArticle; + } + + public void setStoredArticle(StoredArticle storedArticle) { + this.storedArticle = storedArticle; + } + + public double getQuantity() { + return quantity; + } + + public void setQuantity(double quantity) { + this.quantity = quantity; + } +} Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-05-23 15:52:28 UTC (rev 188) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-05-23 16:25:34 UTC (rev 189) @@ -31,6 +31,7 @@ import com.franciaflex.magalie.persistence.entity.Kanban; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.persistence.entity.PreparedArticleReception; import com.franciaflex.magalie.persistence.entity.RequestedArticle; import com.franciaflex.magalie.persistence.entity.RequestedList; import com.franciaflex.magalie.persistence.entity.StoredArticle; @@ -67,6 +68,7 @@ reader.getConfig().setClassTag("requested-article", RequestedArticle.class); reader.getConfig().setClassTag("requested-list", RequestedList.class); reader.getConfig().setClassTag("location", Location.class); + reader.getConfig().setClassTag("prepared-article-reception", PreparedArticleReception.class); try { fixtures = (Map<String, Object>) reader.read(); } catch (YamlException e) { Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-05-23 15:52:28 UTC (rev 188) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-05-23 16:25:34 UTC (rev 189) @@ -29,6 +29,7 @@ import com.franciaflex.magalie.persistence.dao.KanbanDao; import com.franciaflex.magalie.persistence.dao.LocationDao; import com.franciaflex.magalie.persistence.dao.MagalieUserDao; +import com.franciaflex.magalie.persistence.dao.PreparedArticleReceptionDao; import com.franciaflex.magalie.persistence.dao.RequestedArticleDao; import com.franciaflex.magalie.persistence.dao.RequestedListDao; import com.franciaflex.magalie.persistence.dao.StoredArticleDao; @@ -39,6 +40,7 @@ import com.franciaflex.magalie.persistence.entity.Kanban; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.persistence.entity.PreparedArticleReception; import com.franciaflex.magalie.persistence.entity.RequestedArticle; import com.franciaflex.magalie.persistence.entity.RequestedList; import com.franciaflex.magalie.persistence.entity.StoredArticle; @@ -220,6 +222,18 @@ persistenceContext.commit(); + PreparedArticleReceptionDao preparedArticleReceptionDao = persistenceContext.getPreparedArticleReceptionDao(); + + Collection<PreparedArticleReception> preparedArticleReceptions = fixtures.fixture("preparedArticleReceptions"); + + for (PreparedArticleReception preparedArticleReception : preparedArticleReceptions) { + + preparedArticleReceptionDao.persist(preparedArticleReception); + + } + + persistenceContext.commit(); + } return fixtures; 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-05-23 15:52:28 UTC (rev 188) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-05-23 16:25:34 UTC (rev 189) @@ -28,12 +28,14 @@ import com.franciaflex.magalie.persistence.StorageMovements; import com.franciaflex.magalie.persistence.StoredArticles; import com.franciaflex.magalie.persistence.dao.LocationDao; +import com.franciaflex.magalie.persistence.dao.PreparedArticleReceptionDao; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; import com.franciaflex.magalie.persistence.dao.StoredArticleDao; 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.PreparedArticleReception; import com.franciaflex.magalie.persistence.entity.StorageMovement; import com.franciaflex.magalie.persistence.entity.StoredArticle; import com.franciaflex.magalie.persistence.entity.Supplier; @@ -151,14 +153,37 @@ StoredArticle storedArticle = storedArticleDao.findById(storedArticleId); + // FIXME brendan 23/05/13 déduire de la quantité les mouvements de stocks + + double quantity = storedArticle.getQuantity(); + + ReceptionTask receptionTask = buildReceptionTask(storedArticle, quantity); + + return receptionTask; + + } + + protected ReceptionTask buildReceptionTask(StoredArticle storedArticle, double quantity) { + Article article = storedArticle.getArticle(); Warehouse warehouse = storedArticle.getLocation().getWarehouse(); List<Location> locations = findLocationsToReceiveArticle(warehouse, article); - ReceptionTask receptionTask = new ReceptionTask(storedArticle, locations); + return new ReceptionTask(storedArticle, quantity, locations); + } + + public ReceptionTask getReceptionTaskForPreparedArticleReception(String barcode) { + + PreparedArticleReception preparedArticleReception = + getPreparedArticleReception(barcode); + + ReceptionTask receptionTask = buildReceptionTask( + preparedArticleReception.getStoredArticle(), + preparedArticleReception.getQuantity()); + return receptionTask; } @@ -273,4 +298,19 @@ } + public PreparedArticleReception getPreparedArticleReception(String barcode) { + + MagaliePersistenceContext persistenceContext = + serviceContext.getPersistenceContext(); + + PreparedArticleReceptionDao dao = + persistenceContext.getPreparedArticleReceptionDao(); + + PreparedArticleReception preparedArticleReception = + dao.findByBarcode(barcode); + + return preparedArticleReception; + + } + } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java 2013-05-23 15:52:28 UTC (rev 188) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java 2013-05-23 16:25:34 UTC (rev 189) @@ -32,10 +32,13 @@ protected StoredArticle storedArticle; + protected double quantity; + protected List<Location> locations; - public ReceptionTask(StoredArticle storedArticle, List<Location> locations) { + public ReceptionTask(StoredArticle storedArticle, double quantity, List<Location> locations) { this.storedArticle = storedArticle; + this.quantity = quantity; this.locations = locations; } @@ -46,4 +49,8 @@ public List<Location> getLocations() { return locations; } + + public double getQuantity() { + return quantity; + } } Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-05-23 15:52:28 UTC (rev 188) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-05-23 16:25:34 UTC (rev 189) @@ -632,3 +632,30 @@ - *requestedArticle4 - *requestedArticle5 - *requestedArticle6 + +preparedArticleReception1: + &preparedArticleReception1 !prepared-article-reception + id: preparedArticleReception1 + barcode: PAR1 + storedArticle: *storedArticleRec1 + quantity: 3 + +preparedArticleReception2: + &preparedArticleReception2 !prepared-article-reception + id: preparedArticleReception2 + barcode: PAR2 + storedArticle: *storedArticleRec1 + quantity: 4 + +preparedArticleReception3: + &preparedArticleReception3 !prepared-article-reception + id: preparedArticleReception3 + barcode: PAR3 + storedArticle: *storedArticleRec1 + quantity: 3 + +preparedArticleReceptions: + - *preparedArticleReception1 + - *preparedArticleReception2 + - *preparedArticleReception3 + Modified: trunk/magalie-services/src/main/resources/fixtures2.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-05-23 15:52:28 UTC (rev 188) +++ trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-05-23 16:25:34 UTC (rev 189) @@ -315,3 +315,5 @@ requestedArticles: - *requestedArticle1 - *requestedArticle2 + +preparedArticleReceptions: [] Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java (rev 0) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java 2013-05-23 16:25:34 UTC (rev 189) @@ -0,0 +1,47 @@ +package com.franciaflex.magalie.web.action; + +import com.franciaflex.magalie.persistence.entity.PreparedArticleReception; +import com.franciaflex.magalie.services.service.ReceptionService; +import com.franciaflex.magalie.web.MagalieActionSupport; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; + +@Results({ + @Result(name="success", type="redirectAction", params = { "actionName", "receive-article!input", "preparedArticleReceptionBarcode", "${barcode}" }) +}) +public class PreparePreparedArticleReceptionAction extends MagalieActionSupport { + + protected ReceptionService receptionService; + + protected String barcode; + + public void setReceptionService(ReceptionService receptionService) { + this.receptionService = receptionService; + } + + public void setBarcode(String barcode) { + this.barcode = barcode; + } + + @Override + public String execute() { + + PreparedArticleReception preparedArticleReception = + receptionService.getPreparedArticleReception(barcode); + + if (preparedArticleReception == null) { + + addFieldError("barcode", "Ce n'est pas un code-barre valide"); + + return INPUT; + + } + + return SUCCESS; + + } + + public String getBarcode() { + return barcode; + } +} Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-05-23 15:52:28 UTC (rev 188) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-05-23 16:25:34 UTC (rev 189) @@ -30,6 +30,7 @@ import com.franciaflex.magalie.services.service.ReceptionTask; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; +import com.google.common.base.Preconditions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.convention.annotation.Result; @@ -53,6 +54,8 @@ protected String storedArticleId; + protected String preparedArticleReceptionBarcode; + protected ReceptionTask receptionTask; protected ReceptionConfirmation confirmation; @@ -69,11 +72,27 @@ this.storedArticleId = storedArticleId; } + public void setPreparedArticleReceptionBarcode(String preparedArticleReceptionBarcode) { + this.preparedArticleReceptionBarcode = preparedArticleReceptionBarcode; + } + @Override public String input() { - receptionTask = service.getReceptionTask(storedArticleId); + if (storedArticleId != null) { + receptionTask = service.getReceptionTask(storedArticleId); + + } + + if (preparedArticleReceptionBarcode != null) { + + receptionTask = service.getReceptionTaskForPreparedArticleReception(preparedArticleReceptionBarcode); + + } + + Preconditions.checkNotNull(receptionTask); + return INPUT; } 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 15:52:28 UTC (rev 188) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-05-23 16:25:34 UTC (rev 189) @@ -26,31 +26,19 @@ <%@ taglib prefix="sb" uri="/struts-bootstrap-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<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> -<script> -$(document).ready(function() { - 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'));}); -}); - -</script> - + <script> + $(document).ready(function() { + bindKey('1', function(){ redirectTo($('#fulfilKanbanLink'));}); + bindKey('2', function(){ redirectTo($('#deliverRequestedArticleLink'));}); + bindKey('3', function(){ redirectTo($('#prepareArticleReceptionLink'));}); + bindKey('4', function(){ redirectTo($('#preparePreparedArticleReceptionLink'));}); + <s:if test="movementOrderResume" > + bindKey('5', function(){ redirectTo($('#movementOrderResumeLink'));}); + </s:if> + bindKey('Esc', function(){ redirectTo($('#logoutLink'));}); + }); + </script> </head> <header> @@ -62,10 +50,24 @@ </dl> </header> +<s:url namespace="/" action="fulfil-kanban!input" id="fulfilKanbanUrl"/> <s:a href="%{fulfilKanbanUrl}" cssClass="btn btn-block" id="fulfilKanbanLink">Traiter kanbans (1)</s:a> + +<s:url namespace="/" action="deliver-requested-article!input" id="deliverRequestedArticleUrl"/> <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="deliverRequestedArticleLink">Traiter listes à servir (2)</s:a> + +<s:url namespace="/" action="prepare-article-reception!input" id="prepareArticleReceptionUrl"/> <s:a href="%{prepareArticleReceptionUrl}" cssClass="btn btn-block" id="prepareArticleReceptionLink" >Traiter les réceptions fournisseurs (3)</s:a> + +<s:url namespace="/" action="prepare-prepared-article-reception!input" id="preparePreparedArticleReceptionUrl"/> +<s:a href="%{preparePreparedArticleReceptionUrl}" cssClass="btn btn-block" id="preparePreparedArticleReceptionLink" >Traiter les réceptions fournisseurs préparées (4)</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:url namespace="/" action="withdraw-item!input" id="movementOrderResumeUrl"> + <s:param name="storageMovementOrderId" value="%{movementOrderResume.id}" /> + </s:url> + <s:a href="%{movementOrderResumeUrl}" cssClass="btn btn-block" id="movementOrderResumeLink" >Reprendre l'ordre de mouvement (5)</s:a> </s:if> + +<s:url namespace="/" action="logout" id="logoutUrl"/> <s:a href="%{logoutUrl}" cssClass="btn btn-block" id="logoutLink" >Déconnexion (Esc)</s:a> Added: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp (rev 0) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp 2013-05-23 16:25:34 UTC (rev 189) @@ -0,0 +1,25 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<head> + <title>Traitement des réceptions préparées</title> + <script type="text/javascript"> + $(document).ready(function () { + $("#prepare-prepared-article-reception_barcode").focus(); + bindKey('Esc', function(){ redirectTo($('#chooseActivityLink'));}); + }); + </script> +</head> + +<s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/> + +<s:form> + + <s:textfield key="barcode" label="Code réception" inputAppendIcon="barcode" cssClass="input-medium" /> + + <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" /> + </div> + +</s:form> 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-23 15:52:28 UTC (rev 188) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-05-23 16:25:34 UTC (rev 189) @@ -39,7 +39,7 @@ <dt>Desc.</dt> <dd><s:property value="receptionTask.storedArticle.article.description" /></dd> <dt>Stocké</dt> - <dd><span id="stored">0</span> / <s:property value="receptionTask.storedArticle.quantity" /> <s:property value="receptionTask.storedArticle.article.unit" /></dd> + <dd><span id="stored">0</span> / <s:property value="receptionTask.quantity" /> <s:property value="receptionTask.storedArticle.article.unit" /></dd> </dl> </header> <section id="locations"> 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-23 15:52:28 UTC (rev 188) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-05-23 16:25:34 UTC (rev 189) @@ -33,7 +33,7 @@ }; model.isFulfilled = function() { - var isFull = this.stored() === this.storedArticle.quantity; + var isFull = this.stored() === this.quantity; return isFull; }; @@ -72,7 +72,7 @@ }; model.remainingQuantity = function() { - var remainingQuantity = this.storedArticle.quantity - this.stored(); + var remainingQuantity = this.quantity - this.stored(); return remainingQuantity; } @@ -97,9 +97,9 @@ refreshSummary : function() { $('#stored').text(model.stored()); - if (model.stored() === model.storedArticle.quantity) { + if (model.stored() === model.quantity) { $('#stored').addClass('success'); - } else if (model.stored() > model.storedArticle.quantity) { + } else if (model.stored() > model.quantity) { $('#stored').addClass('warning'); } },