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

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

29 Mar '13

Author: bleny Date: 2013-03-29 12:17:12 +0100 (Fri, 29 Mar 2013) New Revision: 57 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refactor css for c3kx Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 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-03-29 09:49:13 UTC (rev 56) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-03-29 11:17:12 UTC (rev 57) @@ -5,10 +5,10 @@ <title>Traitement des kanbans</title> </head> -<s:form cssClass="form-horizontal"> - <s:textfield name="articleBarcode" label="Article" inputAppendIcon="barcode" cssClass="input-small" /> +<s:form> + <s:textfield name="articleBarcode" label="Article" inputAppendIcon="barcode" cssClass="input-medium" /> <div class="btn-group"> - <s:submit name="next" value="Suivant" cssClass="btn btn-primary btn-small" /> + <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/login-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp 2013-03-29 09:49:13 UTC (rev 56) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp 2013-03-29 11:17:12 UTC (rev 57) @@ -5,7 +5,7 @@ <title>Connexion</title> </head> -<s:form cssClass="form-horizontal"> +<s:form> <s:select label="Utilisateur" key="login" @@ -22,6 +22,6 @@ /> <div class="btn-group"> - <s:submit value="S'identifier" cssClass="btn btn-primary btn-small" /> + <s:submit value="S'identifier" cssClass="btn btn-primary" /> </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-03-29 09:49:13 UTC (rev 56) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-03-29 11:17:12 UTC (rev 57) @@ -29,6 +29,59 @@ </script> <script src="<s:url value='/js/withdraw-item-input.js' />"></script> <title>Traitement des listes à servir</title> + <style> + + dl, + .control-group, + form, + .form-horizontal .control-group, + label { + margin: 0; + } + + select, + textarea, + input[type="text"], + input[type="password"], + input[type="datetime"], + input[type="datetime-local"], + input[type="date"], + input[type="month"], + input[type="time"], + input[type="week"], + input[type="number"], + input[type="email"], + input[type="url"], + input[type="search"], + input[type="tel"], + input[type="color"], + .uneditable-input, + .input-append .add-on, + .input-prepend .add-on { + padding: 1px; + } + + .form-horizontal .control-label { + padding-top: 3px; + } + + .form-horizontal .control-group { + margin-bottom: 1px; + } + + #storageMovements { + overflow-y: scroll; + height: 150px; + } + + #storageMovements dl { + margin: 0; + height: 50px; + box-sizing: border-box; + color: inherit; + } + + </style> </head> <header> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 09:49:13 UTC (rev 56) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 11:17:12 UTC (rev 57) @@ -32,78 +32,26 @@ overflow: auto; } -dl, -.control-group, -form, -.form-horizontal .control-group, -label { - margin: 0; -} - -select, -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"], -.uneditable-input, -.input-append .add-on, -.input-prepend .add-on { - padding: 1px; -} - -.form-horizontal .control-label { - padding-top: 3px; -} - -.form-horizontal .control-group { - margin-bottom: 1px; -} - - .dl-horizontal dt, .form-horizontal .control-label { - width: 50px; + width: 100px; } .dl-horizontal dd, .form-horizontal .controls { - margin-left: 60px; + margin-left: 120px; } -#storageMovements { - overflow-y: scroll; - height: 150px; -} - -#storageMovements dl { - margin: 0; - height: 50px; - box-sizing: border-box; - color: inherit; -} - .btn-group { margin-top: 3px; position: absolute; display: block; - right: 10px; - left: auto; + left: 10px; + right: auto; } - } -@media screen and (min-width: 240px) and (min-height: 320px) and (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { +@media screen and (min-width: 300px) and (min-height: 400px) and (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { body { background-color: grey;

1 0

r56 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 29 Mar '13

29 Mar '13

