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

r155 - trunk
by Bavencoff＠users.forge.codelutin.com May 16, 2013

May 16, 2013

Author: Bavencoff Date: 2013-05-16 10:40:46 +0200 (Thu, 16 May 2013) New Revision: 155 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: update dependencies nuiton-web and nuiton-utilities Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-15 16:01:34 UTC (rev 154) +++ trunk/pom.xml 2013-05-16 08:40:46 UTC (rev 155) @@ -90,8 +90,8 @@ <projectId>franciaflex-magalie</projectId>  - <nuitonWebVersion>1.12-SNAPSHOT</nuitonWebVersion> - <nuitonUtilsVersion>2.6.11-SNAPSHOT</nuitonUtilsVersion> + <nuitonWebVersion>1.13</nuitonWebVersion> + <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.170</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.8</struts2Version>

1 0

r154 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com May 15, 2013

May 15, 2013

Author: bleny Date: 2013-05-15 18:01:34 +0200 (Wed, 15 May 2013) New Revision: 154 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: in reception show article code Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 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-05-15 15:25:50 UTC (rev 153) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-05-15 16:01:34 UTC (rev 154) @@ -33,6 +33,7 @@ <s:property value="quantity" /> <s:property value="article.unit" /> <s:property value="article.description" /> + (Réf <s:property value="article.code" />) </s:a> </li> </s:iterator>

1 0

r153 - trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com May 15, 2013

May 15, 2013

Author: bleny Date: 2013-05-15 17:25:50 +0200 (Wed, 15 May 2013) New Revision: 153 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix bug 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-05-15 15:22:01 UTC (rev 152) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-05-15 15:25:50 UTC (rev 153) @@ -130,7 +130,7 @@ somethingIsAvailable = true; - driverLicenseRequired = bookArticleResult.isArticleInaccessible(); + driverLicenseRequired |= bookArticleResult.isArticleInaccessible(); }

1 0

r152 - trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com May 15, 2013

May 15, 2013

