Author: bleny Date: 2013-03-28 16:22:04 +0100 (Thu, 28 Mar 2013) New Revision: 55 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: add service for confirmation Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Entities.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Entities.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Entities.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Entities.java 2013-03-28 15:22:04 UTC (rev 55) @@ -0,0 +1,28 @@ +package com.franciaflex.magalie.persistence; + +import com.franciaflex.magalie.persistence.entity.AbstractEntity; +import com.google.common.base.Function; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; + +public class Entities { + + private Entities() {} + + protected static class GetIdFunction implements Function<AbstractEntity, String> { + + @Override + public String apply(AbstractEntity entity) { + return entity.getId(); + } + } + + public static Function<AbstractEntity, String> getIdFunction() { + return new GetIdFunction(); + } + + public static Predicate<AbstractEntity> entityHasId(String id) { + return Predicates.compose(Predicates.equalTo(id), getIdFunction()); + } + +} Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java 2013-03-28 15:22:04 UTC (rev 55) @@ -32,7 +32,11 @@ @Override public E merge(E entity) { - return entityManager.merge(entity); + EntityTransaction transaction = entityManager.getTransaction(); + transaction.begin(); + E merge = entityManager.merge(entity); + transaction.commit(); + return merge; } @Override Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-03-28 15:22:04 UTC (rev 55) @@ -25,10 +25,12 @@ @ManyToOne protected MagalieUser magalieUser; - protected double quantity; + protected double expectedQuantity; protected Date orderDate; + protected Double actualQuantity; + protected Date confirmDate; @Override @@ -72,12 +74,12 @@ this.magalieUser = magalieUser; } - public double getQuantity() { - return quantity; + public double getExpectedQuantity() { + return expectedQuantity; } - public void setQuantity(double quantity) { - this.quantity = quantity; + public void setExpectedQuantity(double expectedQuantity) { + this.expectedQuantity = expectedQuantity; } public Date getOrderDate() { @@ -100,4 +102,11 @@ return confirmDate != null; } + public Double getActualQuantity() { + return actualQuantity; + } + + public void setActualQuantity(Double actualQuantity) { + this.actualQuantity = actualQuantity; + } } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-03-28 15:22:04 UTC (rev 55) @@ -23,7 +23,9 @@ * #L% */ +import com.franciaflex.magalie.persistence.Entities; import com.franciaflex.magalie.persistence.StorageMovements; +import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -85,7 +87,7 @@ public double getQuantity() { double quantity = 0.; for (StorageMovement storageMovement : storageMovements) { - quantity += storageMovement.getQuantity(); + quantity += storageMovement.getExpectedQuantity(); } return quantity; } @@ -108,6 +110,19 @@ return sites; } + public StorageMovement findStorageMovementBySiteId(String siteId) { + StorageMovement storageMovement = + Iterables.find( + getStorageMovements(), + Predicates.compose( + Entities.entityHasId(siteId), + StorageMovements.getOriginSiteFunction() + ), + null + ); + return storageMovement; + } + @Override public String toString() { return ToStringBuilder.reflectionToString(this); Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.java (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.java 2013-03-28 15:22:04 UTC (rev 55) @@ -0,0 +1,37 @@ +package com.franciaflex.magalie.services; + +import java.util.Map; +import java.util.Set; + +public class StorageMovementConfirmation { + + protected String storageMovementOrderId; + + protected Map<String, Double> sitesIdsToActualQuantities; + + protected Set<String> siteInErrorIds; + + public String getStorageMovementOrderId() { + return storageMovementOrderId; + } + + public void setStorageMovementOrderId(String storageMovementOrderId) { + this.storageMovementOrderId = storageMovementOrderId; + } + + public Map<String, Double> getSitesIdsToActualQuantities() { + return sitesIdsToActualQuantities; + } + + public void setSitesIdsToActualQuantities(Map<String, Double> sitesIdsToActualQuantities) { + this.sitesIdsToActualQuantities = sitesIdsToActualQuantities; + } + + public Set<String> getSiteInErrorIds() { + return siteInErrorIds; + } + + public void setSiteInErrorIds(Set<String> siteInErrorIds) { + this.siteInErrorIds = siteInErrorIds; + } +} Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java 2013-03-28 15:22:04 UTC (rev 55) @@ -26,6 +26,10 @@ return storageMovementOrder.getArticle(); } + public String getStorageMovementOrderId() { + return storageMovementOrder.getId(); + } + public List<StorageMovement> getStorageMovements() { List<StorageMovement> sites = Lists.newLinkedList(); 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-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-03-28 15:22:04 UTC (rev 55) @@ -1,6 +1,7 @@ package com.franciaflex.magalie.services.service; import com.franciaflex.magalie.persistence.StoredArticles; +import com.franciaflex.magalie.persistence.dao.SiteDao; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao; import com.franciaflex.magalie.persistence.dao.StoredArticleDao; @@ -12,6 +13,7 @@ import com.franciaflex.magalie.persistence.entity.StoredArticle; 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.franciaflex.magalie.services.exception.RequiredDriverLicenceException; import com.franciaflex.magalie.services.exception.UnavailableArticleException; @@ -27,6 +29,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; public class ArticleStorageService implements MagalieService { @@ -118,7 +121,7 @@ newStorageMovement.setDestinationSite(destinationSite); - newStorageMovement.setQuantity(quantityWithdrawn); + newStorageMovement.setExpectedQuantity(quantityWithdrawn); if (quantityWithdrawn > 0.) { @@ -166,7 +169,7 @@ newStorageMovement.setOriginSite(site); - newStorageMovement.setQuantity(0.); + newStorageMovement.setExpectedQuantity(0.); storageMovementTask.addExtraStorageMovement(newStorageMovement); @@ -201,8 +204,10 @@ StoredArticle storedArticle = storedArticlesBySite.get(originSite); - double actualQuantity = storedArticle.getQuantity() - storageMovement.getQuantity(); + // TODO brendan 28/03/13 consider actual quantity + double actualQuantity = storedArticle.getQuantity() - storageMovement.getExpectedQuantity(); + if (actualQuantity > 0.) { storedArticle.setQuantity(actualQuantity); @@ -272,4 +277,68 @@ } + public void confirmStorageMovement(StorageMovementConfirmation confirmation, MagalieUser magalieUser) { + + String storageMovementOrderId = confirmation.getStorageMovementOrderId(); + + StorageMovementOrderDao storageMovementOrderDao = + serviceContext.getStorageMovementOrderDao(); + + SiteDao siteDao = serviceContext.getSiteDao(); + + StorageMovementOrder storageMovementOrder = + storageMovementOrderDao.findById(storageMovementOrderId); + + Date confirmDate = serviceContext.getNow(); + + SiteErrorsService siteErrorsService = + serviceContext.newService(SiteErrorsService.class); + + for (Map.Entry<String, Double> siteIdToActualQuantity : confirmation.getSitesIdsToActualQuantities().entrySet()) { + + String siteId = siteIdToActualQuantity.getKey(); + + double actualQuantity = siteIdToActualQuantity.getValue(); + + StorageMovement storageMovement = + storageMovementOrder.findStorageMovementBySiteId(siteId); + + if (storageMovement == null) { + + // user made a movement out of the order from its own initiative + storageMovement = new StorageMovement(); + + Site originSite = siteDao.findById(siteId); + + storageMovement.setOriginSite(originSite); + + // TODO brendan 28/03/13 what about destination site + + storageMovement.setMagalieUser(magalieUser); + + storageMovement.setArticle(storageMovementOrder.getArticle()); + + storageMovement.setExpectedQuantity(0.); + + storageMovementOrder.getStorageMovements().add(storageMovement); + + } + + storageMovement.setConfirmDate(confirmDate); + + storageMovement.setActualQuantity(actualQuantity); + + } + + for (String siteInErrorId : confirmation.getSiteInErrorIds()) { + + Site siteInError = siteDao.findById(siteInErrorId); + + siteErrorsService.reportError(siteInError, magalieUser, confirmDate); + + } + + storageMovementOrderDao.merge(storageMovementOrder); + + } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java 2013-03-28 15:22:04 UTC (rev 55) @@ -25,6 +25,14 @@ public void reportError(Site site, MagalieUser magalieUser) { + Date reportDate = serviceContext.getNow(); + + reportError(site, magalieUser, reportDate); + + } + + public void reportError(Site site, MagalieUser magalieUser, Date reportDate) { + SiteErrorDao siteErrorDao = serviceContext.getSiteErrorDao(); SiteError existingSiteError = siteErrorDao.findBySite(site); @@ -37,8 +45,6 @@ newSiteError.setSite(site); - Date reportDate = serviceContext.getNow(); - newSiteError.setReportDate(reportDate); siteErrorDao.persist(newSiteError); @@ -50,7 +56,6 @@ } } - } public List<Site> getAllSitesInError() { Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-03-28 15:22:04 UTC (rev 55) @@ -128,9 +128,9 @@ Assert.assertEquals(2, storageMovementOrder.getStorageMovements().size()); StorageMovement site1 = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); - Assert.assertEquals(20., site1.getQuantity(), DELTA); + Assert.assertEquals(20., site1.getExpectedQuantity(), DELTA); StorageMovement site2 = Iterables.get(storageMovementOrder.getStorageMovements(), 1, null); - Assert.assertEquals(30., site2.getQuantity(), DELTA); + Assert.assertEquals(30., site2.getExpectedQuantity(), DELTA); } @Test @@ -150,10 +150,10 @@ } Assert.assertEquals(2, storageMovementOrder.getStorageMovements().size()); StorageMovement storageMovement1 = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); - Assert.assertEquals(20., storageMovement1.getQuantity(), DELTA); + Assert.assertEquals(20., storageMovement1.getExpectedQuantity(), DELTA); Assert.assertEquals("B2", storageMovement1.getOriginSite().getLocationCode()); StorageMovement storageMovement2 = Iterables.get(storageMovementOrder.getStorageMovements(), 1, null); - Assert.assertEquals(10., storageMovement2.getQuantity(), DELTA); + Assert.assertEquals(10., storageMovement2.getExpectedQuantity(), DELTA); Assert.assertEquals("A1", storageMovement2.getOriginSite().getLocationCode()); } catch (RequiredDriverLicenceException e) { if (log.isDebugEnabled()) { @@ -174,7 +174,7 @@ } Assert.assertEquals(1, storageMovementOrder.getStorageMovements().size()); StorageMovement storageMovement = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); - Assert.assertEquals(30., storageMovement.getQuantity(), DELTA); + Assert.assertEquals(30., storageMovement.getExpectedQuantity(), DELTA); Assert.assertEquals("A1", storageMovement.getOriginSite().getLocationCode()); } catch (RequiredDriverLicenceException e) { if (log.isDebugEnabled()) { 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-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-03-28 15:22:04 UTC (rev 55) @@ -23,17 +23,29 @@ * #L% */ +import com.franciaflex.magalie.MagalieTechnicalException; +import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.services.StorageMovementConfirmation; import com.franciaflex.magalie.services.StorageMovementTask; import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException; import com.franciaflex.magalie.services.exception.UnavailableArticleException; import com.franciaflex.magalie.services.service.ArticleStorageService; 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; +import org.apache.struts2.convention.annotation.Results; import org.apache.struts2.json.JSONException; +import org.apache.struts2.json.JSONPopulator; import org.apache.struts2.json.JSONUtil; +import java.util.Map; + +@Results({ + @Result(name="success", type="redirectAction", params = { "actionName", "report" }) +}) public class WithdrawItemAction extends MagalieActionSupport { private static final Log log = LogFactory.getLog(WithdrawItemAction.class); @@ -44,6 +56,14 @@ protected StorageMovementTask storageMovementTask; + protected StorageMovementConfirmation confirmation; + + protected MagalieSession session; + + public void setSession(MagalieSession session) { + this.session = session; + } + public void setService(ArticleStorageService service) { this.service = service; } @@ -75,15 +95,33 @@ } + public void setConfirmation(String confirmationJson) { + if (log.isDebugEnabled()) { + log.debug("should deserialize" + confirmationJson); + } + try { + Map deserialize = (Map) JSONUtil.deserialize(confirmationJson); + JSONPopulator jsonPopulator = new JSONPopulator(); + confirmation = new StorageMovementConfirmation(); + jsonPopulator.populateObject(confirmation, deserialize); + } catch (Throwable e) { + if (log.isErrorEnabled()) { + log.error("unable to parse confirmation, json =\n" + confirmationJson, e); + } + throw new MagalieTechnicalException(e); + } + } - public void setModel(String model) { + @Override + public String execute() { - if (log.isErrorEnabled()) { - log.error("should deserialize" + model); - } + MagalieUser magalieUser = session.getMagalieUser(); + service.confirmStorageMovement(confirmation, magalieUser); + + return SUCCESS; + } - } Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-03-28 15:22:04 UTC (rev 55) @@ -63,7 +63,7 @@ <s:property value="article.code" /> </td> <td> - <s:property value="quantity" /> <s:property value="article.unit" /> + <s:property value="expectedQuantity" /> <s:property value="article.unit" /> </td> <td> <a href="#<s:property value="magalieUser.id" />"><s:property value="magalieUser.login" /></a> @@ -96,9 +96,12 @@ Article </th> <th> - Quantité + Quantité ordre </th> <th> + Quantité réelle + </th> + <th> Utilisateur </th> <th> @@ -132,9 +135,12 @@ <s:property value="article.code" /> </td> <td> - <s:property value="quantity" /> <s:property value="article.unit" /> + <s:property value="expectedQuantity" /> <s:property value="article.unit" /> </td> <td> + <s:property value="actualQuantity" /> <s:property value="article.unit" /> + </td> + <td> <a href="#<s:property value="magalieUser.id" />"><s:property value="magalieUser.login" /></a> </td> <td> 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-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-03-28 15:22:04 UTC (rev 55) @@ -45,21 +45,21 @@ </header> <section id="storageMovements"> </section> -<form class="form-horizontal"> +<s:form cssClass="form-horizontal"> <s:textfield name="siteBarcode" label="Empl." inputAppendIcon="barcode" cssClass="input-small" /> <s:textfield name="quantity" label="Qté" inputAppend="%{storageMovementTask.article.unit}" cssClass="input-mini" /> - <s:hidden name="model" /> + <s:hidden name="confirmation" /> <div class="btn-group"> <s:submit name="reportError" value="Anomalie" cssClass="btn btn-danger btn-small" /> <s:submit name="next" value="Suivant" cssClass="btn btn-primary btn-small" /> </div> -</form> +</s:form> <div id="storageMovementTemplate" class="template"> <dl class="dl-horizontal"> <dt>Empl.</dt> <dd data="originSite.locationCode"></dd> <dt>Prélev.</dt> - <dd><span data="withdrawn">0</span> / <span data="quantity"></span> <s:property value="storageMovementTask.article.unit" /></dd> + <dd><span data="withdrawn">0</span> / <span data="expectedQuantity"></span> <s:property value="storageMovementTask.article.unit" /></dd> </dl> </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-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-03-28 15:22:04 UTC (rev 55) @@ -91,7 +91,7 @@ } var storageMovement = this.getStorageMovement(barcode); storageMovement.used = true; - storageMovement.defect = quantity != storageMovement.quantity; + storageMovement.defect = quantity != storageMovement.expectedQuantity; storageMovement.withdrawn = quantity; }; @@ -109,6 +109,25 @@ } }; +model.getConfirmation = function() { + var sitesIdsToActualQuantities = {}; + var siteInErrorIds = []; + $.each(model.storageMovements, function(key, storageMovement) { + if (storageMovement.used) { + sitesIdsToActualQuantities[storageMovement.originSite.id] = storageMovement.withdrawn; + if (storageMovement.defect) { + siteInErrorIds.push(storageMovement.originSite.id); + } + } + }); + var confirmation = { + storageMovementOrderId: this.storageMovementOrderId, + sitesIdsToActualQuantities: sitesIdsToActualQuantities, + siteInErrorIds: siteInErrorIds + }; + return confirmation; +} + var view = { refreshSummary : function() { @@ -150,18 +169,18 @@ refreshForm : function() { // reset field to prevent reuse of the value by mistake - $('#site').val(''); + $('#withdraw-item_siteBarcode').val(''); // set default value of quantity to what should be withdrawn on the current site if (model.storageMovementsIndex != null) { - $('#quantity').val(model.storageMovements[model.storageMovementsIndex].quantity); + $('#withdraw-item_quantity').val(model.storageMovements[model.storageMovementsIndex].expectedQuantity); } }, refreshButtons : function() { if (model.allowSubmit) { - $('#next').val('Terminer').removeClass('btn-primary').addClass('btn-success'); + $('#withdraw-item_next').val('Terminer').removeClass('btn-primary').addClass('btn-success'); } else { - $('#next').val('Suivant').removeClass('btn-success').addClass('btn-primary'); + $('#withdraw-item_next').val('Suivant').removeClass('btn-success').addClass('btn-primary'); } }, @@ -184,8 +203,8 @@ } else { - var barcode = $('#siteBarcode').val(); - var quantity = parseInt($('#quantity').val()); + var barcode = $('#withdraw-item_siteBarcode').val(); + var quantity = parseInt($('#withdraw-item_quantity').val()); model.withdraw(barcode, quantity); @@ -214,7 +233,7 @@ } else { - var barcode = $('#siteBarcode').val(); + var barcode = $('#withdraw-item_siteBarcode').val(); model.reportError(barcode); @@ -238,7 +257,7 @@ onSubmit : function(e) { if (model.allowSubmit) { // push model as Json in a hidden field - $('#model').val(JSON.stringify(model)); + $('#withdraw-item_confirmation').val(JSON.stringify(model.getConfirmation())); } else { e.preventDefault(); @@ -254,9 +273,9 @@ // bindings $(document).ready(function() { - $('form').submit(controller.onSubmit); - $('#reportError').click(controller.onReportError); - $('#next').click(controller.onNext); + $('#withdraw-item').submit(controller.onSubmit); + $('#withdraw-item_reportError').click(controller.onReportError); + $('#withdraw-item_next').click(controller.onNext); view.refresh(); });