Author: bleny Date: 2013-03-29 10:49:13 +0100 (Fri, 29 Mar 2013) New Revision: 56 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: suggest quantity to withdraw when on extra site Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-03-28 15:22:04 UTC (rev 55) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-03-29 09:49:13 UTC (rev 56) @@ -91,7 +91,9 @@ } var storageMovement = this.getStorageMovement(barcode); storageMovement.used = true; - storageMovement.defect = quantity != storageMovement.expectedQuantity; + storageMovement.defect = + storageMovement.expectedQuantity != 0. // don't mark a site in error just because we wasn't supposed to withdraw item from it in the order + && quantity != storageMovement.expectedQuantity; storageMovement.withdrawn = quantity; }; @@ -106,6 +108,16 @@ this.storageMovementsIndex += 1; if (this.storageMovementsIndex >= this.storageMovements.length) { this.storageMovementsIndex = null; + } else { + var storageMovement = this.storageMovements[this.storageMovementsIndex]; + if (storageMovement.expectedQuantity == 0.) { + console.debug("will use extra site " + storageMovement.originSite.locationCode); + var remainingQuantity = this.quantity - this.withdrawn(); + storageMovement.expectedQuantity = remainingQuantity; +// var availableQuantityInSite = storageMovement.availableQuantity; +// storageMovement.expectedQuantity = Math.min(remainingQuantity, availableQuantityInSite); + console.debug("pushing new value to withdraw: " + storageMovement.expectedQuantity); + } } }; @@ -204,7 +216,7 @@ } else { var barcode = $('#withdraw-item_siteBarcode').val(); - var quantity = parseInt($('#withdraw-item_quantity').val()); + var quantity = parseFloat($('#withdraw-item_quantity').val()); model.withdraw(barcode, quantity);

1 0

r55 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/main/java/com/franciaflex/magalie/services 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/fra
by bleny＠users.forge.codelutin.com 28 Mar '13

28 Mar '13

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/revision… 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(); });

1 0

r54 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 28 Mar '13

28 Mar '13

Author: bleny Date: 2013-03-28 11:05:24 +0100 (Thu, 28 Mar 2013) New Revision: 54 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix report.jsp after adding destination site Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 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-27 15:52:22 UTC (rev 53) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-03-28 10:05:24 UTC (rev 54) @@ -21,10 +21,10 @@ Id </th> <th> - Magasin + Emplacement d'origine </th> <th> - Emplacement + Emplacement destination </th> <th> Article @@ -48,10 +48,16 @@ <s:property value="id" /> </td> <td> - <s:property value="site.storeCode" /> + <s:property value="originSite.storeCode" /> + - + <s:property value="originSite.locationCode" /> </td> <td> - <s:property value="site.locationCode" /> + <s:if test="destinationSite"> + <s:property value="destinationSite.storeCode" /> + - + <s:property value="destinationSite.locationCode" /> + </s:if> </td> <td> <s:property value="article.code" /> @@ -81,10 +87,10 @@ Id </th> <th> - Magasin + Emplacement d'origine </th> <th> - Emplacement + Emplacement destination </th> <th> Article @@ -111,10 +117,16 @@ <s:property value="id" /> </td> <td> - <s:property value="site.storeCode" /> + <s:property value="originSite.storeCode" /> + - + <s:property value="originSite.locationCode" /> </td> <td> - <s:property value="site.locationCode" /> + <s:if test="destinationSite"> + <s:property value="destinationSite.storeCode" /> + - + <s:property value="destinationSite.locationCode" /> + </s:if> </td> <td> <s:property value="article.code" />

1 0

r53 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 27 Mar '13

27 Mar '13