Author: bleny Date: 2013-05-15 17:22:01 +0200 (Wed, 15 May 2013) New Revision: 152 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: rename test Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 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-05-15 15:13:20 UTC (rev 151) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-05-15 15:22:01 UTC (rev 152) @@ -104,7 +104,7 @@ } @Test - public void testRegression() { + public void testUserCannotAccessArticle() { MagalieUser corinne = fixture("corinne");

1 0

r151 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/test/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com May 15, 2013

May 15, 2013

Author: bleny Date: 2013-05-15 17:13:20 +0200 (Wed, 15 May 2013) New Revision: 151 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix the fact that user is sent on article he cannot access, add docs, use real values for compte location accessibility Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.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/BookArticleResult.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-05-13 16:55:20 UTC (rev 150) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-05-15 15:13:20 UTC (rev 151) @@ -33,14 +33,6 @@ public class Locations { - protected static class LocationRequireDriverLicensePredicate implements Predicate<Location> { - - @Override - public boolean apply(Location location) { - return location.isDriverLicenseRequired(); - } - } - protected static class AccessibleLocationPredicate implements Predicate<Location> { protected MagalieUser magalieUser; @@ -51,8 +43,7 @@ @Override public boolean apply(Location location) { - boolean isLocationAccessible = magalieUser.isDriverLicenseOwner() - || ! location.isDriverLicenseRequired(); + boolean isLocationAccessible = magalieUser.getAccreditationLevel() >= location.getRequiredAccreditationLevel(); return isLocationAccessible; } @@ -62,15 +53,7 @@ @Override public int compare(Location location1, Location location2) { - boolean location1RequireDriverLicense = locationRequireDriverLicensePredicate().apply(location1); - boolean location2RequireDriverLicense = locationRequireDriverLicensePredicate().apply(location2); - if (location1RequireDriverLicense && ! location2RequireDriverLicense) { - return -1; - } else if ( ! location1RequireDriverLicense && location2RequireDriverLicense) { - return +1; - } else { - return 0; - } + return Integer.compare(location2.getRequiredAccreditationLevel(), location1.getRequiredAccreditationLevel()); } } @@ -82,10 +65,6 @@ return Predicates.not(accessibleLocationPredicate(magalieUser)); } - public static Predicate<Location> locationRequireDriverLicensePredicate() { - return new LocationRequireDriverLicensePredicate(); - } - public static Comparator<Location> locationRequiringDriverLicenseFirstComparator() { return new LocationRequiringDriverLicenseFirstComparator(); } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-05-13 16:55:20 UTC (rev 150) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-05-15 15:13:20 UTC (rev 151) @@ -80,10 +80,6 @@ return barcode; } - public boolean isDriverLicenseRequired() { - return requiredAccreditationLevel == 9; - } - public boolean isFullLocation() { return fullLocation; } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java 2013-05-13 16:55:20 UTC (rev 150) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java 2013-05-15 15:13:20 UTC (rev 151) @@ -71,7 +71,4 @@ this.accreditationLevel = accreditationLevel; } - public boolean isDriverLicenseOwner() { - return accreditationLevel == 9; - } } 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-05-13 16:55:20 UTC (rev 150) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-05-15 15:13:20 UTC (rev 151) @@ -68,6 +68,13 @@ this.serviceContext = serviceContext; } + /** + * Everything starts here, every time an article is requested, a call to + * this method must be used. + * + * @param bookArticleRequest the request gather all the details we must know + * before computing a storage movement order + */ public BookArticleResult bookArticle(BookArticleRequest bookArticleRequest) { Preconditions.checkNotNull(bookArticleRequest.getMagalieUser()); @@ -86,27 +93,32 @@ log.info("will process article request" + bookArticleRequest); } + // we will proceed in three main steps + + // fist, get a snapshot of the actual current state of the stock Iterable<StoredArticle> storedArticles = getStoredArticles(bookArticleRequest.getBuilding(), article); + // second step, sort all those stored article by priority Set<StoredArticle> sortedStoredArticles = sortStoredArticlesByPriority(storedArticles); + // third step, compute actual order with priorities and actual quantities BookArticleResult bookArticleResult = buildStorageMovementOrder(bookArticleRequest, sortedStoredArticles); - StorageMovementOrder storageMovementOrder = bookArticleResult.getStorageMovementOrder(); - MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); - boolean articleIsAvailable = storageMovementOrder != null; + boolean saveStorageMovementOrder = bookArticleResult.isSuccess(); - if (articleIsAvailable) { + if (saveStorageMovementOrder) { + StorageMovementOrder storageMovementOrder = bookArticleResult.getStorageMovementOrder(); + StorageMovementOrderDao dao = persistenceContext.getStorageMovementOrderDao(); dao.persist(storageMovementOrder); } - updateArticleAvailability(bookArticleRequest, articleIsAvailable); + updateArticleAvailability(bookArticleResult); persistenceContext.commit(); @@ -117,18 +129,22 @@ /** * Add or remove a line in table {@link UnavailableArticle} */ - protected void updateArticleAvailability(BookArticleRequest bookArticleRequest, boolean articleIsAvailable) { + protected void updateArticleAvailability(BookArticleResult bookArticleResult) { - MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); + BookArticleRequest bookArticleRequest = bookArticleResult.getBookArticleRequest(); - UnavailableArticleDao dao = persistenceContext.getUnavailableArticleDao(); - Article article = bookArticleRequest.getArticle(); Building building = bookArticleRequest.getBuilding(); + MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); + + UnavailableArticleDao dao = persistenceContext.getUnavailableArticleDao(); + UnavailableArticle unavailableArticle = dao.findByArticle(building, article); + boolean articleIsAvailable = ! bookArticleResult.isArticleUnavailable(); + if (articleIsAvailable) { if (unavailableArticle != null) { @@ -220,8 +236,6 @@ // TODO brendan 15/04/13 refactor - bookArticleResult.setAvailableQuantity(quantity); - if (CollectionUtils.isEmpty(storageMovementOrder.getStorageMovements())) { storageMovementOrder = null; @@ -318,12 +332,16 @@ } + /** + * Get a snapshot of the actual current state of the stock. + */ protected Iterable<StoredArticle> getStoredArticles(Building building, Article article) { MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); StoredArticleDao storedArticleDao = persistenceContext.getStoredArticleDao(); + // first get all stored articles in the building at known quantities Iterable<StoredArticle> storedArticles = storedArticleDao.findAllForArticleInBuilding(article, building); ImmutableMap<Location, StoredArticle> storedArticlesByLocation = @@ -336,6 +354,8 @@ StorageMovementDao storageMovementDao = persistenceContext.getStorageMovementDao(); + // consider all storage movements, adding quantities when someone added some stock and + // removing quantities if someone has withdraw quantities List<StorageMovement> storageMovements = storageMovementDao.findAllByArticle(article); for (StorageMovement storageMovement : storageMovements) { Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BookArticleResult.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BookArticleResult.java 2013-05-13 16:55:20 UTC (rev 150) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BookArticleResult.java 2013-05-15 15:13:20 UTC (rev 151) @@ -27,6 +27,7 @@ import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; +import com.google.common.base.Preconditions; import com.google.common.base.Predicate; public class BookArticleResult { @@ -35,8 +36,6 @@ protected BookArticleRequest bookArticleRequest; - protected double availableQuantity; - protected Location inaccessibleLocation; public void setStorageMovementOrder(StorageMovementOrder storageMovementOrder) { @@ -44,6 +43,7 @@ } public StorageMovementOrder getStorageMovementOrder() { + Preconditions.checkState(isSuccess()); return storageMovementOrder; } @@ -81,14 +81,6 @@ return storageMovementOrder == null; } - public void setAvailableQuantity(double availableQuantity) { - this.availableQuantity = availableQuantity; - } - - public double getAvailableQuantity() { - return availableQuantity; - } - public boolean isSuccess() { return ! isArticleInaccessible() && ! isArticleUnavailable(); } 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-05-13 16:55:20 UTC (rev 150) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-05-15 15:13:20 UTC (rev 151) @@ -124,10 +124,16 @@ bookArticleResult = articleStorageService.bookArticle(bookArticleRequest); - driverLicenseRequired |= bookArticleResult.isArticleInaccessible() && ! bookArticleResult.isArticleUnavailable(); + boolean articleIsAvailable = ! bookArticleResult.isArticleUnavailable(); - somethingIsAvailable |= ! bookArticleResult.isArticleUnavailable(); + if (articleIsAvailable) { + somethingIsAvailable = true; + + driverLicenseRequired = bookArticleResult.isArticleInaccessible(); + + } + success = bookArticleResult.isSuccess(); } 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-05-13 16:55:20 UTC (rev 150) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-05-15 15:13:20 UTC (rev 151) @@ -29,6 +29,7 @@ import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.StorageMovement; import com.franciaflex.magalie.services.AbstractMagalieServiceTest; +import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -101,4 +102,25 @@ Assert.assertEquals(fixedLocation, storageMovements.get(2).getOriginLocation()); } + + @Test + public void testRegression() { + + MagalieUser corinne = fixture("corinne"); + + Article article = fixture("article1"); + + Preconditions.checkState(article.getCode().equals("4034108")); + + BookArticleRequest bookArticleRequest = + new BookArticleRequest(corinne, building, article, 50., destinationLocation, true); + + BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); + + Assert.assertFalse(bookArticleResult.isSuccess()); + Assert.assertFalse(bookArticleResult.isArticleUnavailable()); + Assert.assertTrue(bookArticleResult.isArticleInaccessible()); + + } + }

