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

r54 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com March 28, 2013

March 28, 2013

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 March 27, 2013

March 27, 2013

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 March 27, 2013

March 27, 2013

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 March 27, 2013

March 27, 2013

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 March 27, 2013

March 27, 2013

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 March 27, 2013

March 27, 2013

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 March 27, 2013

March 27, 2013

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

r47 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa magalie-services/src/main/java/com/franciaflex/magalie/services magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web magalie-web/src/main/java/com/franciaflex/magalie/web/action magalie-web/src/main/webapp/WEB-INF magalie-web/src/main/webapp
by bleny＠users.forge.codelutin.com March 27, 2013

March 27, 2013

Author: bleny Date: 2013-03-27 14:11:24 +0100 (Wed, 27 Mar 2013) New Revision: 47 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2223 implements login screen with two select box and logout Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SiteJpaDao.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StoreService.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/IndexAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp Removed: trunk/magalie-web/src/main/webapp/WEB-INF/content/index.jsp Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java trunk/magalie-web/src/main/webapp/WEB-INF/decorators.xml Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteDao.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SiteDao.java 2013-03-27 13:11:24 UTC (rev 47) @@ -0,0 +1,11 @@ +package com.franciaflex.magalie.persistence.dao; + +import com.franciaflex.magalie.persistence.entity.Site; + +import java.util.List; + +public interface SiteDao extends Dao<Site> { + + List<String> getAllStoreCodes(); + +} Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SiteJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SiteJpaDao.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SiteJpaDao.java 2013-03-27 13:11:24 UTC (rev 47) @@ -0,0 +1,27 @@ +package com.franciaflex.magalie.persistence.dao.jpa; + +import com.franciaflex.magalie.persistence.dao.SiteDao; +import com.franciaflex.magalie.persistence.entity.Site; + +import javax.persistence.EntityManager; +import javax.persistence.Query; +import java.util.List; + +public class SiteJpaDao extends AbstractJpaDao<Site> implements SiteDao { + + public SiteJpaDao(EntityManager entityManager) { + super(entityManager); + } + + @Override + protected Class<Site> getEntityClass() { + return Site.class; + } + + @Override + public List<String> getAllStoreCodes() { + Query query = entityManager.createQuery("select distinct s.storeCode from Site s order by s.storeCode"); + List<String> resultList = query.getResultList(); + return resultList; + } +} Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-03-27 10:31:14 UTC (rev 46) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-03-27 13:11:24 UTC (rev 47) @@ -5,6 +5,7 @@ import com.franciaflex.magalie.persistence.dao.ArticleDao; import com.franciaflex.magalie.persistence.dao.MagalieUserDao; import com.franciaflex.magalie.persistence.dao.RequestedArticleDao; +import com.franciaflex.magalie.persistence.dao.SiteDao; import com.franciaflex.magalie.persistence.dao.SiteErrorDao; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao; @@ -13,6 +14,7 @@ import com.franciaflex.magalie.persistence.dao.jpa.MagalieUserJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.RequestedArticleJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.SiteErrorJpaDao; +import com.franciaflex.magalie.persistence.dao.jpa.SiteJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.StorageMovementJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.StorageMovementOrderJpaDao; import com.franciaflex.magalie.persistence.dao.jpa.StoredArticleJpaDao; @@ -116,4 +118,9 @@ public StorageMovementOrderDao getStorageMovementOrderDao() { return new StorageMovementOrderJpaDao(entityManager); } + + @Override + public SiteDao getSiteDao() { + return new SiteJpaDao(entityManager); + } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java 2013-03-27 10:31:14 UTC (rev 46) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java 2013-03-27 13:11:24 UTC (rev 47) @@ -27,6 +27,7 @@ import com.franciaflex.magalie.persistence.dao.ArticleDao; import com.franciaflex.magalie.persistence.dao.MagalieUserDao; import com.franciaflex.magalie.persistence.dao.RequestedArticleDao; +import com.franciaflex.magalie.persistence.dao.SiteDao; import com.franciaflex.magalie.persistence.dao.SiteErrorDao; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao; @@ -58,4 +59,7 @@ SiteErrorDao getSiteErrorDao(); StorageMovementOrderDao getStorageMovementOrderDao(); + + SiteDao getSiteDao(); + } Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StoreService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StoreService.java (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StoreService.java 2013-03-27 13:11:24 UTC (rev 47) @@ -0,0 +1,25 @@ +package com.franciaflex.magalie.services.service; + +import com.franciaflex.magalie.persistence.dao.SiteDao; +import com.franciaflex.magalie.services.MagalieService; +import com.franciaflex.magalie.services.MagalieServiceContext; + +import java.util.List; + +public class StoreService implements MagalieService { + + protected MagalieServiceContext serviceContext; + + @Override + public void setServiceContext(MagalieServiceContext serviceContext) { + this.serviceContext = serviceContext; + } + + public List<String> getAllStoreCodes() { + + SiteDao dao = serviceContext.getSiteDao(); + + return dao.getAllStoreCodes(); + + } +} Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-03-27 10:31:14 UTC (rev 46) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-03-27 13:11:24 UTC (rev 47) @@ -18,6 +18,8 @@ protected MagalieUser magalieUser; + protected String storeCode; + public MagalieUser getMagalieUser() { return magalieUser; } @@ -25,4 +27,12 @@ public void setMagalieUser(MagalieUser magalieUser) { this.magalieUser = magalieUser; } + + public void setStoreCode(String storeCode) { + this.storeCode = storeCode; + } + + public String getStoreCode() { + return storeCode; + } } Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java (rev 0) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseActivityAction.java 2013-03-27 13:11:24 UTC (rev 47) @@ -0,0 +1,37 @@ +package com.franciaflex.magalie.web.action; + +import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.web.MagalieActionSupport; +import com.franciaflex.magalie.web.MagalieSession; + +public class ChooseActivityAction extends MagalieActionSupport { + + protected MagalieSession session; + + protected MagalieUser magalieUser; + + protected String storeCode; + + public void setSession(MagalieSession session) { + this.session = session; + } + + @Override + public String execute() throws Exception { + + magalieUser = session.getMagalieUser(); + + storeCode = session.getStoreCode(); + + return SUCCESS; + + } + + public MagalieUser getMagalieUser() { + return magalieUser; + } + + public String getStoreCode() { + return storeCode; + } +} Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/IndexAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/IndexAction.java (rev 0) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/IndexAction.java 2013-03-27 13:11:24 UTC (rev 47) @@ -0,0 +1,12 @@ +package com.franciaflex.magalie.web.action; + + +import com.franciaflex.magalie.web.MagalieActionSupport; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; + +@Results({ + @Result(name="success", type="redirectAction", params = { "actionName", "login!input" }) +}) +public class IndexAction extends MagalieActionSupport { +} Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java (rev 0) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java 2013-03-27 13:11:24 UTC (rev 47) @@ -0,0 +1,91 @@ +package com.franciaflex.magalie.web.action; + +import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.services.service.MagalieUsersService; +import com.franciaflex.magalie.services.service.StoreService; +import com.franciaflex.magalie.web.MagalieActionSupport; +import com.franciaflex.magalie.web.MagalieSession; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; + +import java.util.List; + +@Results({ + @Result(name="success", type="redirectAction", params = { "actionName", "choose-activity" }) +}) +public class LoginAction extends MagalieActionSupport { + + protected MagalieUsersService magalieUsersService; + + protected StoreService storeService; + + protected List<MagalieUser> allMagalieUsers; + + protected List<String> allStoreCodes; + + protected MagalieSession session; + + protected String login; + + protected String storeCode; + + public void setMagalieUsersService(MagalieUsersService magalieUsersService) { + this.magalieUsersService = magalieUsersService; + } + + public void setStoreService(StoreService storeService) { + this.storeService = storeService; + } + + public void setSession(MagalieSession session) { + this.session = session; + } + + public void setLogin(String login) { + this.login = login; + } + + public void setStoreCode(String storeCode) { + this.storeCode = storeCode; + } + + @Override + public String input() { + + allMagalieUsers = magalieUsersService.getAllMagalieUsers(); + + allStoreCodes = storeService.getAllStoreCodes(); + + return INPUT; + + } + + public String getLogin() { + return login; + } + + public String getStoreCode() { + return storeCode; + } + + public List<MagalieUser> getAllMagalieUsers() { + return allMagalieUsers; + } + + public List<String> getAllStoreCodes() { + return allStoreCodes; + } + + @Override + public String execute() { + + MagalieUser magalieUser = magalieUsersService.getMagalieUser(login); + + session.setMagalieUser(magalieUser); + + session.setStoreCode(storeCode); + + return SUCCESS; + + } +} Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java (rev 0) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LogoutAction.java 2013-03-27 13:11:24 UTC (rev 47) @@ -0,0 +1,29 @@ +package com.franciaflex.magalie.web.action; + +import com.franciaflex.magalie.web.MagalieActionSupport; +import com.franciaflex.magalie.web.MagalieSession; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; + +@Results({ + @Result(name="success", type="redirectAction", params = { "actionName", "login!input" }) +}) +public class LogoutAction extends MagalieActionSupport { + + protected MagalieSession session; + + public void setSession(MagalieSession session) { + this.session = session; + } + + @Override + public String execute() { + + session.setMagalieUser(null); + + session.setStoreCode(null); + + return SUCCESS; + + } +} Added: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp (rev 0) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-activity.jsp 2013-03-27 13:11:24 UTC (rev 47) @@ -0,0 +1,45 @@ +<%-- + #%L + MagaLiE :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2013 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sb" uri="/struts-bootstrap-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<s:url namespace="/" action="withdraw-item!input" id="withdrawItemUrl"/> +<s:url namespace="/" action="fulfil-kanban!input" id="fulfilKanbanUrl"/> +<s:url namespace="/" action="logout" id="logoutUrl"/> + +<header> + <dl class="dl-horizontal"> + <dt>Identifiant</dt> + <dd><s:property value="magalieUser.name" /> (<s:property value="magalieUser.login" />)</dd> + <dt>Magasin</dt> + <dd><s:property value="storeCode" /></dd> + </dl> +</header> + +<s:a href="%{withdrawItemUrl}" cssClass="btn btn-block">Traiter listes à servir</s:a> +<s:a href="%{fulfilKanbanUrl}" cssClass="btn btn-block">Traiter kanbans</s:a> +<s:a href="" cssClass="btn btn-block">Traiter les réceptions fournisseurs</s:a> +<s:a href="%{logoutUrl}" cssClass="btn btn-block">Déconnexion</s:a> Deleted: trunk/magalie-web/src/main/webapp/WEB-INF/content/index.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/index.jsp 2013-03-27 10:31:14 UTC (rev 46) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/index.jsp 2013-03-27 13:11:24 UTC (rev 47) @@ -1,43 +0,0 @@ -<%-- - #%L - MagaLiE :: UI - $Id:$ - $HeadURL:$ - %% - Copyright (C) 2013 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> - -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<%@ taglib prefix="sb" uri="/struts-bootstrap-tags" %> -<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> - -<s:url namespace="/" action="withdraw-item!input" id="withdrawItemUrl"/> -<s:url namespace="/" action="fulfil-kanban!input" id="fulfilKanbanUrl"/> - -<header> - <dl class="dl-horizontal"> - <dt>Identifiant</dt> - <dd>bre</dd> - <dt>Magasin</dt> - <dd>U01</dd> - </dl> -</header> - -<s:a href="%{withdrawItemUrl}" cssClass="btn btn-block">Traiter listes à servir</s:a> -<s:a href="%{fulfilKanbanUrl}" cssClass="btn btn-block">Traiter kanbans</s:a> -<s:a href="" cssClass="btn btn-block">Traiter les réceptions fournisseurs</s:a> Copied: trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp (from rev 39, trunk/magalie-web/src/main/webapp/WEB-INF/content/index.jsp) =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp (rev 0) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/login-input.jsp 2013-03-27 13:11:24 UTC (rev 47) @@ -0,0 +1,27 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<head> + <title>Connexion</title> +</head> + +<s:form cssClass="form-horizontal"> + + <s:select label="Utilisateur" + key="login" + list="allMagalieUsers" + listKey="login" + listValue="name" + required="true" + /> + + <s:select label="Magasin" + key="storeCode" + list="allStoreCodes" + required="true" + /> + + <div class="btn-group"> + <s:submit value="S'identifier" cssClass="btn btn-primary btn-small" /> + </div> +</s:form> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/decorators.xml 2013-03-27 10:31:14 UTC (rev 46) +++ trunk/magalie-web/src/main/webapp/WEB-INF/decorators.xml 2013-03-27 13:11:24 UTC (rev 47) @@ -26,9 +26,6 @@ <pattern>/js/*</pattern> <pattern>/images/*</pattern> <pattern>/config-browser/*</pattern> - <pattern>/login*</pattern> - <pattern>/recoverPassword*</pattern> - <pattern>/register*</pattern> </excludes> <decorator name="layout" page="layout.jsp">

