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

r64 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie
by bleny＠users.forge.codelutin.com 29 Mar '13

29 Mar '13

Author: bleny Date: 2013-03-29 18:22:11 +0100 (Fri, 29 Mar 2013) New Revision: 64 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove useless line return Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.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-03-29 17:12:01 UTC (rev 63) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-03-29 17:22:11 UTC (rev 64) @@ -34,7 +34,7 @@ option.getKey(), applicationConfig.getOption(option))); } - log.info("MagaLiE configuration:\n" + builder.toString()); + log.info("MagaLiE configuration:" + builder.toString()); } }

1 0

r63 - in trunk: . magalie-persistence/src/main/java/com/franciaflex/magalie magalie-services/src/main magalie-services/src/main/java/com/franciaflex/magalie/services magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/main/resources magalie-services/src/test/java/com/franciaflex/magalie/services magalie-services/src/test/resources magalie-web/src/main/java/com/franciaflex/magalie/web
by bleny＠users.forge.codelutin.com 29 Mar '13

29 Mar '13

Author: bleny Date: 2013-03-29 18:12:01 +0100 (Fri, 29 Mar 2013) New Revision: 63 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: makes fixtures a service in itself, load fixtures at application startup Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java trunk/magalie-services/src/main/resources/ trunk/magalie-services/src/main/resources/fixtures.yaml Removed: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/MagalieFixtures.java trunk/magalie-services/src/test/resources/fixtures.yaml Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java trunk/pom.xml Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-03-29 14:21:44 UTC (rev 62) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-03-29 17:12:01 UTC (rev 63) @@ -47,4 +47,8 @@ return jpaParameters; } + public boolean isDevMode() { + boolean isDevMode = applicationConfig.getOptionAsBoolean(MagalieConfigOption.DEV_MODE.key); + return isDevMode; + } } 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-29 14:21:44 UTC (rev 62) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-03-29 17:12:01 UTC (rev 63) @@ -34,6 +34,10 @@ this.entityManager = entityManager; } + public EntityManager getEntityManager() { + return entityManager; + } + @Override public MagalieApplicationConfig getMagalieApplicationConfig() { return magalieApplicationConfig; Copied: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java (from rev 40, trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/MagalieFixtures.java) =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-03-29 17:12:01 UTC (rev 63) @@ -0,0 +1,47 @@ +package com.franciaflex.magalie.services; + +import com.esotericsoftware.yamlbeans.YamlException; +import com.esotericsoftware.yamlbeans.YamlReader; +import com.franciaflex.magalie.MagalieTechnicalException; +import com.franciaflex.magalie.persistence.entity.Article; +import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.persistence.entity.RequestedArticle; +import com.franciaflex.magalie.persistence.entity.Site; +import com.franciaflex.magalie.persistence.entity.StoredArticle; +import org.apache.commons.io.Charsets; +import org.apache.commons.io.IOUtils; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Map; + +public class MagalieFixtures { + + protected Map<String, Object> fixtures; + + public MagalieFixtures(String fixturesName) { + String yamlPath = "/" + fixturesName + ".yaml"; + InputStream inputStream = MagalieFixtures.class.getResourceAsStream(yamlPath); + String yaml; + try { + yaml = IOUtils.toString(inputStream, Charsets.UTF_8); + } catch (IOException e) { + throw new IllegalArgumentException(fixturesName + " is not a valid fixtures set name", e); + } + YamlReader reader = new YamlReader(yaml); + reader.getConfig().setClassTag("article", Article.class); + reader.getConfig().setClassTag("stored-article", StoredArticle.class); + reader.getConfig().setClassTag("user", MagalieUser.class); + reader.getConfig().setClassTag("requested-article", RequestedArticle.class); + reader.getConfig().setClassTag("site", Site.class); + try { + fixtures = (Map<String, Object>) reader.read(); + } catch (YamlException e) { + throw new MagalieTechnicalException("unable to read yaml file", e); + } + } + + public <E> E fixture(String id) { + return (E) fixtures.get(id); + } +} Added: 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 (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FixturesService.java 2013-03-29 17:12:01 UTC (rev 63) @@ -0,0 +1,128 @@ +package com.franciaflex.magalie.services.service; + +import com.franciaflex.magalie.persistence.dao.ArticleDao; +import com.franciaflex.magalie.persistence.dao.MagalieUserDao; +import com.franciaflex.magalie.persistence.dao.SiteDao; +import com.franciaflex.magalie.persistence.dao.StoredArticleDao; +import com.franciaflex.magalie.persistence.entity.Article; +import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.persistence.entity.Site; +import com.franciaflex.magalie.persistence.entity.StoredArticle; +import com.franciaflex.magalie.services.DefaultMagalieServiceContext; +import com.franciaflex.magalie.services.MagalieFixtures; +import com.franciaflex.magalie.services.MagalieService; +import com.franciaflex.magalie.services.MagalieServiceContext; +import com.google.common.collect.Iterables; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.persistence.EntityManager; +import java.util.Collection; + +public class FixturesService implements MagalieService { + + private static final Log log = LogFactory.getLog(FixturesService.class); + + protected MagalieServiceContext serviceContext; + + protected static MagalieFixtures fixtures; + + @Override + public void setServiceContext(MagalieServiceContext serviceContext) { + this.serviceContext = serviceContext; + } + + public void loadFixtures() { + + boolean devMode = serviceContext.getMagalieApplicationConfig().isDevMode(); + + if (devMode) { + + if (fixtures == null) { + + fixtures = new MagalieFixtures("fixtures"); + + } + + if (log.isInfoEnabled()) { + log.info("will restore database with fixture set"); + } + + EntityManager entityManager = + ((DefaultMagalieServiceContext) serviceContext).getEntityManager(); + +// entityManager. +// MetadataImplementor getDatabase +// ull; +// try { +// conn = getConnection(); +// metadata = new DatabaseMetadata(conn, dialect); +// DROP_SCRIPTS = config.generateDropSchemaScript(dialect); +// CREATE_SCRIPTS = config.generateSchemaCreationScript(dialect); +// } finally { +// close(conn); +// } + +// ((org.hibernate.service.internal.SessionFactoryServiceRegistryImpl) ((org.hibernate.ejb.EntityManagerFactoryImpl) entityManager.getEntityManagerFactory()).getSessionFactory().getServiceRegistry()) +// +// ((SessionImpl) entityManager.getDelegate()).get + + MagalieUserDao magalieUserDao = serviceContext.getMagalieUserDao(); + + Collection<MagalieUser> users = fixtures.fixture("users"); + + boolean alreadyLoaded = magalieUserDao.findById(Iterables.get(users, 0).getId()) != null; + + if ( ! alreadyLoaded) { + + for (MagalieUser user : users) { + + magalieUserDao.persist(user); + + } + + SiteDao siteDao = serviceContext.getSiteDao(); + + Collection<Site> sites = fixtures.fixture("sites"); + + for (Site site : sites) { + + siteDao.persist(site); + + } + + ArticleDao articleDao = serviceContext.getArticleDao(); + + Collection<Article> articles = fixtures.fixture("articles"); + + for (Article article : articles) { + + articleDao.persist(article); + + } + + StoredArticleDao storedArticleDao = serviceContext.getStoredArticleDao(); + + Collection<StoredArticle> storedArticles = fixtures.fixture("storedArticles"); + + for (StoredArticle storedArticle : storedArticles) { + + storedArticleDao.persist(storedArticle); + + } + } + + } else { + + if (log.isWarnEnabled()) { + log.warn("tried to load fixtures with devMode disabled, did nothing"); + } + + } + + } + + public <E> E fixture(String id) { + return fixtures.fixture(id); + } +} Copied: trunk/magalie-services/src/main/resources/fixtures.yaml (from rev 45, trunk/magalie-services/src/test/resources/fixtures.yaml) =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml (rev 0) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-03-29 17:12:01 UTC (rev 63) @@ -0,0 +1,146 @@ +alexandre: + &alexandre !user + id: magalie_user_alexandre + login: ale + name: Alexandre + accreditationLevel: 9 + +basile: + &basile !user + id: magalie_user_basile + login: bas + name: Basile + accreditationLevel: 0 + +cathy: + &cathy !user + id: magalie_user_cathy + login: cat + name: Cathy + accreditationLevel: 9 + +david: + &david !user + id: magalie_user_david + login: dav + name: David + accreditationLevel: 0 + +users: + - *alexandre + - *basile + - *cathy + - *david + +site1: + &site1 !site + id: site1 + storeCode: UO1 + locationCode: A1 + requiredAccreditationLevel: 0 + +site2: + &site2 !site + id: site2 + storeCode: UO1 + locationCode: B2 + requiredAccreditationLevel: 9 + +site3: + &site3 !site + id: site3 + storeCode: UO1 + locationCode: C3 + requiredAccreditationLevel: 0 + +site4: + &site4 !site + id: site4 + storeCode: UO1 + locationCode: D4 + requiredAccreditationLevel: 9 + +site5: + &site5 !site + id: site5 + storeCode: UO2 + locationCode: A1 + requiredAccreditationLevel: 0 + +sites: + - *site1 + - *site2 + - *site3 + - *site4 + - *site5 + +article1: + &article1 !article + id: article1 + fixedSites: + - *site1 + code: 111111111 + quantityInKanban: 10 + unit: kg + description: very big screws + +article2: + &article2 !article + id: article2 + code: 222222222 + quantityInKanban: 2 + unit: box + description: little buttons + +article3: + &article3 !article + id: article3 + fixedSites: + - *site2 + code: 333333333 + quantityInKanban: 50 + unit: g + description: magic powder + +articles: + - *article1 + - *article2 + - *article3 + +storedArticle1: + &storedArticle1 !stored-article + id: storedArticle1 + article: *article1 + site: *site1 + quantity: 50 + +storedArticle2: + &storedArticle2 !stored-article + id: storedArticle2 + article: *article1 + site: *site2 + quantity: 20 + +storedArticle3: + &storedArticle3 !stored-article + id: storedArticle3 + article: *article2 + site: *site1 + quantity: 10 + +storedArticle4: + &storedArticle4 !stored-article + id: storedArticle4 + article: *article3 + site: *site4 + quantity: 1000 + +storedArticles: + - *storedArticle1 + - *storedArticle2 + - *storedArticle3 + - *storedArticle4 + +storedArticlesForArticle1: + - *storedArticle1 + - *storedArticle2 Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java 2013-03-29 14:21:44 UTC (rev 62) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/AbstractMagalieServiceTest.java 2013-03-29 17:12:01 UTC (rev 63) @@ -1,14 +1,10 @@ package com.franciaflex.magalie.services; import com.franciaflex.magalie.MagalieApplicationConfig; -import com.franciaflex.magalie.persistence.entity.AbstractEntity; -import com.google.common.collect.Lists; +import com.franciaflex.magalie.services.service.FixturesService; import org.junit.Rule; import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import java.util.Collection; -import java.util.List; import java.util.Map; public abstract class AbstractMagalieServiceTest { @@ -23,6 +19,8 @@ protected FakeMagalieServiceContext serviceContext; + protected FixturesService fixturesService; + protected static MagalieApplicationConfig getMagalieApplicationConfig() { if (magalieApplicationConfig == null) { @@ -35,23 +33,6 @@ } - public static MagalieFixtures getFixtures() { - - if (fixtures == null) { - - fixtures = new MagalieFixtures("fixtures"); - - } - - return fixtures; - } - - protected static <E> E fixture(String id) { - - return getFixtures().fixture(id); - - } - protected MagalieServiceContext getServiceContext() { if (serviceContext == null) { @@ -64,32 +45,25 @@ serviceContext.setEntityManager(entityManager); - MagalieFixtures fixtures = getFixtures(); + this.serviceContext = serviceContext; - List<AbstractEntity> toPersist = Lists.newArrayList(); + } - toPersist.addAll(fixtures.<Collection<? extends AbstractEntity>>fixture("users")); - toPersist.addAll(fixtures.<Collection<? extends AbstractEntity>>fixture("sites")); - toPersist.addAll(fixtures.<Collection<? extends AbstractEntity>>fixture("articles")); - toPersist.addAll(fixtures.<Collection<? extends AbstractEntity>>fixture("storedArticles")); + return serviceContext; - EntityTransaction transaction = entityManager.getTransaction(); + } - transaction.begin(); + protected <E> E fixture(String id) { - for (AbstractEntity entity : toPersist) { + if (fixturesService == null) { - entityManager.persist(entity); + fixturesService = getServiceContext().newService(FixturesService.class); - } + fixturesService.loadFixtures(); - transaction.commit(); - - this.serviceContext = serviceContext; - } - return serviceContext; + return fixturesService.fixture(id); } Deleted: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/MagalieFixtures.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-03-29 14:21:44 UTC (rev 62) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/MagalieFixtures.java 2013-03-29 17:12:01 UTC (rev 63) @@ -1,47 +0,0 @@ -package com.franciaflex.magalie.services; - -import com.esotericsoftware.yamlbeans.YamlException; -import com.esotericsoftware.yamlbeans.YamlReader; -import com.franciaflex.magalie.MagalieTechnicalException; -import com.franciaflex.magalie.persistence.entity.Article; -import com.franciaflex.magalie.persistence.entity.MagalieUser; -import com.franciaflex.magalie.persistence.entity.RequestedArticle; -import com.franciaflex.magalie.persistence.entity.Site; -import com.franciaflex.magalie.persistence.entity.StoredArticle; -import org.apache.commons.io.Charsets; -import org.apache.commons.io.IOUtils; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Map; - -public class MagalieFixtures { - - protected Map<String, Object> fixtures; - - public MagalieFixtures(String fixturesName) { - String yamlPath = "/" + fixturesName + ".yaml"; - InputStream inputStream = MagalieFixtures.class.getResourceAsStream(yamlPath); - String yaml; - try { - yaml = IOUtils.toString(inputStream, Charsets.UTF_8); - } catch (IOException e) { - throw new IllegalArgumentException(fixturesName + " is not a valid fixtures set name", e); - } - YamlReader reader = new YamlReader(yaml); - reader.getConfig().setClassTag("article", Article.class); - reader.getConfig().setClassTag("stored-article", StoredArticle.class); - reader.getConfig().setClassTag("user", MagalieUser.class); - reader.getConfig().setClassTag("requested-article", RequestedArticle.class); - reader.getConfig().setClassTag("site", Site.class); - try { - fixtures = (Map<String, Object>) reader.read(); - } catch (YamlException e) { - throw new MagalieTechnicalException("unable to read yaml file", e); - } - } - - public <E> E fixture(String id) { - return (E) fixtures.get(id); - } -} Deleted: trunk/magalie-services/src/test/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/test/resources/fixtures.yaml 2013-03-29 14:21:44 UTC (rev 62) +++ trunk/magalie-services/src/test/resources/fixtures.yaml 2013-03-29 17:12:01 UTC (rev 63) @@ -1,146 +0,0 @@ -alexandre: - &alexandre !user - id: magalie_user_alexandre - login: ale - name: Alexandre - accreditationLevel: 9 - -basile: - &basile !user - id: magalie_user_basile - login: bas - name: Basile - accreditationLevel: 0 - -cathy: - &cathy !user - id: magalie_user_cathy - login: cat - name: Cathy - accreditationLevel: 9 - -david: - &david !user - id: magalie_user_david - login: dav - name: David - accreditationLevel: 0 - -users: - - *alexandre - - *basile - - *cathy - - *david - -site1: - &site1 !site - id: site1 - storeCode: UO1 - locationCode: A1 - requiredAccreditationLevel: 0 - -site2: - &site2 !site - id: site2 - storeCode: UO1 - locationCode: B2 - requiredAccreditationLevel: 9 - -site3: - &site3 !site - id: site3 - storeCode: UO1 - locationCode: C3 - requiredAccreditationLevel: 0 - -site4: - &site4 !site - id: site4 - storeCode: UO1 - locationCode: D4 - requiredAccreditationLevel: 9 - -site5: - &site5 !site - id: site5 - storeCode: UO2 - locationCode: A1 - requiredAccreditationLevel: 0 - -sites: - - *site1 - - *site2 - - *site3 - - *site4 - - *site5 - -article1: - &article1 !article - id: article1 - fixedSites: - - *site1 - code: 111111111 - quantityInKanban: 10 - unit: kg - description: very big screws - -article2: - &article2 !article - id: article2 - code: 222222222 - quantityInKanban: 2 - unit: box - description: little buttons - -article3: - &article3 !article - id: article3 - fixedSites: - - *site2 - code: 333333333 - quantityInKanban: 50 - unit: g - description: magic powder - -articles: - - *article1 - - *article2 - - *article3 - -storedArticle1: - &storedArticle1 !stored-article - id: storedArticle1 - article: *article1 - site: *site1 - quantity: 50 - -storedArticle2: - &storedArticle2 !stored-article - id: storedArticle2 - article: *article1 - site: *site2 - quantity: 20 - -storedArticle3: - &storedArticle3 !stored-article - id: storedArticle3 - article: *article2 - site: *site1 - quantity: 10 - -storedArticle4: - &storedArticle4 !stored-article - id: storedArticle4 - article: *article3 - site: *site4 - quantity: 1000 - -storedArticles: - - *storedArticle1 - - *storedArticle2 - - *storedArticle3 - - *storedArticle4 - -storedArticlesForArticle1: - - *storedArticle1 - - *storedArticle2 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-29 14:21:44 UTC (rev 62) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-03-29 17:12:01 UTC (rev 63) @@ -27,6 +27,7 @@ import com.franciaflex.magalie.services.DefaultMagalieServiceContext; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; +import com.franciaflex.magalie.services.service.FixturesService; import com.google.common.base.Preconditions; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor; @@ -48,6 +49,8 @@ private static final Log log = LogFactory.getLog(MagalieInterceptor.class); + protected boolean fixturesLoaded = false; + @Override public void init() { // nothing to do @@ -67,6 +70,16 @@ MagalieServiceContext serviceContext = newServiceContext(invocation); + if ( ! fixturesLoaded && serviceContext.getMagalieApplicationConfig().isDevMode()) { + + FixturesService fixturesService = serviceContext.newService(FixturesService.class); + + fixturesService.loadFixtures(); + + fixturesLoaded = true; + + } + for (PropertyDescriptor propertyDescriptor : descriptors) { Class<?> propertyType = propertyDescriptor.getPropertyType(); @@ -161,6 +174,12 @@ serviceContext.setEntityManager(entityManager); + MagalieApplicationContext magalieApplicationContext = getMagalieApplicationContext(invocation); + + MagalieApplicationConfig magalieApplicationConfig = magalieApplicationContext.getMagalieApplicationConfig(); + + serviceContext.setMagalieApplicationConfig(magalieApplicationConfig); + return serviceContext; } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-29 14:21:44 UTC (rev 62) +++ trunk/pom.xml 2013-03-29 17:12:01 UTC (rev 63) @@ -266,7 +266,6 @@ <groupId>com.esotericsoftware.yamlbeans</groupId> <artifactId>yamlbeans</artifactId> <version>1.06</version> - <scope>test</scope> </dependency> </dependencies>

1 0

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

29 Mar '13

Author: bleny Date: 2013-03-29 15:21:44 +0100 (Fri, 29 Mar 2013) New Revision: 62 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: tune css for ck3x Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 14:06:19 UTC (rev 61) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 14:21:44 UTC (rev 62) @@ -27,9 +27,12 @@ #container { position: absolute; - width: 240px; + left: 5px; + top: 5px; + width: 230px; height: 320px; overflow: auto; + background-color: white; } .dl-horizontal dt,

1 0

r61 - 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 29 Mar '13

29 Mar '13

Author: bleny Date: 2013-03-29 15:06:19 +0100 (Fri, 29 Mar 2013) New Revision: 61 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add logs when starting stopping magalie Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.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-03-29 13:20:17 UTC (rev 60) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/MagalieApplicationConfig.java 2013-03-29 14:06:19 UTC (rev 61) @@ -1,11 +1,13 @@ package com.franciaflex.magalie; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.config.ApplicationConfig; import org.nuiton.util.config.ArgumentsParserException; +import java.util.List; import java.util.Map; import java.util.Properties; @@ -24,8 +26,15 @@ } catch (ArgumentsParserException e) { throw new MagalieTechnicalException(e); } - if (log.isDebugEnabled()) { - log.debug("parsed options in config file" + applicationConfig.getOptions()); + if (log.isInfoEnabled()) { + StringBuilder builder = new StringBuilder(); + List<MagalieConfigOption> options = Lists.newArrayList(MagalieConfigOption.values()); + for (MagalieConfigOption option : options) { + builder.append(String.format("\n%1$-40s = %2$s", + option.getKey(), + applicationConfig.getOption(option))); + } + log.info("MagaLiE configuration:\n" + builder.toString()); } } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.java 2013-03-29 13:20:17 UTC (rev 60) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieJpaTransactionFilter.java 2013-03-29 14:06:19 UTC (rev 61) @@ -1,11 +1,14 @@ package com.franciaflex.magalie.web; import com.franciaflex.magalie.MagalieApplicationConfig; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.web.filter.JpaTransactionFilter; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; +import javax.persistence.PersistenceException; import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; @@ -13,6 +16,8 @@ public class MagalieJpaTransactionFilter extends JpaTransactionFilter { + private static final Log log = LogFactory.getLog(MagalieJpaTransactionFilter.class); + protected EntityManagerFactory entityManagerFactory; @Override @@ -20,19 +25,52 @@ super.init(filterConfig); + if (log.isInfoEnabled()) { + log.info("start MagaLiE application"); + } + MagalieApplicationConfig applicationConfig = new MagalieApplicationConfig(); Map<String, String> jpaParameters = applicationConfig.getJpaParameters(); - entityManagerFactory = Persistence.createEntityManagerFactory("magaliePersistenceUnit", jpaParameters); + if (log.isInfoEnabled()) { + log.info("creating entity manager factory"); + } + try { + + entityManagerFactory = Persistence.createEntityManagerFactory("magaliePersistenceUnit", jpaParameters); + + } catch (PersistenceException e) { + + if (log.isErrorEnabled()) { + log.error("unable to create entity manager factory", e); + } + + throw e; + + } } @Override protected EntityManager createEntityManager(ServletRequest request) { - EntityManager entityManager = entityManagerFactory.createEntityManager(); + EntityManager entityManager; + try { + + entityManager = entityManagerFactory.createEntityManager(); + + } catch (PersistenceException e) { + + if (log.isErrorEnabled()) { + log.error("unable to create entity manager", e); + } + + throw e; + + } + return entityManager; } @@ -40,7 +78,14 @@ @Override public void destroy() { + if (log.isInfoEnabled()) { + log.info("stopping magalie, will close entity manager factory"); + } + entityManagerFactory.close(); + if (log.isInfoEnabled()) { + log.info("stopping MagaLiE"); + } } }

1 0

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

29 Mar '13

Author: bleny Date: 2013-03-29 14:20:17 +0100 (Fri, 29 Mar 2013) New Revision: 60 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: css for ck3X Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 12:17:46 UTC (rev 59) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 13:20:17 UTC (rev 60) @@ -51,7 +51,8 @@ } } -@media screen (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { +/* +@media screen and (min-width: 300px) and (min-height: 400px) and (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { body { background-color: grey; @@ -65,3 +66,4 @@ } } +*/ \ No newline at end of file

1 0

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

29 Mar '13

Author: bleny Date: 2013-03-29 13:17:46 +0100 (Fri, 29 Mar 2013) New Revision: 59 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: switch to hibernate update mode for demo Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 12:07:18 UTC (rev 58) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-03-29 12:17:46 UTC (rev 59) @@ -51,7 +51,7 @@ } } -@media screen and (min-width: 300px) and (min-height: 400px) and (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { +@media screen (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { body { background-color: grey;

1 0

r58 - trunk/magalie-persistence/src/main/resources
by bleny＠users.forge.codelutin.com 29 Mar '13

29 Mar '13

Author: bleny Date: 2013-03-29 13:07:18 +0100 (Fri, 29 Mar 2013) New Revision: 58 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: switch to hibernate update mode for demo Modified: trunk/magalie-persistence/src/main/resources/magalie.properties Modified: trunk/magalie-persistence/src/main/resources/magalie.properties =================================================================== --- trunk/magalie-persistence/src/main/resources/magalie.properties 2013-03-29 11:17:12 UTC (rev 57) +++ trunk/magalie-persistence/src/main/resources/magalie.properties 2013-03-29 12:07:18 UTC (rev 58) @@ -1,9 +1,9 @@ javax.persistence.jdbc.driver=org.h2.Driver -javax.persistence.jdbc.url=jdbc:h2:file:/tmp/magalie/h2data;DB_CLOSE_ON_EXIT=FALSE +javax.persistence.jdbc.url=jdbc:h2:file:/tmp/magalie/h2data javax.persistence.jdbc.user=sa javax.persistence.jdbc.password= hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.hbm2ddl.auto=validate +hibernate.hbm2ddl.auto=update hibernate.show_sql=true hibernate.format_sql=true hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy

1 0

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

29 Mar '13

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

1 0

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

29 Mar '13

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

1 0

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

28 Mar '13

Author: bleny Date: 2013-03-28 16:22:04 +0100 (Thu, 28 Mar 2013) New Revision: 55 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add service for confirmation Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Entities.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Entities.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Entities.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Entities.java 2013-03-28 15:22:04 UTC (rev 55) @@ -0,0 +1,28 @@ +package com.franciaflex.magalie.persistence; + +import com.franciaflex.magalie.persistence.entity.AbstractEntity; +import com.google.common.base.Function; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; + +public class Entities { + + private Entities() {} + + protected static class GetIdFunction implements Function<AbstractEntity, String> { + + @Override + public String apply(AbstractEntity entity) { + return entity.getId(); + } + } + + public static Function<AbstractEntity, String> getIdFunction() { + return new GetIdFunction(); + } + + public static Predicate<AbstractEntity> entityHasId(String id) { + return Predicates.compose(Predicates.equalTo(id), getIdFunction()); + } + +} Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/AbstractJpaDao.java 2013-03-28 15:22:04 UTC (rev 55) @@ -32,7 +32,11 @@ @Override public E merge(E entity) { - return entityManager.merge(entity); + EntityTransaction transaction = entityManager.getTransaction(); + transaction.begin(); + E merge = entityManager.merge(entity); + transaction.commit(); + return merge; } @Override Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovement.java 2013-03-28 15:22:04 UTC (rev 55) @@ -25,10 +25,12 @@ @ManyToOne protected MagalieUser magalieUser; - protected double quantity; + protected double expectedQuantity; protected Date orderDate; + protected Double actualQuantity; + protected Date confirmDate; @Override @@ -72,12 +74,12 @@ this.magalieUser = magalieUser; } - public double getQuantity() { - return quantity; + public double getExpectedQuantity() { + return expectedQuantity; } - public void setQuantity(double quantity) { - this.quantity = quantity; + public void setExpectedQuantity(double expectedQuantity) { + this.expectedQuantity = expectedQuantity; } public Date getOrderDate() { @@ -100,4 +102,11 @@ return confirmDate != null; } + public Double getActualQuantity() { + return actualQuantity; + } + + public void setActualQuantity(Double actualQuantity) { + this.actualQuantity = actualQuantity; + } } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/StorageMovementOrder.java 2013-03-28 15:22:04 UTC (rev 55) @@ -23,7 +23,9 @@ * #L% */ +import com.franciaflex.magalie.persistence.Entities; import com.franciaflex.magalie.persistence.StorageMovements; +import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -85,7 +87,7 @@ public double getQuantity() { double quantity = 0.; for (StorageMovement storageMovement : storageMovements) { - quantity += storageMovement.getQuantity(); + quantity += storageMovement.getExpectedQuantity(); } return quantity; } @@ -108,6 +110,19 @@ return sites; } + public StorageMovement findStorageMovementBySiteId(String siteId) { + StorageMovement storageMovement = + Iterables.find( + getStorageMovements(), + Predicates.compose( + Entities.entityHasId(siteId), + StorageMovements.getOriginSiteFunction() + ), + null + ); + return storageMovement; + } + @Override public String toString() { return ToStringBuilder.reflectionToString(this); Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.java (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementConfirmation.java 2013-03-28 15:22:04 UTC (rev 55) @@ -0,0 +1,37 @@ +package com.franciaflex.magalie.services; + +import java.util.Map; +import java.util.Set; + +public class StorageMovementConfirmation { + + protected String storageMovementOrderId; + + protected Map<String, Double> sitesIdsToActualQuantities; + + protected Set<String> siteInErrorIds; + + public String getStorageMovementOrderId() { + return storageMovementOrderId; + } + + public void setStorageMovementOrderId(String storageMovementOrderId) { + this.storageMovementOrderId = storageMovementOrderId; + } + + public Map<String, Double> getSitesIdsToActualQuantities() { + return sitesIdsToActualQuantities; + } + + public void setSitesIdsToActualQuantities(Map<String, Double> sitesIdsToActualQuantities) { + this.sitesIdsToActualQuantities = sitesIdsToActualQuantities; + } + + public Set<String> getSiteInErrorIds() { + return siteInErrorIds; + } + + public void setSiteInErrorIds(Set<String> siteInErrorIds) { + this.siteInErrorIds = siteInErrorIds; + } +} Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/StorageMovementTask.java 2013-03-28 15:22:04 UTC (rev 55) @@ -26,6 +26,10 @@ return storageMovementOrder.getArticle(); } + public String getStorageMovementOrderId() { + return storageMovementOrder.getId(); + } + public List<StorageMovement> getStorageMovements() { List<StorageMovement> sites = Lists.newLinkedList(); Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-03-28 15:22:04 UTC (rev 55) @@ -1,6 +1,7 @@ package com.franciaflex.magalie.services.service; import com.franciaflex.magalie.persistence.StoredArticles; +import com.franciaflex.magalie.persistence.dao.SiteDao; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; import com.franciaflex.magalie.persistence.dao.StorageMovementOrderDao; import com.franciaflex.magalie.persistence.dao.StoredArticleDao; @@ -12,6 +13,7 @@ import com.franciaflex.magalie.persistence.entity.StoredArticle; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; +import com.franciaflex.magalie.services.StorageMovementConfirmation; import com.franciaflex.magalie.services.StorageMovementTask; import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException; import com.franciaflex.magalie.services.exception.UnavailableArticleException; @@ -27,6 +29,7 @@ import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; public class ArticleStorageService implements MagalieService { @@ -118,7 +121,7 @@ newStorageMovement.setDestinationSite(destinationSite); - newStorageMovement.setQuantity(quantityWithdrawn); + newStorageMovement.setExpectedQuantity(quantityWithdrawn); if (quantityWithdrawn > 0.) { @@ -166,7 +169,7 @@ newStorageMovement.setOriginSite(site); - newStorageMovement.setQuantity(0.); + newStorageMovement.setExpectedQuantity(0.); storageMovementTask.addExtraStorageMovement(newStorageMovement); @@ -201,8 +204,10 @@ StoredArticle storedArticle = storedArticlesBySite.get(originSite); - double actualQuantity = storedArticle.getQuantity() - storageMovement.getQuantity(); + // TODO brendan 28/03/13 consider actual quantity + double actualQuantity = storedArticle.getQuantity() - storageMovement.getExpectedQuantity(); + if (actualQuantity > 0.) { storedArticle.setQuantity(actualQuantity); @@ -272,4 +277,68 @@ } + public void confirmStorageMovement(StorageMovementConfirmation confirmation, MagalieUser magalieUser) { + + String storageMovementOrderId = confirmation.getStorageMovementOrderId(); + + StorageMovementOrderDao storageMovementOrderDao = + serviceContext.getStorageMovementOrderDao(); + + SiteDao siteDao = serviceContext.getSiteDao(); + + StorageMovementOrder storageMovementOrder = + storageMovementOrderDao.findById(storageMovementOrderId); + + Date confirmDate = serviceContext.getNow(); + + SiteErrorsService siteErrorsService = + serviceContext.newService(SiteErrorsService.class); + + for (Map.Entry<String, Double> siteIdToActualQuantity : confirmation.getSitesIdsToActualQuantities().entrySet()) { + + String siteId = siteIdToActualQuantity.getKey(); + + double actualQuantity = siteIdToActualQuantity.getValue(); + + StorageMovement storageMovement = + storageMovementOrder.findStorageMovementBySiteId(siteId); + + if (storageMovement == null) { + + // user made a movement out of the order from its own initiative + storageMovement = new StorageMovement(); + + Site originSite = siteDao.findById(siteId); + + storageMovement.setOriginSite(originSite); + + // TODO brendan 28/03/13 what about destination site + + storageMovement.setMagalieUser(magalieUser); + + storageMovement.setArticle(storageMovementOrder.getArticle()); + + storageMovement.setExpectedQuantity(0.); + + storageMovementOrder.getStorageMovements().add(storageMovement); + + } + + storageMovement.setConfirmDate(confirmDate); + + storageMovement.setActualQuantity(actualQuantity); + + } + + for (String siteInErrorId : confirmation.getSiteInErrorIds()) { + + Site siteInError = siteDao.findById(siteInErrorId); + + siteErrorsService.reportError(siteInError, magalieUser, confirmDate); + + } + + storageMovementOrderDao.merge(storageMovementOrder); + + } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SiteErrorsService.java 2013-03-28 15:22:04 UTC (rev 55) @@ -25,6 +25,14 @@ public void reportError(Site site, MagalieUser magalieUser) { + Date reportDate = serviceContext.getNow(); + + reportError(site, magalieUser, reportDate); + + } + + public void reportError(Site site, MagalieUser magalieUser, Date reportDate) { + SiteErrorDao siteErrorDao = serviceContext.getSiteErrorDao(); SiteError existingSiteError = siteErrorDao.findBySite(site); @@ -37,8 +45,6 @@ newSiteError.setSite(site); - Date reportDate = serviceContext.getNow(); - newSiteError.setReportDate(reportDate); siteErrorDao.persist(newSiteError); @@ -50,7 +56,6 @@ } } - } public List<Site> getAllSitesInError() { Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-03-28 15:22:04 UTC (rev 55) @@ -128,9 +128,9 @@ Assert.assertEquals(2, storageMovementOrder.getStorageMovements().size()); StorageMovement site1 = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); - Assert.assertEquals(20., site1.getQuantity(), DELTA); + Assert.assertEquals(20., site1.getExpectedQuantity(), DELTA); StorageMovement site2 = Iterables.get(storageMovementOrder.getStorageMovements(), 1, null); - Assert.assertEquals(30., site2.getQuantity(), DELTA); + Assert.assertEquals(30., site2.getExpectedQuantity(), DELTA); } @Test @@ -150,10 +150,10 @@ } Assert.assertEquals(2, storageMovementOrder.getStorageMovements().size()); StorageMovement storageMovement1 = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); - Assert.assertEquals(20., storageMovement1.getQuantity(), DELTA); + Assert.assertEquals(20., storageMovement1.getExpectedQuantity(), DELTA); Assert.assertEquals("B2", storageMovement1.getOriginSite().getLocationCode()); StorageMovement storageMovement2 = Iterables.get(storageMovementOrder.getStorageMovements(), 1, null); - Assert.assertEquals(10., storageMovement2.getQuantity(), DELTA); + Assert.assertEquals(10., storageMovement2.getExpectedQuantity(), DELTA); Assert.assertEquals("A1", storageMovement2.getOriginSite().getLocationCode()); } catch (RequiredDriverLicenceException e) { if (log.isDebugEnabled()) { @@ -174,7 +174,7 @@ } Assert.assertEquals(1, storageMovementOrder.getStorageMovements().size()); StorageMovement storageMovement = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); - Assert.assertEquals(30., storageMovement.getQuantity(), DELTA); + Assert.assertEquals(30., storageMovement.getExpectedQuantity(), DELTA); Assert.assertEquals("A1", storageMovement.getOriginSite().getLocationCode()); } catch (RequiredDriverLicenceException e) { if (log.isDebugEnabled()) { Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-03-28 15:22:04 UTC (rev 55) @@ -23,17 +23,29 @@ * #L% */ +import com.franciaflex.magalie.MagalieTechnicalException; +import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.services.StorageMovementConfirmation; import com.franciaflex.magalie.services.StorageMovementTask; import com.franciaflex.magalie.services.exception.RequiredDriverLicenceException; import com.franciaflex.magalie.services.exception.UnavailableArticleException; import com.franciaflex.magalie.services.service.ArticleStorageService; import com.franciaflex.magalie.web.MagalieActionSupport; +import com.franciaflex.magalie.web.MagalieSession; import com.google.common.base.Preconditions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; import org.apache.struts2.json.JSONException; +import org.apache.struts2.json.JSONPopulator; import org.apache.struts2.json.JSONUtil; +import java.util.Map; + +@Results({ + @Result(name="success", type="redirectAction", params = { "actionName", "report" }) +}) public class WithdrawItemAction extends MagalieActionSupport { private static final Log log = LogFactory.getLog(WithdrawItemAction.class); @@ -44,6 +56,14 @@ protected StorageMovementTask storageMovementTask; + protected StorageMovementConfirmation confirmation; + + protected MagalieSession session; + + public void setSession(MagalieSession session) { + this.session = session; + } + public void setService(ArticleStorageService service) { this.service = service; } @@ -75,15 +95,33 @@ } + public void setConfirmation(String confirmationJson) { + if (log.isDebugEnabled()) { + log.debug("should deserialize" + confirmationJson); + } + try { + Map deserialize = (Map) JSONUtil.deserialize(confirmationJson); + JSONPopulator jsonPopulator = new JSONPopulator(); + confirmation = new StorageMovementConfirmation(); + jsonPopulator.populateObject(confirmation, deserialize); + } catch (Throwable e) { + if (log.isErrorEnabled()) { + log.error("unable to parse confirmation, json =\n" + confirmationJson, e); + } + throw new MagalieTechnicalException(e); + } + } - public void setModel(String model) { + @Override + public String execute() { - if (log.isErrorEnabled()) { - log.error("should deserialize" + model); - } + MagalieUser magalieUser = session.getMagalieUser(); + service.confirmStorageMovement(confirmation, magalieUser); + + return SUCCESS; + } - } Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-03-28 15:22:04 UTC (rev 55) @@ -63,7 +63,7 @@ <s:property value="article.code" /> </td> <td> - <s:property value="quantity" /> <s:property value="article.unit" /> + <s:property value="expectedQuantity" /> <s:property value="article.unit" /> </td> <td> <a href="#<s:property value="magalieUser.id" />"><s:property value="magalieUser.login" /></a> @@ -96,9 +96,12 @@ Article </th> <th> - Quantité + Quantité ordre </th> <th> + Quantité réelle + </th> + <th> Utilisateur </th> <th> @@ -132,9 +135,12 @@ <s:property value="article.code" /> </td> <td> - <s:property value="quantity" /> <s:property value="article.unit" /> + <s:property value="expectedQuantity" /> <s:property value="article.unit" /> </td> <td> + <s:property value="actualQuantity" /> <s:property value="article.unit" /> + </td> + <td> <a href="#<s:property value="magalieUser.id" />"><s:property value="magalieUser.login" /></a> </td> <td> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-03-28 15:22:04 UTC (rev 55) @@ -45,21 +45,21 @@ </header> <section id="storageMovements"> </section> -<form class="form-horizontal"> +<s:form cssClass="form-horizontal"> <s:textfield name="siteBarcode" label="Empl." inputAppendIcon="barcode" cssClass="input-small" /> <s:textfield name="quantity" label="Qté" inputAppend="%{storageMovementTask.article.unit}" cssClass="input-mini" /> - <s:hidden name="model" /> + <s:hidden name="confirmation" /> <div class="btn-group"> <s:submit name="reportError" value="Anomalie" cssClass="btn btn-danger btn-small" /> <s:submit name="next" value="Suivant" cssClass="btn btn-primary btn-small" /> </div> -</form> +</s:form> <div id="storageMovementTemplate" class="template"> <dl class="dl-horizontal"> <dt>Empl.</dt> <dd data="originSite.locationCode"></dd> <dt>Prélev.</dt> - <dd><span data="withdrawn">0</span> / <span data="quantity"></span> <s:property value="storageMovementTask.article.unit" /></dd> + <dd><span data="withdrawn">0</span> / <span data="expectedQuantity"></span> <s:property value="storageMovementTask.article.unit" /></dd> </dl> </div> Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-03-28 10:05:24 UTC (rev 54) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-03-28 15:22:04 UTC (rev 55) @@ -91,7 +91,7 @@ } var storageMovement = this.getStorageMovement(barcode); storageMovement.used = true; - storageMovement.defect = quantity != storageMovement.quantity; + storageMovement.defect = quantity != storageMovement.expectedQuantity; storageMovement.withdrawn = quantity; }; @@ -109,6 +109,25 @@ } }; +model.getConfirmation = function() { + var sitesIdsToActualQuantities = {}; + var siteInErrorIds = []; + $.each(model.storageMovements, function(key, storageMovement) { + if (storageMovement.used) { + sitesIdsToActualQuantities[storageMovement.originSite.id] = storageMovement.withdrawn; + if (storageMovement.defect) { + siteInErrorIds.push(storageMovement.originSite.id); + } + } + }); + var confirmation = { + storageMovementOrderId: this.storageMovementOrderId, + sitesIdsToActualQuantities: sitesIdsToActualQuantities, + siteInErrorIds: siteInErrorIds + }; + return confirmation; +} + var view = { refreshSummary : function() { @@ -150,18 +169,18 @@ refreshForm : function() { // reset field to prevent reuse of the value by mistake - $('#site').val(''); + $('#withdraw-item_siteBarcode').val(''); // set default value of quantity to what should be withdrawn on the current site if (model.storageMovementsIndex != null) { - $('#quantity').val(model.storageMovements[model.storageMovementsIndex].quantity); + $('#withdraw-item_quantity').val(model.storageMovements[model.storageMovementsIndex].expectedQuantity); } }, refreshButtons : function() { if (model.allowSubmit) { - $('#next').val('Terminer').removeClass('btn-primary').addClass('btn-success'); + $('#withdraw-item_next').val('Terminer').removeClass('btn-primary').addClass('btn-success'); } else { - $('#next').val('Suivant').removeClass('btn-success').addClass('btn-primary'); + $('#withdraw-item_next').val('Suivant').removeClass('btn-success').addClass('btn-primary'); } }, @@ -184,8 +203,8 @@ } else { - var barcode = $('#siteBarcode').val(); - var quantity = parseInt($('#quantity').val()); + var barcode = $('#withdraw-item_siteBarcode').val(); + var quantity = parseInt($('#withdraw-item_quantity').val()); model.withdraw(barcode, quantity); @@ -214,7 +233,7 @@ } else { - var barcode = $('#siteBarcode').val(); + var barcode = $('#withdraw-item_siteBarcode').val(); model.reportError(barcode); @@ -238,7 +257,7 @@ onSubmit : function(e) { if (model.allowSubmit) { // push model as Json in a hidden field - $('#model').val(JSON.stringify(model)); + $('#withdraw-item_confirmation').val(JSON.stringify(model.getConfirmation())); } else { e.preventDefault(); @@ -254,9 +273,9 @@ // bindings $(document).ready(function() { - $('form').submit(controller.onSubmit); - $('#reportError').click(controller.onReportError); - $('#next').click(controller.onNext); + $('#withdraw-item').submit(controller.onSubmit); + $('#withdraw-item_reportError').click(controller.onReportError); + $('#withdraw-item_next').click(controller.onNext); view.refresh(); });

1 0