1 0

r150 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com May 13, 2013

May 13, 2013

Author: bleny Date: 2013-05-13 18:55:20 +0200 (Mon, 13 May 2013) New Revision: 150 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refactor using Iterables to prevent multiples copies Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.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/ReceptionService.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-05-13 16:54:10 UTC (rev 149) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-05-13 16:55:20 UTC (rev 150) @@ -115,7 +115,6 @@ return Ordering.from(locationWithHighestQuantityFirst()).reverse(); } - public static Comparator<StoredArticle> accessibleLocationFirstComparator(MagalieUser magalieUser) { return new AccessibleLocationFirst(magalieUser); } @@ -128,6 +127,14 @@ return new GetLocationFunction(); } + protected static class NotEmptyPredicate implements Predicate<StoredArticle> { + + @Override + public boolean apply(StoredArticle input) { + return input.getQuantity() > 0.; + } + } + public static Predicate<StoredArticle> articleStoredInAccessibleLocationPredicate(MagalieUser magalieUser) { Predicate<StoredArticle> predicate = Predicates.compose( Locations.accessibleLocationPredicate(magalieUser), @@ -142,4 +149,8 @@ public static Predicate<StoredArticle> articleNotStoredInLocationReportedInError(Collection<Location> allLocationsInError) { return Predicates.compose(Locations.locationIsNotReportedInError(allLocationsInError), getLocationFunction()); } + + public static Predicate<StoredArticle> notEmpty() { + return new NotEmptyPredicate(); + } } 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-05-13 16:54:10 UTC (rev 149) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-05-13 16:55:20 UTC (rev 150) @@ -54,7 +54,6 @@ import org.apache.commons.logging.LogFactory; import java.util.Date; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -87,7 +86,7 @@ log.info("will process article request" + bookArticleRequest); } - List<StoredArticle> storedArticles = getStoredArticles(bookArticleRequest.getBuilding(), article); + Iterable<StoredArticle> storedArticles = getStoredArticles(bookArticleRequest.getBuilding(), article); Set<StoredArticle> sortedStoredArticles = sortStoredArticlesByPriority(storedArticles); @@ -255,7 +254,7 @@ } - protected Set<StoredArticle> sortStoredArticlesByPriority(List<StoredArticle> storedArticles) { + protected Set<StoredArticle> sortStoredArticlesByPriority(Iterable<StoredArticle> storedArticles) { Ordering<StoredArticle> orderingByPriority = Ordering.compound( @@ -269,7 +268,7 @@ Set<StoredArticle> storedArticlesByPriority = Sets.newTreeSet(orderingByPriority); - storedArticlesByPriority.addAll(storedArticles); + Iterables.addAll(storedArticlesByPriority, storedArticles); return storedArticlesByPriority; @@ -294,7 +293,7 @@ // we suppose the order concerns movement in the same building Building building = Iterables.get(locationsInOrder, 0).getWarehouse().getBuilding(); - List<StoredArticle> storedArticles = getStoredArticles(building, article); + Iterable<StoredArticle> storedArticles = getStoredArticles(building, article); for (StoredArticle storedArticle : storedArticles) { @@ -319,13 +318,13 @@ } - protected List<StoredArticle> getStoredArticles(Building building, Article article) { + protected Iterable<StoredArticle> getStoredArticles(Building building, Article article) { MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); StoredArticleDao storedArticleDao = persistenceContext.getStoredArticleDao(); - List<StoredArticle> storedArticles = storedArticleDao.findAllForArticleInBuilding(article, building); + Iterable<StoredArticle> storedArticles = storedArticleDao.findAllForArticleInBuilding(article, building); ImmutableMap<Location, StoredArticle> storedArticlesByLocation = Maps.uniqueIndex( @@ -366,36 +365,17 @@ } - LinkedList<StoredArticle> toRemove = Lists.newLinkedList(); + // don't mention location if stored quantity is 0. - for (StoredArticle storedArticle : storedArticles) { + storedArticles = Iterables.filter(storedArticles, StoredArticles.notEmpty()); - double actualQuantity = storedArticle.getQuantity(); + // exclude storageMovements on a location reported in error - if ( ! (actualQuantity > 0.)) { - - // location is empty, do not include it as a location where you can take an article - toRemove.add(storedArticle); - - } - - } - - storedArticles.removeAll(toRemove); - - // exclude storageMovements reported in error - LocationErrorsService locationErrorsService = serviceContext.newService(LocationErrorsService.class); List<Location> allLocationsInError = locationErrorsService.getAllLocationsInError(article); - storedArticles = - Lists.newArrayList( - Iterables.filter( - storedArticles, - StoredArticles.articleNotStoredInLocationReportedInError(allLocationsInError) - ) - ); + storedArticles = Iterables.filter(storedArticles, StoredArticles.articleNotStoredInLocationReportedInError(allLocationsInError)); return storedArticles; 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-05-13 16:54:10 UTC (rev 149) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-05-13 16:55:20 UTC (rev 150) @@ -122,7 +122,7 @@ ArticleStorageService articleStorageService = serviceContext.newService(ArticleStorageService.class); - List<StoredArticle> storedArticles = + Iterable<StoredArticle> storedArticles = articleStorageService.getStoredArticles(building, article); Ordering<StoredArticle> comparator = Ordering.compound( @@ -133,7 +133,7 @@ Set<StoredArticle> sortedStoredArticles = Sets.newTreeSet(comparator); - sortedStoredArticles.addAll(storedArticles); + Iterables.addAll(sortedStoredArticles, storedArticles); Set<Location> result = Sets.newLinkedHashSet();

1 0

r149 - trunk/magalie-web/src/main/resources
by bleny＠users.forge.codelutin.com May 13, 2013

May 13, 2013

Author: bleny Date: 2013-05-13 18:54:10 +0200 (Mon, 13 May 2013) New Revision: 149 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove override of magalie.properties in web module Added: trunk/magalie-web/src/main/resources/magalie-production.properties Removed: trunk/magalie-web/src/main/resources/magalie.properties Copied: trunk/magalie-web/src/main/resources/magalie-production.properties (from rev 144, trunk/magalie-web/src/main/resources/magalie.properties) =================================================================== --- trunk/magalie-web/src/main/resources/magalie-production.properties (rev 0) +++ trunk/magalie-web/src/main/resources/magalie-production.properties 2013-05-13 16:54:10 UTC (rev 149) @@ -0,0 +1,30 @@ +### +# #%L +# MagaLiE :: UI +# $Id:$ +# $HeadURL:$ +# %% +# Copyright (C) 2013 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### + +hibernate.hbm2ddl.auto=validate +hibernate.show_sql=false +hibernate.format_sql=true +hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy + +magalie.devMode=false + Deleted: trunk/magalie-web/src/main/resources/magalie.properties =================================================================== --- trunk/magalie-web/src/main/resources/magalie.properties 2013-05-13 15:58:44 UTC (rev 148) +++ trunk/magalie-web/src/main/resources/magalie.properties 2013-05-13 16:54:10 UTC (rev 149) @@ -1,22 +0,0 @@ -### -# #%L -# MagaLiE :: UI -# $Id:$ -# $HeadURL:$ -# %% -# Copyright (C) 2013 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -###

1 0

r148 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com May 13, 2013

May 13, 2013

Author: bleny Date: 2013-05-13 17:58:44 +0200 (Mon, 13 May 2013) New Revision: 148 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix error message when user input no location barcode 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-05-13 15:55:48 UTC (rev 147) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-13 15:58:44 UTC (rev 148) @@ -47,6 +47,9 @@ }; model.getStorageMovement = function(barcode) { + if (barcode == '') { + throw new ValidationError("Il faut indiquer le code barre d'un emplacement"); + } var storageMovement; for (var i = 0; i < this.storageMovements.length; i++) { if (barcode == this.storageMovements[i].originLocation.barcode) {

1 0

r147 - in trunk/magalie-web/src/main/webapp: WEB-INF/content css
by bleny＠users.forge.codelutin.com May 13, 2013

May 13, 2013

Author: bleny Date: 2013-05-13 17:55:48 +0200 (Mon, 13 May 2013) New Revision: 147 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: introduce reduced css for some particuler screen Added: trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-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/receive-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-05-13 12:40:35 UTC (rev 146) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-05-13 15:55:48 UTC (rev 147) @@ -30,6 +30,7 @@ </script> <script src="<s:url value='/js/receive-article-input.js' />"></script> <title>Réception d'un article</title> + <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> </head> <header> 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-05-13 12:40:35 UTC (rev 146) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/withdraw-item-input.jsp 2013-05-13 15:55:48 UTC (rev 147) @@ -30,59 +30,7 @@ </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> + <link rel="stylesheet" href="<s:url value='/css/magalie-ck3x-reduced.css' />"/> </head> <header> Added: trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css (rev 0) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x-reduced.css 2013-05-13 15:55:48 UTC (rev 147) @@ -0,0 +1,55 @@ +@media screen and (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { + +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, +#locations { + overflow-y: scroll; + height: 150px; +} + +#storageMovements dl, +#locations dl { + margin: 0; + height: 50px; + box-sizing: border-box; + color: inherit; +} + +} Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-13 12:40:35 UTC (rev 146) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-13 15:55:48 UTC (rev 147) @@ -42,7 +42,7 @@ .dl-horizontal dd, .form-horizontal .controls { - margin-left: 120px; + margin-left: 110px; } .btn-group {

1 0

r146 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/main/java/com/franciaflex/magalie/services/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
by bleny＠users.forge.codelutin.com May 13, 2013

May 13, 2013

Author: bleny Date: 2013-05-13 14:40:35 +0200 (Mon, 13 May 2013) New Revision: 146 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: update file headers Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SupplierJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/UnavailableArticleJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionConfirmation.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.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/PrepareArticleReceptionAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 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/js/magalie.js trunk/magalie-web/src/main/webapp/js/receive-article-input.js Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierDao.java 2013-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/SupplierDao.java 2013-05-13 12:40:35 UTC (rev 146) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.dao; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.Supplier; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java 2013-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/UnavailableArticleDao.java 2013-05-13 12:40:35 UTC (rev 146) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.dao; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.UnavailableArticle; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SupplierJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SupplierJpaDao.java 2013-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/SupplierJpaDao.java 2013-05-13 12:40:35 UTC (rev 146) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.dao.jpa; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.persistence.Locations; import com.franciaflex.magalie.persistence.dao.SupplierDao; import com.franciaflex.magalie.persistence.entity.Building; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/UnavailableArticleJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/UnavailableArticleJpaDao.java 2013-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/UnavailableArticleJpaDao.java 2013-05-13 12:40:35 UTC (rev 146) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.dao.jpa; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.persistence.dao.UnavailableArticleDao; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java 2013-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/UnavailableArticle.java 2013-05-13 12:40:35 UTC (rev 146) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.entity; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionConfirmation.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionConfirmation.java 2013-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionConfirmation.java 2013-05-13 12:40:35 UTC (rev 146) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.services.service; +/* + * #%L + * MagaLiE :: Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import java.util.Map; public class ReceptionConfirmation { 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-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-05-13 12:40:35 UTC (rev 146) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.services.service; +/* + * #%L + * MagaLiE :: Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.persistence.MagaliePersistenceContext; import com.franciaflex.magalie.persistence.StoredArticles; import com.franciaflex.magalie.persistence.dao.LocationDao; Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java 2013-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionTask.java 2013-05-13 12:40:35 UTC (rev 146) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.services.service; +/* + * #%L + * MagaLiE :: Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.StoredArticle; 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-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-05-13 12:40:35 UTC (rev 146) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.services.service; +/* + * #%L + * MagaLiE :: Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.Location; 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-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-05-13 12:40:35 UTC (rev 146) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.services.service; +/* + * #%L + * MagaLiE :: Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.persistence.dao.StorageMovementDao; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java 2013-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java 2013-05-13 12:40:35 UTC (rev 146) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.web.action; +/* + * #%L + * MagaLiE :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.StoredArticle; import com.franciaflex.magalie.persistence.entity.Supplier; 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-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-05-13 12:40:35 UTC (rev 146) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.web.action; +/* + * #%L + * MagaLiE :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.franciaflex.magalie.MagalieTechnicalException; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.services.service.ReceptionConfirmation; 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-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-05-13 12:40:35 UTC (rev 146) @@ -1,3 +1,25 @@ +<%-- + #%L + MagaLiE :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2013 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> 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-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-05-13 12:40:35 UTC (rev 146) @@ -1,3 +1,25 @@ +<%-- + #%L + MagaLiE :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2013 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> 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-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/receive-article-input.jsp 2013-05-13 12:40:35 UTC (rev 146) @@ -1,3 +1,25 @@ +<%-- + #%L + MagaLiE :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2013 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> Modified: trunk/magalie-web/src/main/webapp/js/magalie.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/magalie.js 2013-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-web/src/main/webapp/js/magalie.js 2013-05-13 12:40:35 UTC (rev 146) @@ -1,3 +1,25 @@ +/* + * #%L + * MagaLiE :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ function processTemplate(templateId, model) { var processing = $('#' + templateId).clone().children(); var elementsWithData = $(processing).find('*[data]'); Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-05-13 09:07:52 UTC (rev 145) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-05-13 12:40:35 UTC (rev 146) @@ -1,3 +1,25 @@ +/* + * #%L + * MagaLiE :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ model.locationsIndex = 0; model.allowSubmit = false;

1 0