1 0

r46 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity
by bleny＠users.forge.codelutin.com March 27, 2013

March 27, 2013

Author: bleny Date: 2013-03-27 11:31:14 +0100 (Wed, 27 Mar 2013) New Revision: 46 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: make storage movement order keep storage movement in order in db Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.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 10:18:04 UTC (rev 45) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-03-27 10:31:14 UTC (rev 46) @@ -25,6 +25,7 @@ import com.franciaflex.magalie.persistence.StorageMovements; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -33,6 +34,8 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.OneToMany; +import javax.persistence.OrderColumn; +import java.util.List; import java.util.Set; @Entity @@ -52,20 +55,21 @@ } @OneToMany(cascade = CascadeType.ALL) - protected Set<StorageMovement> storageMovements; + @OrderColumn + protected List<StorageMovement> storageMovements; - public Set<StorageMovement> getStorageMovements() { + public List<StorageMovement> getStorageMovements() { return storageMovements; } - public void setStorageMovements(Set<StorageMovement> storageMovements) { + public void setStorageMovements(List<StorageMovement> storageMovements) { this.storageMovements = storageMovements; } /** * @deprecated use {@link #getStorageMovements()} */ - public Set<StorageMovement> getSites() { + public List<StorageMovement> getSites() { return storageMovements; } @@ -95,7 +99,7 @@ public void addStorageMovement(StorageMovement storageMovement) { if (storageMovements == null) { - storageMovements = Sets.newLinkedHashSet(); + storageMovements = Lists.newLinkedList(); } storageMovements.add(storageMovement); }

1 0

r45 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/test/resources
by bleny＠users.forge.codelutin.com March 27, 2013

March 27, 2013

Author: bleny Date: 2013-03-27 11:18:04 +0100 (Wed, 27 Mar 2013) New Revision: 45 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: support multiple fixed sites for article Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java trunk/magalie-services/src/test/resources/fixtures.yaml Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-03-26 16:39:09 UTC (rev 44) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-03-27 10:18:04 UTC (rev 45) @@ -11,6 +11,7 @@ import java.util.Collection; import java.util.Comparator; +import java.util.Set; public class StoredArticles { @@ -23,10 +24,13 @@ } @Override - public int compare(StoredArticle o1, StoredArticle o2) { - if (o1.getSite().equals(article.getFixedSite())) { + public int compare(StoredArticle storedArticle1, StoredArticle storedArticle2) { + Set<Site> fixedSites = article.getFixedSites(); + boolean storedArticle1isInFixedSite = fixedSites.contains(storedArticle1.getSite()); + boolean storedArticle2isInFixedSite = fixedSites.contains(storedArticle2.getSite()); + if (storedArticle1isInFixedSite && ! storedArticle2isInFixedSite) { return -1; - } else if (o2.getSite().equals(article.getFixedSite())) { + } else if ( ! storedArticle1isInFixedSite && storedArticle2isInFixedSite) { return +1; } return 0; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-03-26 16:39:09 UTC (rev 44) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-03-27 10:18:04 UTC (rev 45) @@ -2,7 +2,8 @@ import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.ManyToOne; +import javax.persistence.ManyToMany; +import java.util.Set; @Entity public class Article extends AbstractEntity { @@ -10,8 +11,8 @@ @Id protected String id; - @ManyToOne - protected Site fixedSite; + @ManyToMany + protected Set<Site> fixedSites; protected String description; @@ -30,12 +31,12 @@ this.id = id; } - public Site getFixedSite() { - return fixedSite; + public Set<Site> getFixedSites() { + return fixedSites; } - public void setFixedSite(Site fixedSite) { - this.fixedSite = fixedSite; + public void setFixedSites(Set<Site> fixedSites) { + this.fixedSites = fixedSites; } public String getCode() { Modified: trunk/magalie-services/src/test/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/test/resources/fixtures.yaml 2013-03-26 16:39:09 UTC (rev 44) +++ trunk/magalie-services/src/test/resources/fixtures.yaml 2013-03-27 10:18:04 UTC (rev 45) @@ -77,7 +77,8 @@ article1: &article1 !article id: article1 - fixedSite: *site1 + fixedSites: + - *site1 code: 111111111 quantityInKanban: 10 unit: kg @@ -94,7 +95,8 @@ article3: &article3 !article id: article3 - fixedSite: *site2 + fixedSites: + - *site2 code: 333333333 quantityInKanban: 50 unit: g

1 0