Author: bleny Date: 2013-03-27 16:52:22 +0100 (Wed, 27 Mar 2013) New Revision: 53 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: implements report error on a site Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-03-27 15:41:29 UTC (rev 52) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-03-27 15:52:22 UTC (rev 53) @@ -72,7 +72,7 @@ return withdrawn; }; -model.withdraw = function(barcode, quantity) { +model.getStorageMovement = function(barcode) { var storageMovement; for (var i = 0; i < this.storageMovements.length; i++) { if (barcode == this.storageMovements[i].originSite.barcode) { @@ -82,11 +82,26 @@ if (storageMovement == null) { throw new ValidationError(barcode + " n'est pas le code barre d'un emplacement valide"); } + return storageMovement; +}; + +model.withdraw = function(barcode, quantity) { + if ( ! isFinite(quantity) || quantity < 0) { + throw new ValidationError('Il faut entrer une quantité strictement supérieure à 0'); + } + var storageMovement = this.getStorageMovement(barcode); storageMovement.used = true; storageMovement.defect = quantity != storageMovement.quantity; storageMovement.withdrawn = quantity; }; +model.reportError = function(barcode) { + var storageMovement = this.getStorageMovement(barcode); + storageMovement.used = true; + storageMovement.defect = true; + storageMovement.withdrawn = 0; +}; + model.nextSite = function() { this.storageMovementsIndex += 1; if (this.storageMovementsIndex >= this.storageMovements.length) { @@ -171,9 +186,6 @@ var barcode = $('#siteBarcode').val(); var quantity = parseInt($('#quantity').val()); - if ( ! isFinite(quantity) || quantity < 0) { - throw new ValidationError('Il faut entrer une quantité strictement supérieure à 0'); - } model.withdraw(barcode, quantity); @@ -194,6 +206,35 @@ } }, + onReportError : function() { + + try { + + if (model.allowSubmit) { + + } else { + + var barcode = $('#siteBarcode').val(); + + model.reportError(barcode); + + // if used site focused as current, highlight next site to go + if (barcode == model.storageMovements[model.storageMovementsIndex].originSite.barcode) { + model.nextSite(); + } + + } + + } catch (ex) { + + if (ex instanceof ValidationError) { + handleValidationError(ex); + } else { + throw ex; + } + } + }, + onSubmit : function(e) { if (model.allowSubmit) { // push model as Json in a hidden field @@ -214,7 +255,7 @@ // bindings $(document).ready(function() { $('form').submit(controller.onSubmit); - $('#reportError').click(null); + $('#reportError').click(controller.onReportError); $('#next').click(controller.onNext); view.refresh();

1 0

r52 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 27 Mar '13

27 Mar '13

Author: bleny Date: 2013-03-27 16:41:29 +0100 (Wed, 27 Mar 2013) New Revision: 52 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: use exception handling for validation in withdraw item screen Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-03-27 14:56:51 UTC (rev 51) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-03-27 15:41:29 UTC (rev 52) @@ -33,6 +33,18 @@ return processing; } +function ValidationError(message) { + this.message = message; +} + +ValidationError.prototype = new Error(); +ValidationError.prototype.constructor = ValidationError; + +function handleValidationError(validationError) { + alert(validationError.message); + console.debug(validationError); +} + "use strict"; model.storageMovementsIndex = 0; @@ -68,7 +80,7 @@ } } if (storageMovement == null) { - alert(barcode + " n'est pas le code barre d'un emplacement valide"); + throw new ValidationError(barcode + " n'est pas le code barre d'un emplacement valide"); } storageMovement.used = true; storageMovement.defect = quantity != storageMovement.quantity; @@ -151,24 +163,34 @@ onNext : function() { - if (model.allowSubmit) { + try { - } else { + if (model.allowSubmit) { - var barcode = $('#siteBarcode').val(); - var quantity = parseInt($('#quantity').val()); - if ( ! isFinite(quantity) || quantity < 0) { - alert('Il faut entrer une quantité valide'); - return; + } else { + + var barcode = $('#siteBarcode').val(); + var quantity = parseInt($('#quantity').val()); + if ( ! isFinite(quantity) || quantity < 0) { + throw new ValidationError('Il faut entrer une quantité strictement supérieure à 0'); + } + + model.withdraw(barcode, quantity); + + // if used site focused as current, highlight next site to go + if (barcode == model.storageMovements[model.storageMovementsIndex].originSite.barcode) { + model.nextSite(); + } + } - model.withdraw(barcode, quantity); + } catch (ex) { - // if used site focused as current, highlight next site to go - if (barcode == model.storageMovements[model.storageMovementsIndex].originSite.barcode) { - model.nextSite(); + if (ex instanceof ValidationError) { + handleValidationError(ex); + } else { + throw ex; } - } },

1 0

r51 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/main/java/com/franciaflex/magalie/services magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/test/java/
by bleny＠users.forge.codelutin.com 27 Mar '13

27 Mar '13

Author: bleny Date: 2013-03-27 15:56:51 +0100 (Wed, 27 Mar 2013) New Revision: 51 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: introduce destination site, going back to always positive quantities Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.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/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css trunk/magalie-web/src/main/webapp/css/magalie.css trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java 2013-03-27 14:02:44 UTC (rev 50) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StorageMovements.java 2013-03-27 14:56:51 UTC (rev 51) @@ -17,11 +17,11 @@ } } - protected static class GetSiteFunction implements Function<StorageMovement, Site> { + protected static class GetOriginSiteFunction implements Function<StorageMovement, Site> { @Override public Site apply(StorageMovement storageMovement) { - return storageMovement.getSite(); + return storageMovement.getOriginSite(); } } @@ -37,8 +37,8 @@ return new GetArticleFunction(); } - public static Function<StorageMovement, Site> getSiteFunction() { - return new GetSiteFunction(); + public static Function<StorageMovement, Site> getOriginSiteFunction() { + return new GetOriginSiteFunction(); } public static Predicate<StorageMovement> storageMovementIsConfirmed() { Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-03-27 14:02:44 UTC (rev 50) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-03-27 14:56:51 UTC (rev 51) @@ -7,6 +7,6 @@ public interface StoredArticleDao extends Dao<StoredArticle> { - List<StoredArticle> findAllForArticle(Article article); + List<StoredArticle> findAllByArticle(Article article); } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-03-27 14:02:44 UTC (rev 50) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-03-27 14:56:51 UTC (rev 51) @@ -20,7 +20,7 @@ } @Override - public List<StoredArticle> findAllForArticle(Article article) { + public List<StoredArticle> findAllByArticle(Article article) { Query query = entityManager.createQuery("from StoredArticle sa where sa.article = :article"); query.setParameter("article", article); List<StoredArticle> resultList = query.getResultList(); 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-27 14:02:44 UTC (rev 50) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-03-27 14:56:51 UTC (rev 51) @@ -14,9 +14,12 @@ protected String id; @ManyToOne - protected Site site; + protected Site originSite; @ManyToOne + protected Site destinationSite; + + @ManyToOne protected Article article; @ManyToOne @@ -37,14 +40,22 @@ this.id = id; } - public Site getSite() { - return site; + public Site getOriginSite() { + return originSite; } - public void setSite(Site site) { - this.site = site; + public void setOriginSite(Site originSite) { + this.originSite = originSite; } + public Site getDestinationSite() { + return destinationSite; + } + + public void setDestinationSite(Site destinationSite) { + this.destinationSite = destinationSite; + } + public Article getArticle() { return article; } @@ -89,23 +100,4 @@ return confirmDate != null; } - public String getSiteId() { - return getSite().getId(); - } - - public boolean isDriverLicenseRequired() { - return getSite().isDriverLicenseRequired(); - } - - public String getStoreCode() { - return getSite().getStoreCode(); - } - - public String getLocationCode() { - return getSite().getLocationCode(); - } - - public String getSiteBarcode() { - return getSite().getBarcode(); - } } 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-27 14:02:44 UTC (rev 50) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-03-27 14:56:51 UTC (rev 51) @@ -102,7 +102,7 @@ Sets.newHashSet( Iterables.transform( getStorageMovements(), - StorageMovements.getSiteFunction() + StorageMovements.getOriginSiteFunction() ) ); return sites; 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-27 14:02:44 UTC (rev 50) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java 2013-03-27 14:56:51 UTC (rev 51) @@ -26,7 +26,7 @@ return storageMovementOrder.getArticle(); } - public List<StorageMovement> getSites() { + 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-27 14:02:44 UTC (rev 50) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-03-27 14:56:51 UTC (rev 51) @@ -41,6 +41,14 @@ public StorageMovementOrder bookArticle(MagalieUser magalieUser, Article article, double requestedQuantity) throws UnavailableArticleException, RequiredDriverLicenceException { + return bookArticle(magalieUser, article, requestedQuantity, null); + + } + + public StorageMovementOrder bookArticle( + MagalieUser magalieUser, Article article, double requestedQuantity, Site destinationSite) + throws UnavailableArticleException, RequiredDriverLicenceException { + Preconditions.checkNotNull(magalieUser); Preconditions.checkNotNull(article); @@ -106,11 +114,12 @@ newStorageMovement.setMagalieUser(magalieUser); - newStorageMovement.setSite(storedArticle.getSite()); + newStorageMovement.setOriginSite(storedArticle.getSite()); - // we remove from the stock so negative number - newStorageMovement.setQuantity( -1. * quantityWithdrawn); + newStorageMovement.setDestinationSite(destinationSite); + newStorageMovement.setQuantity(quantityWithdrawn); + if (quantityWithdrawn > 0.) { storageMovementOrder.addStorageMovement(newStorageMovement); @@ -155,7 +164,7 @@ newStorageMovement.setArticle(article); - newStorageMovement.setSite(site); + newStorageMovement.setOriginSite(site); newStorageMovement.setQuantity(0.); @@ -172,7 +181,7 @@ StoredArticleDao storedArticleDao = serviceContext.getStoredArticleDao(); - List<StoredArticle> storedArticles = storedArticleDao.findAllForArticle(article); + List<StoredArticle> storedArticles = storedArticleDao.findAllByArticle(article); // consider storage movements and compute actually available quantities @@ -188,11 +197,11 @@ for (StorageMovement storageMovement : storageMovements) { - Site site = storageMovement.getSite(); + Site originSite = storageMovement.getOriginSite(); - StoredArticle storedArticle = storedArticlesBySite.get(site); + StoredArticle storedArticle = storedArticlesBySite.get(originSite); - double actualQuantity = storedArticle.getQuantity() + storageMovement.getQuantity(); + double actualQuantity = storedArticle.getQuantity() - storageMovement.getQuantity(); if (actualQuantity > 0.) { 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-27 14:02:44 UTC (rev 50) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-03-27 14:56:51 UTC (rev 51) @@ -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.getQuantity(), DELTA); StorageMovement site2 = Iterables.get(storageMovementOrder.getStorageMovements(), 1, null); - Assert.assertEquals(-30., site2.getQuantity(), DELTA); + Assert.assertEquals(30., site2.getQuantity(), DELTA); } @Test @@ -150,11 +150,11 @@ } Assert.assertEquals(2, storageMovementOrder.getStorageMovements().size()); StorageMovement storageMovement1 = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); - Assert.assertEquals(-20., storageMovement1.getQuantity(), DELTA); - Assert.assertEquals("B2", storageMovement1.getSite().getLocationCode()); + Assert.assertEquals(20., storageMovement1.getQuantity(), DELTA); + Assert.assertEquals("B2", storageMovement1.getOriginSite().getLocationCode()); StorageMovement storageMovement2 = Iterables.get(storageMovementOrder.getStorageMovements(), 1, null); - Assert.assertEquals(-10., storageMovement2.getQuantity(), DELTA); - Assert.assertEquals("A1", storageMovement2.getSite().getLocationCode()); + Assert.assertEquals(10., storageMovement2.getQuantity(), DELTA); + Assert.assertEquals("A1", storageMovement2.getOriginSite().getLocationCode()); } catch (RequiredDriverLicenceException e) { if (log.isDebugEnabled()) { log.debug("exception raised = " + e); @@ -174,8 +174,8 @@ } Assert.assertEquals(1, storageMovementOrder.getStorageMovements().size()); StorageMovement storageMovement = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); - Assert.assertEquals(-30., storageMovement.getQuantity(), DELTA); - Assert.assertEquals("A1", storageMovement.getSite().getLocationCode()); + Assert.assertEquals(30., storageMovement.getQuantity(), DELTA); + Assert.assertEquals("A1", storageMovement.getOriginSite().getLocationCode()); } catch (RequiredDriverLicenceException e) { if (log.isDebugEnabled()) { log.debug("exception raised = " + e); @@ -212,7 +212,7 @@ Assert.assertNotEquals( "site2 must not be returned because it was reported in error", site2.getId(), - storageMovement.getSite().getId()); + storageMovement.getOriginSite().getId()); } catch (RequiredDriverLicenceException e) { if (log.isDebugEnabled()) { log.debug("exception raised = " + e); 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-27 14:02:44 UTC (rev 50) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-03-27 14:56:51 UTC (rev 51) @@ -43,10 +43,10 @@ <dd><span id="withdrawn">0</span> / <s:property value="storageMovementTask.quantity" /> <s:property value="storageMovementTask.article.unit" /></dd> </dl> </header> -<section id="sites"> +<section id="storageMovements"> </section> <form class="form-horizontal"> - <s:textfield name="site" label="Empl." inputAppendIcon="barcode" cssClass="input-small" /> + <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" /> @@ -55,10 +55,10 @@ <s:submit name="next" value="Suivant" cssClass="btn btn-primary btn-small" /> </div> </form> -<div id="siteTemplate" class="template"> +<div id="storageMovementTemplate" class="template"> <dl class="dl-horizontal"> <dt>Empl.</dt> - <dd data="locationCode"></dd> + <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> </dl> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-27 14:02:44 UTC (rev 50) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-27 14:56:51 UTC (rev 51) @@ -81,12 +81,12 @@ margin-left: 60px; } -#sites { +#storageMovements { overflow-y: scroll; height: 150px; } -#sites dl { +#storageMovements dl { margin: 0; height: 50px; box-sizing: border-box; Modified: trunk/magalie-web/src/main/webapp/css/magalie.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie.css 2013-03-27 14:02:44 UTC (rev 50) +++ trunk/magalie-web/src/main/webapp/css/magalie.css 2013-03-27 14:56:51 UTC (rev 51) @@ -30,15 +30,15 @@ left: 180px; } -#sites .success { +#storageMovements .success { background-color: #77ee77; } -#sites .pending { +#storageMovements .pending { background-color: #ffff99; } -#sites .defect { +#storageMovements .defect { background-color: #ff9999; } 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-27 14:02:44 UTC (rev 50) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-03-27 14:56:51 UTC (rev 51) @@ -35,7 +35,7 @@ "use strict"; -model.sitesIndex = 0; +model.storageMovementsIndex = 0; model.allowSubmit = false; model.isFulfilled = function() { @@ -44,7 +44,7 @@ }; model.allIsUsed = function() { - return this.sitesIndex == null; + return this.storageMovementsIndex == null; }; model.canTerminate = function() { @@ -54,31 +54,31 @@ model.withdrawn = function() { var withdrawn = 0; - for (var i = 0; i < this.sites.length; i++) { - withdrawn += this.sites[i].withdrawn || 0; + for (var i = 0; i < this.storageMovements.length; i++) { + withdrawn += this.storageMovements[i].withdrawn || 0; } return withdrawn; }; model.withdraw = function(barcode, quantity) { - var site; - for (var i = 0; i < this.sites.length; i++) { - if (barcode == this.sites[i].siteBarcode) { - site = this.sites[i]; + var storageMovement; + for (var i = 0; i < this.storageMovements.length; i++) { + if (barcode == this.storageMovements[i].originSite.barcode) { + storageMovement = this.storageMovements[i]; } } - if (site == null) { + if (storageMovement == null) { alert(barcode + " n'est pas le code barre d'un emplacement valide"); } - site.used = true; - site.defect = quantity != site.quantity; - site.withdrawn = quantity; + storageMovement.used = true; + storageMovement.defect = quantity != storageMovement.quantity; + storageMovement.withdrawn = quantity; }; model.nextSite = function() { - this.sitesIndex += 1; - if (this.sitesIndex >= this.sites.length) { - this.sitesIndex = null; + this.storageMovementsIndex += 1; + if (this.storageMovementsIndex >= this.storageMovements.length) { + this.storageMovementsIndex = null; } }; @@ -95,27 +95,27 @@ refreshSites : function() { - var sitesElement = $('#sites'); + var storageMovementsElement = $('#storageMovements'); // reset the view - sitesElement.children().remove(); + storageMovementsElement.children().remove(); - // add each site in the model - $.each(model.sites, function(key, site) { - var siteElement = processTemplate('siteTemplate', site); - $(siteElement).attr('id', 'site-' + key); - sitesElement.append(siteElement); - if (site.used) { - if (site.defect) { - $(siteElement).addClass('defect'); + // add each storage movement in the model + $.each(model.storageMovements, function(key, storageMovement) { + var storageMovementElement = processTemplate('storageMovementTemplate', storageMovement); + $(storageMovementElement).attr('id', 'storageMovement-' + key); + storageMovementsElement.append(storageMovementElement); + if (storageMovement.used) { + if (storageMovement.defect) { + $(storageMovementElement).addClass('defect'); } else { - $(siteElement).addClass('success'); + $(storageMovementElement).addClass('success'); } - } else if (site.siteId === model.sites[model.sitesIndex].siteId) { - $(siteElement).addClass('pending'); - sitesElement.scrollTop(siteElement[0].offsetTop); + } else if (storageMovement.originSite.id === model.storageMovements[model.storageMovementsIndex].originSite.id) { + $(storageMovementElement).addClass('pending'); + storageMovementsElement.scrollTop(storageMovementElement[0].offsetTop); } else { - $(siteElement).hide(); + $(storageMovementElement).hide(); } }); @@ -125,8 +125,8 @@ // reset field to prevent reuse of the value by mistake $('#site').val(''); // set default value of quantity to what should be withdrawn on the current site - if (model.sitesIndex != null) { - $('#quantity').val(model.sites[model.sitesIndex].quantity); + if (model.storageMovementsIndex != null) { + $('#quantity').val(model.storageMovements[model.storageMovementsIndex].quantity); } }, @@ -155,7 +155,7 @@ } else { - var barcode = $('#site').val(); + var barcode = $('#siteBarcode').val(); var quantity = parseInt($('#quantity').val()); if ( ! isFinite(quantity) || quantity < 0) { alert('Il faut entrer une quantité valide'); @@ -165,7 +165,7 @@ model.withdraw(barcode, quantity); // if used site focused as current, highlight next site to go - if (barcode == model.sites[model.sitesIndex].siteBarcode) { + if (barcode == model.storageMovements[model.storageMovementsIndex].originSite.barcode) { model.nextSite(); }

1 0

r50 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/test/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 27 Mar '13

27 Mar '13

Author: bleny Date: 2013-03-27 15:02:44 +0100 (Wed, 27 Mar 2013) New Revision: 50 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove deprectad method Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 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-27 14:01:45 UTC (rev 49) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-03-27 14:02:44 UTC (rev 50) @@ -66,13 +66,6 @@ this.storageMovements = storageMovements; } - /** - * @deprecated use {@link #getStorageMovements()} - */ - public List<StorageMovement> getSites() { - return storageMovements; - } - protected Set<Article> getArticles() { Set<Article> articles = Sets.newHashSet( @@ -104,8 +97,7 @@ storageMovements.add(storageMovement); } - // TODO brendan 26/03/13 rename to getSites - public Set<Site> getSites2() { + public Set<Site> getSites() { Set<Site> sites = Sets.newHashSet( Iterables.transform( 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-27 14:01:45 UTC (rev 49) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-03-27 14:02:44 UTC (rev 50) @@ -141,7 +141,7 @@ Article article = storageMovementOrder.getArticle(); - Set<Site> sitesInOrder = storageMovementOrder.getSites2(); + Set<Site> sitesInOrder = storageMovementOrder.getSites(); List<StoredArticle> storedArticles = getStoredArticles(article); 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-27 14:01:45 UTC (rev 49) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-03-27 14:02:44 UTC (rev 50) @@ -99,7 +99,7 @@ Assert.fail(); } - Assert.assertEquals(1, storageMovementOrder.getSites().size()); + Assert.assertEquals(1, storageMovementOrder.getStorageMovements().size()); } @Test @@ -126,10 +126,10 @@ Assert.fail(); } - Assert.assertEquals(2, storageMovementOrder.getSites().size()); - StorageMovement site1 = Iterables.get(storageMovementOrder.getSites(), 0, null); + Assert.assertEquals(2, storageMovementOrder.getStorageMovements().size()); + StorageMovement site1 = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); Assert.assertEquals(-20., site1.getQuantity(), DELTA); - StorageMovement site2 = Iterables.get(storageMovementOrder.getSites(), 1, null); + StorageMovement site2 = Iterables.get(storageMovementOrder.getStorageMovements(), 1, null); Assert.assertEquals(-30., site2.getQuantity(), DELTA); } @@ -148,11 +148,11 @@ if (log.isDebugEnabled()) { log.debug("storageMovementOrder = " + storageMovementOrder); } - Assert.assertEquals(2, storageMovementOrder.getSites().size()); - StorageMovement storageMovement1 = Iterables.get(storageMovementOrder.getSites(), 0, null); + Assert.assertEquals(2, storageMovementOrder.getStorageMovements().size()); + StorageMovement storageMovement1 = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); Assert.assertEquals(-20., storageMovement1.getQuantity(), DELTA); Assert.assertEquals("B2", storageMovement1.getSite().getLocationCode()); - StorageMovement storageMovement2 = Iterables.get(storageMovementOrder.getSites(), 1, null); + StorageMovement storageMovement2 = Iterables.get(storageMovementOrder.getStorageMovements(), 1, null); Assert.assertEquals(-10., storageMovement2.getQuantity(), DELTA); Assert.assertEquals("A1", storageMovement2.getSite().getLocationCode()); } catch (RequiredDriverLicenceException e) { @@ -172,8 +172,8 @@ if (log.isDebugEnabled()) { log.debug("storageMovementOrder = " + storageMovementOrder); } - Assert.assertEquals(1, storageMovementOrder.getSites().size()); - StorageMovement storageMovement = Iterables.get(storageMovementOrder.getSites(), 0, null); + Assert.assertEquals(1, storageMovementOrder.getStorageMovements().size()); + StorageMovement storageMovement = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); Assert.assertEquals(-30., storageMovement.getQuantity(), DELTA); Assert.assertEquals("A1", storageMovement.getSite().getLocationCode()); } catch (RequiredDriverLicenceException e) { @@ -207,8 +207,8 @@ if (log.isDebugEnabled()) { log.debug("storageMovementOrder = " + storageMovementOrder); } - Assert.assertEquals(1, storageMovementOrder.getSites().size()); - StorageMovement storageMovement = Iterables.get(storageMovementOrder.getSites(), 0, null); + Assert.assertEquals(1, storageMovementOrder.getStorageMovements().size()); + StorageMovement storageMovement = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); Assert.assertNotEquals( "site2 must not be returned because it was reported in error", site2.getId(),

1 0

r49 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 27 Mar '13

27 Mar '13

Author: bleny Date: 2013-03-27 15:01:45 +0100 (Wed, 27 Mar 2013) New Revision: 49 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: allow use of nested properties in template properties Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-03-27 13:14:14 UTC (rev 48) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-03-27 14:01:45 UTC (rev 49) @@ -26,7 +26,9 @@ for (var i = 0; i < elementsWithData.length; i++) { var elementWithData = elementsWithData[i]; var data = $(elementWithData).attr('data'); - $(elementWithData).text(model[data]).removeAttr('data'); + // XXX brendan 27/03/13 eval, seriously ? + var text = eval("model." + data); + $(elementWithData).text(text).removeAttr('data'); } return processing; }

1 0

r48 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web
by bleny＠users.forge.codelutin.com 27 Mar '13

27 Mar '13

Author: bleny Date: 2013-03-27 14:14:14 +0100 (Wed, 27 Mar 2013) New Revision: 48 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove hack, now login is mandatory Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-03-27 13:11:24 UTC (rev 47) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-03-27 13:14:14 UTC (rev 48) @@ -24,11 +24,9 @@ */ import com.franciaflex.magalie.MagalieApplicationConfig; -import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.services.DefaultMagalieServiceContext; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; -import com.franciaflex.magalie.services.service.MagalieUsersService; import com.google.common.base.Preconditions; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor; @@ -84,7 +82,7 @@ } else if (MagalieSession.class.isAssignableFrom(propertyType)) { - toInject = getMagalieSession(invocation, serviceContext); + toInject = getMagalieSession(invocation); } else if (MagalieApplicationConfig.class.isAssignableFrom(propertyType)) { @@ -115,7 +113,7 @@ } - protected MagalieSession getMagalieSession(ActionInvocation invocation, MagalieServiceContext serviceContext) { + protected MagalieSession getMagalieSession(ActionInvocation invocation) { MagalieSession session = (MagalieSession) invocation.getInvocationContext().getSession().get(MagalieSession.SESSION_PARAMETER); @@ -123,12 +121,6 @@ session = new MagalieSession(); - MagalieUsersService magalieUsersService = serviceContext.newService(MagalieUsersService.class); - - MagalieUser magalieUser = magalieUsersService.getMagalieUser("ale"); - - session.setMagalieUser(magalieUser); - invocation.getInvocationContext().getSession().put(MagalieSession.SESSION_PARAMETER, session); }

1 0