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

r291 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao magalie-persistence/src/main/resources 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/franciaflex/magalie/web/action magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 04 Jul '13

04 Jul '13

Author: bleny Date: 2013-07-04 16:15:09 +0200 (Thu, 04 Jul 2013) New Revision: 291 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: when using PreparedArticleReception, we look for something stored in reception location but in the same building 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/StoredArticleJpaDao.java trunk/magalie-persistence/src/main/resources/magalie.properties trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferLocationAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp 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-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-07-04 14:15:09 UTC (rev 291) @@ -42,6 +42,6 @@ List<StoredArticle> findAllByLocation(Location location); - StoredArticle findInReception(Article article); + StoredArticle findInReception(Building building, Article article); } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleJpaDao.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleJpaDao.java 2013-07-04 14:15:09 UTC (rev 291) @@ -95,8 +95,9 @@ } @Override - public StoredArticle findInReception(Article article) { - TypedQuery<StoredArticle> query = createQuery("from StoredArticle sa where sa.article = :article and sa.location.code = :codeForReceptionLocations"); + public StoredArticle findInReception(Building building, Article article) { + TypedQuery<StoredArticle> query = createQuery("from StoredArticle sa where sa.article = :article and sa.location.code = :codeForReceptionLocations and sa.location.warehouse.building = :building"); + query.setParameter("building", building); query.setParameter("article", article); query.setParameter("codeForReceptionLocations", Locations.codeForReceptionLocations()); return findUnique(query); Modified: trunk/magalie-persistence/src/main/resources/magalie.properties =================================================================== --- trunk/magalie-persistence/src/main/resources/magalie.properties 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-persistence/src/main/resources/magalie.properties 2013-07-04 14:15:09 UTC (rev 291) @@ -26,7 +26,7 @@ javax.persistence.jdbc.password= hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.hbm2ddl.auto=update -hibernate.show_sql=true +hibernate.show_sql=false hibernate.format_sql=true hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-07-04 14:15:09 UTC (rev 291) @@ -96,7 +96,7 @@ } - public PreparedArticleReception getPreparedArticleReception(String barcode) + public PreparedArticleReception getPreparedArticleReception(Building building, String barcode) throws InvalidMagalieBarcodeException, PreparedArticleReceptionAlreadyStoredException { JpaMagaliePersistenceContext persistenceContext = @@ -118,7 +118,7 @@ Article article = preparedArticleReception.getArticle(); StoredArticle storedArticle = - storedArticleDao.findInReception(article); + storedArticleDao.findInReception(building, article); if (storedArticle == null) { throw new PreparedArticleReceptionAlreadyStoredException(preparedArticleReception); Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-04 14:15:09 UTC (rev 291) @@ -189,10 +189,10 @@ } - public ReceptionTask getReceptionTaskForPreparedArticleReception(String barcode) throws PreparedArticleReceptionAlreadyStoredException, InvalidMagalieBarcodeException { + public ReceptionTask getReceptionTaskForPreparedArticleReception(Building building, String barcode) throws PreparedArticleReceptionAlreadyStoredException, InvalidMagalieBarcodeException { PreparedArticleReception preparedArticleReception = - getPreparedArticleReception(barcode); + getPreparedArticleReception(building, barcode); JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); @@ -203,7 +203,7 @@ Article article = preparedArticleReception.getArticle(); StoredArticle storedArticle = - storedArticleDao.findInReception(article); + storedArticleDao.findInReception(building, article); ReceptionTask receptionTask = buildReceptionTask( storedArticle, @@ -297,7 +297,7 @@ ); if (log.isDebugEnabled()) { - log.debug(result.size() + "locations to receive articles for article " + log.debug(result.size() + " locations to receive articles for article " + article + " in warehouse " + warehouse + " are " + StringUtils.join(result, ", ")); } @@ -379,13 +379,13 @@ } - public PreparedArticleReception getPreparedArticleReception(String barcode) throws InvalidMagalieBarcodeException, PreparedArticleReceptionAlreadyStoredException { + public PreparedArticleReception getPreparedArticleReception(Building building, String barcode) throws InvalidMagalieBarcodeException, PreparedArticleReceptionAlreadyStoredException { MagalieBarcodeService magalieBarcodeService = serviceContext.newService(MagalieBarcodeService.class); PreparedArticleReception preparedArticleReception = - magalieBarcodeService.getPreparedArticleReception(barcode); + magalieBarcodeService.getPreparedArticleReception(building, barcode); return preparedArticleReception; Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-07-04 14:15:09 UTC (rev 291) @@ -238,7 +238,7 @@ try { PreparedArticleReception preparedArticleReception = - service.getPreparedArticleReception(barcode); + service.getPreparedArticleReception(building, barcode); Assert.assertNotNull(preparedArticleReception); @@ -256,7 +256,7 @@ ReceptionTask receptionTask = null; try { - receptionTask = service.getReceptionTaskForPreparedArticleReception(barcode); + receptionTask = service.getReceptionTaskForPreparedArticleReception(building, barcode); } catch (PreparedArticleReceptionAlreadyStoredException e) { if (log.isErrorEnabled()) { log.error("unexpected exception", e); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java 2013-07-04 14:15:09 UTC (rev 291) @@ -23,6 +23,7 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; import com.franciaflex.magalie.services.service.ReceptionService; @@ -60,9 +61,11 @@ session.setActivity(Activity.PREPARED_RECEPTIONS); + Building building = session.getBuilding(); + try { - receptionService.getPreparedArticleReception(barcode); + receptionService.getPreparedArticleReception(building, barcode); } catch (PreparedArticleReceptionAlreadyStoredException e) { Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-07-04 14:15:09 UTC (rev 291) @@ -24,6 +24,7 @@ */ import com.franciaflex.magalie.MagalieTechnicalException; +import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; @@ -83,6 +84,8 @@ @Override public String input() { + Building building = session.getBuilding(); + if (storedArticleId != null) { receptionTask = service.getReceptionTask(storedArticleId); @@ -93,7 +96,7 @@ try { - receptionTask = service.getReceptionTaskForPreparedArticleReception(preparedArticleReceptionBarcode); + receptionTask = service.getReceptionTaskForPreparedArticleReception(building, preparedArticleReceptionBarcode); } catch (PreparedArticleReceptionAlreadyStoredException e) { Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-07-04 14:15:09 UTC (rev 291) @@ -64,7 +64,7 @@ protected StoredArticle storedArticle; - protected String destinationBarCode; + protected String destinationBarcode; protected double quantity; @@ -120,16 +120,16 @@ return quantity; } - public String getDestinationBarCode (){ - return destinationBarCode; + public String getDestinationBarcode(){ + return destinationBarcode; } public void setStoredArticleId(String storedArticleId) { this.storedArticleId = storedArticleId; } - public void setDestinationBarCode(String destinationBarCode) { - this.destinationBarCode = destinationBarCode; + public void setDestinationBarcode(String destinationBarcode) { + this.destinationBarcode = destinationBarcode; } public void setQuantity(double quantity) { @@ -143,10 +143,9 @@ log.debug("originId : " + originId + "\n" + "storedArticleId : " + storedArticleId + "\n" + "quantity : " + quantity + "\n" + - "destinationBarCode : " + destinationBarCode); + "destinationBarcode : " + destinationBarcode); } - origin = service.getLocationById(originId); storedArticle = service.findStoredArticle(storedArticleId); @@ -161,8 +160,8 @@ return INPUT; } - if (destinationBarCode.isEmpty()) { - addFieldError("destinationBarCode", "L'emplacement de destination doit être renseigné"); + if (destinationBarcode.isEmpty()) { + addFieldError("destinationBarcode", "L'emplacement de destination doit être renseigné"); return INPUT; } @@ -174,24 +173,24 @@ try { - destination = service.getLocation(building, magalieUser, destinationBarCode); + destination = service.getLocation(building, magalieUser, destinationBarcode); } catch (InvalidMagalieBarcodeException e) { - addFieldError("destinationBarCode", "Le code barre n'est pas un code valide"); + addFieldError("destinationBarcode", "Le code barre n'est pas un code valide"); return INPUT; } catch (InaccessibleLocationException e) { - addFieldError("destinationBarCode", "Vous n'êtes pas autorisé à accéder à l'emplacement"); + addFieldError("destinationBarcode", "Vous n'êtes pas autorisé à accéder à l'emplacement"); return INPUT; } if (destination.equals(storedArticle.getLocation())) { - addFieldError("destinationBarCode", "la destination doit être différente de l'origine"); + addFieldError("destinationBarcode", "la destination doit être différente de l'origine"); return INPUT; } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferLocationAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferLocationAction.java 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferLocationAction.java 2013-07-04 14:15:09 UTC (rev 291) @@ -54,7 +54,7 @@ protected StorageTransferService service; - protected String originBarCode; + protected String originBarcode; protected Location origin; @@ -66,15 +66,15 @@ this.session = session; } - public void setOriginBarCode(String originBarCode) { - this.originBarCode = originBarCode; + public void setOriginBarcode(String originBarcode) { + this.originBarcode = originBarcode; } @Override public String execute() { if (log.isDebugEnabled()) { - log.debug("origin BarCode : " + originBarCode); + log.debug("origin BarCode : " + originBarcode); } Building building = session.getBuilding(); @@ -83,17 +83,17 @@ try { - origin = service.getLocation(building, magalieUser, originBarCode); + origin = service.getLocation(building, magalieUser, originBarcode); } catch (InvalidMagalieBarcodeException e) { - addFieldError("originBarCode", "Le code barre n'est pas un code valide"); + addFieldError("originBarcode", "Le code barre n'est pas un code valide"); return INPUT; } catch (InaccessibleLocationException e) { - addFieldError("originBarCode", "Vous n'êtes pas autorisé à accéder à l'emplacement"); + addFieldError("originBarcode", "Vous n'êtes pas autorisé à accéder à l'emplacement"); return INPUT; Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-04 14:15:09 UTC (rev 291) @@ -100,7 +100,7 @@ <s:textfield name="quantity" label="Qté" inputAppend="%{storedArticle.article.unit}" type="number" step="any" min="0" cssClass="input-mini" /> - <s:textfield key="destinationBarCode" label="Destination" inputAppendIcon="barcode" cssClass="input-small" /> + <s:textfield key="destinationBarcode" label="Destination" inputAppendIcon="barcode" cssClass="input-small" /> <div class="btn-group"> <s:a href="%{cancelUrl}" cssClass="btn" id="CancelLink" >Quitter (Esc)</s:a> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp 2013-07-04 13:50:46 UTC (rev 290) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-location-input.jsp 2013-07-04 14:15:09 UTC (rev 291) @@ -37,7 +37,7 @@ <s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/> <s:form> - <s:textfield key="originBarCode" label="Emplacement de prélévement" inputAppendIcon="barcode" cssClass="input-medium" /> + <s:textfield key="originBarcode" label="Emplacement de prélévement" inputAppendIcon="barcode" cssClass="input-medium" /> <div class="btn-group"> <s:a href="%{chooseActivityUrl}" cssClass="btn" id="chooseActivityLink" >Changer d'activité (Esc)</s:a>

1 0

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

04 Jul '13

Author: bleny Date: 2013-07-04 15:50:46 +0200 (Thu, 04 Jul 2013) New Revision: 290 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: better presentation for prepare-article-reception Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-07-04 13:50:27 UTC (rev 289) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-07-04 13:50:46 UTC (rev 290) @@ -34,7 +34,7 @@ </head> <s:if test="suppliersToReceive.somethingToReceive"> - <ul id="receivedSuppliers"> + <ul class="oneItemPerLine"> <li> <script type="text/javascript"> $(document).ready(function () { Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-07-04 13:50:27 UTC (rev 289) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-07-04 13:50:46 UTC (rev 290) @@ -31,7 +31,7 @@ </script> </head> -<ul id="receivedArticles"> +<ul class="oneItemPerLine"> <s:iterator value="receivedArticles" status="stat" > <s:set var="receiveArticleId">prepareArticleReceptionId<s:property value="#stat.index" /></s:set> <s:url namespace="/" action="receive-article!input" id="receiveArticleUrl"> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-07-04 13:50:27 UTC (rev 289) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-07-04 13:50:46 UTC (rev 290) @@ -32,7 +32,7 @@ <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> </head> -<ul id="receiveArticleHeader"> +<ul class="oneItemPerLine"> <li> Réf. : <s:property value="receptionTask.storedArticle.article.code" /> </li> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-04 13:50:27 UTC (rev 289) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-04 13:50:46 UTC (rev 290) @@ -58,41 +58,40 @@ <s:if test="storedArticle == null" > - <s:iterator value="storedArticles" status="stat"> - <li> - <s:set var="elementStoredArticleId">storedArticleId<s:property value="#stat.index" /></s:set> - <s:url namespace="/" action="storage-transfer!input" id="storageTransferNextStepUrl"> - <s:param name="originId" value="%{origin.id}" /> - <s:param name="storedArticleId" value="%{id}" /> - </s:url> - <s:if test="#stat.index < shortcuts.size()"> - <script type="text/javascript"> - $(document).ready(function () { - var id = '<s:property value="elementStoredArticleId" />'; - bindKey(<s:property value="shortcuts.get(#stat.index)" />, function(){ redirectTo($('#' + id));}); - }); - </script> - <s:a href="%{storageTransferNextStepUrl}" id="%{elementStoredArticleId}"> - <s:property value="article.description" /> - (<s:property value="article.code" />) - (<s:property value="quantity" /> - <s:property value="article.unit" />) - (<s:property value="shortcuts.get(#stat.index)" />) - </s:a> - </s:if> - <s:else> - <s:a href="%{storageTransferNextStepUrl}" > - <s:property value="article.description" /> - (<s:property value="article.code" />) - (<s:property value="quantity" /> - <s:property value="article.unit" />) - </s:a> - </s:else> - </li> - </s:iterator> + <ul class="oneItemPerLine"> + <s:iterator value="storedArticles" status="stat"> + <li> + <s:set var="elementStoredArticleId">storedArticleId<s:property value="#stat.index" /></s:set> + <s:url namespace="/" action="storage-transfer!input" id="storageTransferNextStepUrl"> + <s:param name="originId" value="%{origin.id}" /> + <s:param name="storedArticleId" value="%{id}" /> + </s:url> + <s:if test="#stat.index < shortcuts.size()"> + <script type="text/javascript"> + $(document).ready(function () { + var id = '<s:property value="elementStoredArticleId" />'; + bindKey(<s:property value="shortcuts.get(#stat.index)" />, function(){ redirectTo($('#' + id));}); + }); + </script> + <s:a href="%{storageTransferNextStepUrl}" id="%{elementStoredArticleId}"> + (<s:property value="shortcuts.get(#stat.index)" />) + <s:property value="article.code" /> + Qté <s:property value="quantity" /> <s:property value="article.unit" /> + <s:property value="article.description" /> + </s:a> + </s:if> + <s:else> + <s:a href="%{storageTransferNextStepUrl}" > + <s:property value="article.code" /> + Qté <s:property value="quantity" /> <s:property value="article.unit" /> + <s:property value="article.description" /> + </s:a> + </s:else> + </li> + </s:iterator> + </ul> <s:a href="%{cancelUrl}" cssClass="btn" id="CancelLink" >Quitter (Esc)</s:a> - </s:if> <s:else> <s:form cssClass="form-horizontal"> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-07-04 13:50:27 UTC (rev 289) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-07-04 13:50:46 UTC (rev 290) @@ -72,7 +72,7 @@ right: auto; } -#receivedArticles, #receivedSuppliers, #receiveArticleHeader { +ul.oneItemPerLine { margin-left: 5px; list-style-type: none; overflow-x: hidden;

1 0

r289 - trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 04 Jul '13

04 Jul '13

Author: bleny Date: 2013-07-04 15:50:27 +0200 (Thu, 04 Jul 2013) New Revision: 289 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: explicit name for test Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-07-04 13:39:51 UTC (rev 288) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-07-04 13:50:27 UTC (rev 289) @@ -317,7 +317,7 @@ * It's only a performance test to test with 5000+ locations. */ @Test - public void testName() { + public void testPerformanceWithThousandsLocations() { EntityManager entityManager = getJpaEntityManagerRule().newEntityManager();

1 0

r288 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 04 Jul '13

04 Jul '13

Author: bleny Date: 2013-07-04 15:39:51 +0200 (Thu, 04 Jul 2013) New Revision: 288 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove fake text Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-07-04 13:33:58 UTC (rev 287) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-07-04 13:39:51 UTC (rev 288) @@ -37,7 +37,7 @@ Réf. : <s:property value="receptionTask.storedArticle.article.code" /> </li> <li> - Desc. : <s:property value="receptionTask.storedArticle.article.description" />IQSUHFQ QDIUBVD HUQBUDB QUIBCIU + Desc. : <s:property value="receptionTask.storedArticle.article.description" /> </li> <li> Stocké :

1 0

r287 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web
by bleny＠users.forge.codelutin.com 04 Jul '13

04 Jul '13

Author: bleny Date: 2013-07-04 15:33:58 +0200 (Thu, 04 Jul 2013) New Revision: 287 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: create an init method in MagalieApplicationContext, remove fixtures loading from Interceptor Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java 2013-07-04 13:26:41 UTC (rev 286) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java 2013-07-04 13:33:58 UTC (rev 287) @@ -27,6 +27,7 @@ import com.franciaflex.magalie.persistence.JpaMagaliePersistenceContext; import com.franciaflex.magalie.services.DefaultMagalieServiceContext; import com.franciaflex.magalie.services.MagalieServiceContext; +import com.franciaflex.magalie.services.service.FixturesService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -121,4 +122,28 @@ } + public void init() { + + if (getMagalieApplicationConfig().isDevMode()) { + + if (log.isInfoEnabled()) { + log.info("devMode is enabled, loading fixtures set"); + } + + EntityManager entityManager = newEntityManager(); + + MagalieServiceContext serviceContext = + newServiceContext(entityManager); + + FixturesService fixturesService = + serviceContext.newService(FixturesService.class); + + fixturesService.cleanDatabaseAndLoadFixtures("fixtures"); + + entityManager.close(); + + } + + } + } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java 2013-07-04 13:26:41 UTC (rev 286) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java 2013-07-04 13:33:58 UTC (rev 287) @@ -48,6 +48,8 @@ MagalieApplicationContext.APPLICATION_CONTEXT_PARAMETER, applicationContext); + applicationContext.init(); + } @Override 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-07-04 13:26:41 UTC (rev 286) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-07-04 13:33:58 UTC (rev 287) @@ -26,7 +26,6 @@ import com.franciaflex.magalie.MagalieApplicationConfig; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; -import com.franciaflex.magalie.services.service.FixturesService; import com.franciaflex.magalie.web.action.ChooseCompanyAction; import com.franciaflex.magalie.web.action.IndexAction; import com.franciaflex.magalie.web.action.LoginAction; @@ -57,8 +56,6 @@ private static final Log log = LogFactory.getLog(MagalieInterceptor.class); - protected boolean fixturesLoaded = false; - @Override public void init() { @@ -75,18 +72,6 @@ if (action instanceof MagalieActionSupport) { - MagalieServiceContext serviceContext = newServiceContext(invocation); - - if ( ! fixturesLoaded && serviceContext.getMagalieApplicationConfig().isDevMode()) { - - FixturesService fixturesService = serviceContext.newService(FixturesService.class); - - fixturesService.cleanDatabaseAndLoadFixtures("fixtures"); - - fixturesLoaded = true; - - } - MagalieSession magalieSession = getMagalieSession(invocation); if (CollectionUtils.isNotEmpty(magalieSession.getMessages())) { @@ -108,6 +93,8 @@ actionClass, BeanUtil.IS_WRITE_DESCRIPTOR); + MagalieServiceContext serviceContext = newServiceContext(invocation); + for (PropertyDescriptor propertyDescriptor : descriptors) { Class<?> propertyType = propertyDescriptor.getPropertyType();

1 0

r286 - in trunk: magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/test/java/com/franciaflex/magalie/services/service magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 04 Jul '13

04 Jul '13

Author: bleny Date: 2013-07-04 15:26:41 +0200 (Thu, 04 Jul 2013) New Revision: 286 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add some elements to heap finding performance issue in article reception Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java trunk/magalie-web/src/main/webapp/js/receive-article-input.js Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-07-04 09:06:18 UTC (rev 285) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-07-04 13:26:41 UTC (rev 286) @@ -160,6 +160,24 @@ } +// Warehouse u01 = fixtures.fixture("U01"); +// +// Warehouse u02 = fixtures.fixture("U02"); +// +// for (int i = 1 ; i <= 10000 ; i++) { +// +// Location location = new Location(); +// +// String locationCode = String.valueOf(i); +// +// location.setCode(locationCode); +// +// location.setWarehouse(i % 2 == 0 ? u01 : u02); +// +// locationDao.persist(location); +// +// } + SupplierJpaDao supplierDao = persistenceContext.getSupplierDao(); Collection<Supplier> suppliers = fixtures.fixture("suppliers"); Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-04 09:06:18 UTC (rev 285) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-04 13:26:41 UTC (rev 286) @@ -219,6 +219,10 @@ protected List<Location> findLocationsToReceiveArticle(Warehouse warehouse, Article article) { + if (log.isTraceEnabled()) { + log.trace("looking for locations to receive for " + article + " in " + warehouse); + } + // first step, add fixed locations for this article first Set<Location> locations = Sets.newLinkedHashSet(); @@ -265,7 +269,8 @@ locations.addAll(locationDao.findAllWithoutReception(warehouse)); // add all locations in the same building, other warehouses - locations.addAll(locationDao.findAllWithoutReception(warehouse.getBuilding())); + // FIXME brendan 04/07/13 re-enable + // locations.addAll(locationDao.findAllWithoutReception(warehouse.getBuilding())); // fourth step, remove reception locations because it's stupid to // move an article from reception location to another reception location @@ -292,7 +297,7 @@ ); if (log.isDebugEnabled()) { - log.debug("locations to receive articles for article " + log.debug(result.size() + "locations to receive articles for article " + article + " in warehouse " + warehouse + " are " + StringUtils.join(result, ", ")); } Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-07-04 09:06:18 UTC (rev 285) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-07-04 13:26:41 UTC (rev 286) @@ -35,6 +35,7 @@ import com.franciaflex.magalie.persistence.entity.StorageMovement; import com.franciaflex.magalie.persistence.entity.StoredArticle; import com.franciaflex.magalie.persistence.entity.Supplier; +import com.franciaflex.magalie.persistence.entity.Warehouse; import com.franciaflex.magalie.services.AbstractMagalieServiceTest; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; @@ -46,6 +47,8 @@ import org.junit.Before; import org.junit.Test; +import javax.persistence.EntityManager; +import javax.persistence.EntityTransaction; import java.text.ParseException; import java.util.Date; import java.util.List; @@ -310,4 +313,47 @@ } + /** + * It's only a performance test to test with 5000+ locations. + */ + @Test + public void testName() { + + EntityManager entityManager = getJpaEntityManagerRule().newEntityManager(); + + EntityTransaction transaction = entityManager.getTransaction(); + + transaction.begin(); + + Warehouse u01 = fixture("U01"); + + Warehouse u02 = fixture("U02"); + + for (int i = 1 ; i <= 5000 ; i++) { + + Location location = new Location(); + + String locationCode = String.valueOf(i); + + location.setCode(locationCode); + + location.setWarehouse(i % 2 == 0 ? u01 : u02); + + entityManager.persist(location); + + } + + transaction.commit(); + + long time = System.currentTimeMillis(); + + List<Location> locations = service.findLocationsToReceiveArticle(u02, article); + + if (log.isTraceEnabled()) { + log.trace("getting a result of " + locations.size() + + " locations took " + (System.currentTimeMillis() - time)); + } + + } + } Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-07-04 09:06:18 UTC (rev 285) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-07-04 13:26:41 UTC (rev 286) @@ -50,6 +50,9 @@ } } if (location == null) { + // try to load it form JSON request ? + } + if (location == null) { throw new ValidationError(barcode + " n'est pas le code barre d'un emplacement valide"); } return location;

1 0

r285 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 04 Jul '13

04 Jul '13

Author: bleny Date: 2013-07-04 11:06:18 +0200 (Thu, 04 Jul 2013) New Revision: 285 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: sort companies by name on choose-campany, sort building by code, users by name Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BuildingsService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/CompanyService.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingJpaDao.java 2013-07-04 08:45:15 UTC (rev 284) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/BuildingJpaDao.java 2013-07-04 09:06:18 UTC (rev 285) @@ -34,15 +34,16 @@ * @author Bavencoff */ public class BuildingJpaDao extends AbstractBuildingJpaDao { + public BuildingJpaDao(EntityManager entityManager) { super(entityManager); } @Override public List<Building> findAllByCompany(Company company) { - - TypedQuery<Building> query = createQuery(Building.PROPERTY_COMPANY, company); - + TypedQuery<Building> query = createQuery("from Building b where b.company = :company order by b.code"); + query.setParameter("company", company); return findAll(query); } + } Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/CompanyJpaDao.java 2013-07-04 09:06:18 UTC (rev 285) @@ -0,0 +1,20 @@ +package com.franciaflex.magalie.persistence.dao; + +import com.franciaflex.magalie.persistence.entity.Company; + +import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; +import java.util.List; + +public class CompanyJpaDao extends AbstractCompanyJpaDao { + + public CompanyJpaDao(EntityManager entityManager) { + super(entityManager); + } + + public List<Company> findAllOrderByName() { + TypedQuery<Company> query = createQuery("from Company c order by c.name"); + return findAll(query); + } + +} //CompanyJpaDao Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java 2013-07-04 08:45:15 UTC (rev 284) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/MagalieUserJpaDao.java 2013-07-04 09:06:18 UTC (rev 285) @@ -51,7 +51,8 @@ @Override public List<MagalieUser> findAllByCompany(Company company) { - TypedQuery<MagalieUser> query = createQuery(MagalieUser.PROPERTY_COMPANY, company); + TypedQuery<MagalieUser> query = createQuery("from MagalieUser mu where mu.company = :company order by mu.name"); + query.setParameter("company", company); return findAll(query); } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BuildingsService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BuildingsService.java 2013-07-04 08:45:15 UTC (rev 284) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BuildingsService.java 2013-07-04 09:06:18 UTC (rev 285) @@ -40,14 +40,6 @@ this.serviceContext = serviceContext; } - public List<Building> getAllBuildings() { - - BuildingJpaDao dao = serviceContext.getPersistenceContext().getBuildingDao(); - - return dao.findAll(); - - } - public Building getBuilding(String buildingId) { BuildingJpaDao dao = serviceContext.getPersistenceContext().getBuildingDao(); Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/CompanyService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/CompanyService.java 2013-07-04 08:45:15 UTC (rev 284) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/CompanyService.java 2013-07-04 09:06:18 UTC (rev 285) @@ -46,7 +46,7 @@ CompanyJpaDao dao = serviceContext.getPersistenceContext().getCompanyDao(); - return dao.findAll(); + return dao.findAllOrderByName(); }

1 0

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

04 Jul '13

Author: bleny Date: 2013-07-04 10:45:15 +0200 (Thu, 04 Jul 2013) New Revision: 284 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: reduce header for receive-article-input Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-07-04 08:26:35 UTC (rev 283) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-07-04 08:45:15 UTC (rev 284) @@ -32,18 +32,23 @@ <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> </head> -<header> - <dl class="dl-horizontal"> - <dt>Réf.</dt> - <dd><s:property value="receptionTask.storedArticle.article.code" /></dd> - <dt>Desc.</dt> - <dd><s:property value="receptionTask.storedArticle.article.description" /></dd> - <dt>Stocké</dt> - <dd><span id="stored">0</span> / <s:property value="receptionTask.quantity" /> <s:property value="receptionTask.storedArticle.article.unit" /></dd> - </dl> -</header> +<ul id="receiveArticleHeader"> + <li> + Réf. : <s:property value="receptionTask.storedArticle.article.code" /> + </li> + <li> + Desc. : <s:property value="receptionTask.storedArticle.article.description" />IQSUHFQ QDIUBVD HUQBUDB QUIBCIU + </li> + <li> + Stocké : + <span id="stored">0</span> / <s:property value="receptionTask.quantity" /> + <s:property value="receptionTask.storedArticle.article.unit" /> + </li> +</ul> + <section id="locations"> </section> + <s:form cssClass="form-horizontal"> <s:textfield name="locationBarcode" label="Empl." inputAppendIcon="barcode" cssClass="input-small" /> <s:textfield name="quantity" label="Qté" inputAppend="%{receptionTask.storedArticle.article.unit}" cssClass="input-mini" /> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-07-04 08:26:35 UTC (rev 283) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-07-04 08:45:15 UTC (rev 284) @@ -72,7 +72,7 @@ right: auto; } -#receivedArticles, #receivedSuppliers { +#receivedArticles, #receivedSuppliers, #receiveArticleHeader { margin-left: 5px; list-style-type: none; overflow-x: hidden;

1 0

r283 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 04 Jul '13

04 Jul '13

Author: bleny Date: 2013-07-04 10:26:35 +0200 (Thu, 04 Jul 2013) New Revision: 283 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: replace label 'Code reception' by 'Code fournisseur' Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp 2013-07-04 08:22:58 UTC (rev 282) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-prepared-article-reception-input.jsp 2013-07-04 08:26:35 UTC (rev 283) @@ -37,7 +37,7 @@ <s:form> - <s:textfield key="barcode" label="Code réception" inputAppendIcon="barcode" cssClass="input-medium" /> + <s:textfield key="barcode" label="Code fournisseur" inputAppendIcon="barcode" cssClass="input-medium" /> <div class="btn-group"> <s:a href="%{chooseActivityUrl}" cssClass="btn" id="chooseActivityLink" >Changer d'activité (Esc)</s:a>

1 0

r282 - trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 04 Jul '13

04 Jul '13

Author: bleny Date: 2013-07-04 10:22:58 +0200 (Thu, 04 Jul 2013) New Revision: 282 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add todo Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-04 08:10:43 UTC (rev 281) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-07-04 08:22:58 UTC (rev 282) @@ -259,6 +259,8 @@ LocationDao locationDao = persistenceContext.getLocationDao(); + // TODO brendan 04/07/13 probablement l'origine du problème de performance + // add all locations in the same warehouse locations.addAll(locationDao.findAllWithoutReception(warehouse));

1 0