Author: bleny Date: 2013-07-12 23:39:35 +0200 (Fri, 12 Jul 2013) New Revision: 309 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: remove from model orderQuantity and orderDate (renamed to movementDate) Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java trunk/magalie-persistence/src/main/xmi/magalie.zargo trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.java trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementJpaDao.java 2013-07-12 21:24:59 UTC (rev 308) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StorageMovementJpaDao.java 2013-07-12 21:39:35 UTC (rev 309) @@ -68,7 +68,7 @@ @Override public List<StorageMovement> findAll() { - Query query = entityManager.createQuery("from StorageMovement sm order by sm.orderDate"); + Query query = entityManager.createQuery("from StorageMovement sm order by sm.movementDate"); return 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-07-12 21:24:59 UTC (rev 308) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-07-12 21:39:35 UTC (rev 309) @@ -36,20 +36,14 @@ return confirmDate != null; } - public double getQuantity() { - double quantity = Objects.firstNonNull(actualQuantity, expectedQuantity); - return quantity; - } - @Override public String toString() { return Objects.toStringHelper(this) .add(PROPERTY_ID, id) - .add(PROPERTY_ORDER_DATE, orderDate) + .add(PROPERTY_MOVEMENT_DATE, movementDate) .add(PROPERTY_CONFIRM_DATE, confirmDate) .add(PROPERTY_ORIGIN_LOCATION, originLocation) .add(PROPERTY_DESTINATION_LOCATION, destinationLocation) - .add(PROPERTY_EXPECTED_QUANTITY, expectedQuantity) .add(PROPERTY_ACTUAL_QUANTITY, actualQuantity) .add(PROPERTY_ARTICLE, article) .add(PROPERTY_MAGALIE_USER, magalieUser) Modified: trunk/magalie-persistence/src/main/xmi/magalie.zargo =================================================================== (Binary files differ) 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-07-12 21:24:59 UTC (rev 308) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-07-12 21:39:35 UTC (rev 309) @@ -189,7 +189,7 @@ if (storageMovement.getOriginLocation().equals(location)) { - double actualQuantity = storedArticle.getQuantity() - storageMovement.getQuantity(); + double actualQuantity = storedArticle.getQuantity() - storageMovement.getActualQuantity(); storedArticle.setQuantity(actualQuantity); @@ -197,7 +197,7 @@ if (storageMovement.getDestinationLocation().equals(location)) { - double actualQuantity = storedArticle.getQuantity() + storageMovement.getQuantity(); + double actualQuantity = storedArticle.getQuantity() + storageMovement.getActualQuantity(); storedArticle.setQuantity(actualQuantity); @@ -453,7 +453,7 @@ Date now = serviceContext.getNow(); - storageMovement.setOrderDate(now); + storageMovement.setMovementDate(now); StorageMovementJpaDao storageMovementDao = persistenceContext.getStorageMovementDao(); Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.java 2013-07-12 21:24:59 UTC (rev 308) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.java 2013-07-12 21:39:35 UTC (rev 309) @@ -255,7 +255,7 @@ Assert.assertFalse(bookArticleResult.isArticleInaccessible()); Assert.assertEquals(1, storageMovementOrder.getStorageMovements().size()); StorageMovement storageMovement = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); - Assert.assertEquals("only 10 is available, so don't propose more", 10., storageMovement.getQuantity(), DELTA); + Assert.assertEquals("only 10 is available, so don't propose more", 10., storageMovement.getActualQuantity(), DELTA); Assert.assertEquals(location1.getId(), storageMovement.getOriginLocation().getId()); } Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-07-12 21:24:59 UTC (rev 308) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-07-12 21:39:35 UTC (rev 309) @@ -52,13 +52,10 @@ Article </th> <th> - Quantité - </th> - <th> Utilisateur </th> <th> - Date ordre + Date </th> </tr> </thead> @@ -73,25 +70,24 @@ <s:property value="originLocation.warehouse.code" /> - <s:property value="originLocation.code" /> + (<s:property value="originLocation.warehouse.building.code" />) </td> <td> <s:if test="destinationLocation"> <s:property value="destinationLocation.warehouse.code" /> - <s:property value="destinationLocation.code" /> + (<s:property value="destinationLocation.warehouse.building.code" />) </s:if> </td> <td> <s:property value="article.code" /> </td> <td> - <s:property value="expectedQuantity" /> <s:property value="article.unit" /> - </td> - <td> <a href="#<s:property value="magalieUser.id" />"><s:property value="magalieUser.login" /></a> </td> <td> - <s:property value="orderDate" /> + <s:property value="movementDate" /> </td> </tr> </s:iterator> @@ -118,16 +114,13 @@ Article </th> <th> - Quantité ordre - </th> - <th> Quantité réelle </th> <th> Utilisateur </th> <th> - Date ordre + Date mouvement </th> <th> Date confirmation @@ -159,16 +152,13 @@ <s:property value="article.code" /> </td> <td> - <s:property value="expectedQuantity" /> <s:property value="article.unit" /> - </td> - <td> <s:property value="actualQuantity" /> <s:property value="article.unit" /> </td> <td> <a href="#<s:property value="magalieUser.id" />"><s:property value="magalieUser.login" /></a> </td> <td> - <s:property value="orderDate" /> + <s:property value="movementDate" /> </td> <td> <s:property value="confirmDate" />