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

r326 - in trunk: . magalie-persistence magalie-services magalie-web
by bleny＠users.forge.codelutin.com 23 Jul '13

23 Jul '13

Author: bleny Date: 2013-07-23 17:54:03 +0200 (Tue, 23 Jul 2013) New Revision: 326 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: update dependencies for release Modified: trunk/magalie-persistence/pom.xml trunk/magalie-services/pom.xml trunk/magalie-web/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-07-23 15:23:52 UTC (rev 325) +++ trunk/magalie-persistence/pom.xml 2013-07-23 15:54:03 UTC (rev 326) @@ -56,8 +56,8 @@ </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </dependency> <dependency> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-07-23 15:23:52 UTC (rev 325) +++ trunk/magalie-services/pom.xml 2013-07-23 15:54:03 UTC (rev 326) @@ -61,11 +61,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-07-23 15:23:52 UTC (rev 325) +++ trunk/magalie-web/pom.xml 2013-07-23 15:54:03 UTC (rev 326) @@ -42,6 +42,11 @@ </dependency> <dependency> + <groupId>org.nuiton.jpa</groupId> + <artifactId>nuiton-jpa-api</artifactId> + </dependency> + + <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.0-api</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-23 15:23:52 UTC (rev 325) +++ trunk/pom.xml 2013-07-23 15:54:03 UTC (rev 326) @@ -264,6 +264,7 @@ <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> <version>${struts2Version}</version> + <scope>runtime</scope> </dependency> <dependency>

1 0

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

23 Jul '13

Author: bleny Date: 2013-07-23 17:23:52 +0200 (Tue, 23 Jul 2013) New Revision: 325 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add some logs on confirmation for RequestedArticleService Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-07-23 15:23:15 UTC (rev 324) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-07-23 15:23:52 UTC (rev 325) @@ -313,8 +313,18 @@ String requestedArticleId = confirmation.getRequestedArticleId(); - if (requestedArticleId != null) { + if (requestedArticleId == null) { + if (log.isDebugEnabled()) { + log.debug("confirmation " + confirmation + " doesn't concerns"); + } + + } else { + + if (log.isDebugEnabled()) { + log.debug("will confirm article delivery with confirmation " + confirmation); + } + // confirmation concerns a requested article, add a delivered requested article JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext();

1 0

r324 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 23 Jul '13

23 Jul '13

Author: bleny Date: 2013-07-23 17:23:15 +0200 (Tue, 23 Jul 2013) New Revision: 324 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove dead code 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-07-23 14:55:08 UTC (rev 323) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-07-23 15:23:15 UTC (rev 324) @@ -21,45 +21,6 @@ * #L% */ -//model.allowSubmit = false; -// -//model.isFulfilled = function() { -// var isFull = this.withdrawn() === this.quantity; -// return isFull; -//}; -// -//model.allIsUsed = function() { -// return this.storageMovementsIndex == null; -//}; -// -//model.canTerminate = function() { -// var canTerminate = this.isFulfilled() || this.allIsUsed(); -// return canTerminate; -//}; -// -// -// -// -//model.nextLocation = function() { -// this.storageMovementsIndex += 1; -// if (this.storageMovementsIndex >= this.storageMovements.length) { -// this.storageMovementsIndex = null; -// } else { -// var storageMovement = this.storageMovements[this.storageMovementsIndex]; -// if (storageMovement.expectedQuantity == 0.) { -// console.debug("will use extra location " + storageMovement.storedArticle.location.code); -// var remainingQuantity = this.quantity - this.withdrawn(); -// storageMovement.expectedQuantity = remainingQuantity; -//// var availableQuantityInLocation = storageMovement.availableQuantity; -//// storageMovement.expectedQuantity = Math.min(remainingQuantity, availableQuantityInLocation); -// console.debug("pushing new value to withdraw: " + storageMovement.expectedQuantity); -// } -// } -//}; -// - - - model.storageMovements = []; model.storageMovementsIndex = -1;

1 0

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

23 Jul '13

Author: bleny Date: 2013-07-23 16:55:08 +0200 (Tue, 23 Jul 2013) New Revision: 323 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix ui give always the same requestedArticle to withdraw Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-07-23 11:51:55 UTC (rev 322) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-07-23 14:55:08 UTC (rev 323) @@ -154,6 +154,7 @@ model.put("articleId", articleId); model.put("destinationLocationId", destinationLocationId); model.put("expectedQuantity", expectedQuantity); + model.put("requestedArticleId", requestedArticleId); String json = JSONUtil.serialize(model);

1 0

r322 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie magalie-web/src/main/java/com/franciaflex/magalie/web
by bleny＠users.forge.codelutin.com 23 Jul '13

23 Jul '13

Author: bleny Date: 2013-07-23 13:51:55 +0200 (Tue, 23 Jul 2013) New Revision: 322 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: enable reading another property file for configuration Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-07-23 11:50:57 UTC (rev 321) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-07-23 11:51:55 UTC (rev 322) @@ -44,12 +44,20 @@ protected ApplicationConfig applicationConfig; - protected ImmutableMap<String,String> oracleCompatibilityModeJpaParameters; + protected ImmutableMap<String, String> oracleCompatibilityModeJpaParameters; public MagalieApplicationConfig() { + this("magalie"); + } + + public MagalieApplicationConfig(String contextPath) { applicationConfig = new ApplicationConfig(); applicationConfig.loadDefaultOptions(MagalieConfigOption.values()); - applicationConfig.setConfigFileName("magalie.properties"); + String configFileName = contextPath + ".properties"; + if (log.isDebugEnabled()) { + log.debug("will read file config file name " + configFileName); + } + applicationConfig.setConfigFileName(configFileName); try { applicationConfig.parse(); } catch (ArgumentsParserException e) { 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-23 11:50:57 UTC (rev 321) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java 2013-07-23 11:51:55 UTC (rev 322) @@ -47,9 +47,15 @@ protected EntityManagerFactory entityManagerFactory; + protected String contextPath; + + public MagalieApplicationContext(String contextPath) { + this.contextPath = contextPath; + } + public MagalieApplicationConfig getMagalieApplicationConfig() { if (applicationConfig == null) { - applicationConfig = new MagalieApplicationConfig(); + applicationConfig = new MagalieApplicationConfig(contextPath); } return applicationConfig; } 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-23 11:50:57 UTC (rev 321) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationListener.java 2013-07-23 11:51:55 UTC (rev 322) @@ -38,11 +38,13 @@ @Override public void contextInitialized(ServletContextEvent sce) { + String contextPath = sce.getServletContext().getContextPath().replace("/", ""); + if (log.isInfoEnabled()) { - log.info("init MagaLiE"); + log.info("init MagaLiE for context path '" + contextPath + "'"); } - applicationContext = new MagalieApplicationContext(); + applicationContext = new MagalieApplicationContext(contextPath); sce.getServletContext().setAttribute( MagalieApplicationContext.APPLICATION_CONTEXT_PARAMETER,

1 0

r321 - in trunk/magalie-web/src/main/java/com/franciaflex/magalie/web: . action
by bleny＠users.forge.codelutin.com 23 Jul '13

23 Jul '13

Author: bleny Date: 2013-07-23 13:50:57 +0200 (Tue, 23 Jul 2013) New Revision: 321 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix unable to restore fixtures from report Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.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-07-22 15:06:42 UTC (rev 320) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-07-23 11:50:57 UTC (rev 321) @@ -30,6 +30,7 @@ import com.franciaflex.magalie.web.action.IndexAction; import com.franciaflex.magalie.web.action.LoginAction; import com.franciaflex.magalie.web.action.ReportAction; +import com.franciaflex.magalie.web.action.RestoreFixturesAction; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.opensymphony.xwork2.ActionInvocation; @@ -52,7 +53,12 @@ public class MagalieInterceptor implements Interceptor { public static final ImmutableSet<Class<? extends MagalieActionSupport>> ACCESSIBLE_ACTIONS_FOR_NOT_LOGGED_USER = - ImmutableSet.of(LoginAction.class, IndexAction.class, ChooseCompanyAction.class, ReportAction.class); + ImmutableSet.of( + LoginAction.class, + IndexAction.class, + ChooseCompanyAction.class, + ReportAction.class, + RestoreFixturesAction.class); private static final Log log = LogFactory.getLog(MagalieInterceptor.class); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-07-22 15:06:42 UTC (rev 320) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RestoreFixturesAction.java 2013-07-23 11:50:57 UTC (rev 321) @@ -25,6 +25,7 @@ import com.franciaflex.magalie.services.service.FixturesService; 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; @@ -35,16 +36,22 @@ protected FixturesService service; + protected MagalieSession session; + public void setService(FixturesService service) { this.service = service; } + public void setSession(MagalieSession session) { + this.session = session; + } + @Override public String execute() { service.cleanDatabaseAndLoadFixtures("fixtures"); - addActionMessage("Jeu de données initial restauré"); + session.addMessage("Jeu de données initial restauré"); return SUCCESS;

1 0

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

22 Jul '13

Author: bleny Date: 2013-07-22 17:06:42 +0200 (Mon, 22 Jul 2013) New Revision: 320 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix tests Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java 2013-07-22 15:02:25 UTC (rev 319) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/FulfilKanbanServiceTest.java 2013-07-22 15:06:42 UTC (rev 320) @@ -97,9 +97,10 @@ Article articleWithNoStock = fixture("article4"); - boolean articleUnavailable = - service.getRealTimeStorageMovementTask(building, magalieUser, articleWithNoStock.getId()); + RealTimeStorageMovementTask realTimeStorageMovementTask = service.getRealTimeStorageMovementTask(building, magalieUser, articleWithNoStock.getId()); + boolean articleUnavailable = realTimeStorageMovementTask.isArticleUnavailable(); + Assert.assertTrue(articleUnavailable); EntityManager entityManager = getJpaEntityManagerRule().newEntityManager();

1 0

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

22 Jul '13

Author: bleny Date: 2013-07-22 17:02:25 +0200 (Mon, 22 Jul 2013) New Revision: 319 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: in storage transfer service, prevent movementDate = null Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-07-22 14:45:04 UTC (rev 318) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-07-22 15:02:25 UTC (rev 319) @@ -143,6 +143,8 @@ storageMovement.setActualQuantity(quantity); + storageMovement.setMovementDate(now); + storageMovement.setConfirmDate(now); storageMovementDao.persist(storageMovement);

1 0

r318 - in trunk/magalie-web/src/main: java/com/franciaflex/magalie/web/action webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 22 Jul '13

22 Jul '13

Author: bleny Date: 2013-07-22 16:45:04 +0200 (Mon, 22 Jul 2013) New Revision: 318 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: in storage transfer, fix bug 'quantity' value was erased Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 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-22 14:34:23 UTC (rev 317) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-07-22 14:45:04 UTC (rev 318) @@ -110,8 +110,6 @@ storedArticle = Iterables.find(storedArticles, JpaEntities.entityHasId(storedArticleId)); - quantity = storedArticle.getQuantity(); - } Company company = session.getBuilding().getCompany(); @@ -125,6 +123,11 @@ prepare(); + // default value + if (storedArticle != null) { + quantity = storedArticle.getQuantity(); + } + 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-22 14:34:23 UTC (rev 317) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-22 14:45:04 UTC (rev 318) @@ -99,7 +99,7 @@ <s:hidden name="originId" value="%{origin.id}" /> <s:hidden name="storedArticleId" value="%{storedArticle.id}" /> - <s:textfield name="quantity" label="Qté" inputAppend="%{storedArticle.article.unit}" type="number" step="any" min="0" cssClass="input-mini" /> + <s:textfield name="quantity" value="%{quantity}" label="Qté" inputAppend="%{storedArticle.article.unit}" type="number" step="any" min="0" cssClass="input-mini" /> <s:select label="Bât. dest." key="destinationBuildingId"

1 0

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

22 Jul '13

Author: bleny Date: 2013-07-22 16:34:23 +0200 (Mon, 22 Jul 2013) New Revision: 317 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: now Esc in storage-transfer-input returns user to scan location code, not choose activity Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 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-22 14:30:01 UTC (rev 316) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-07-22 14:34:23 UTC (rev 317) @@ -40,7 +40,7 @@ <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> </head> -<s:url action="choose-activity" id="cancelUrl" /> +<s:url action="storage-transfer-location!input" id="cancelUrl" /> <header> <dl class="dl-horizontal">

1 0