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

r363 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 05 Aug '13

05 Aug '13

Author: bleny Date: 2013-08-05 17:06:30 +0200 (Mon, 05 Aug 2013) New Revision: 363 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3038 : reception task should not include locations in another building so restrict fixed sites to current building Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.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/entity/Article.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-08-01 15:07:06 UTC (rev 362) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Article.java 2013-08-05 15:06:30 UTC (rev 363) @@ -24,6 +24,7 @@ */ import com.google.common.base.Objects; +import com.google.common.collect.Sets; import javax.persistence.Entity; import java.util.Set; @@ -50,4 +51,17 @@ .add(PROPERTY_ID, id) .toString(); } -} //Article + + public Set<Location> getFixedLocationsInBuilding(Building building) { + Set<Location> fixedLocationsInBuilding = Sets.newHashSet(); + if (getFixedLocations() != null) { + for (Location location : getFixedLocations()) { + if (location.getWarehouse().getBuilding().equals(building)) { + fixedLocationsInBuilding.add(location); + } + } + } + return fixedLocationsInBuilding; + } + +} 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-08-01 15:07:06 UTC (rev 362) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-08-05 15:06:30 UTC (rev 363) @@ -256,12 +256,11 @@ Set<Location> locations = Sets.newLinkedHashSet(); - if (article.getFixedLocations() != null) { + Set<Location> fixedLocationsInBuilding = + article.getFixedLocationsInBuilding(warehouse.getBuilding()); - locations.addAll(article.getFixedLocations()); + locations.addAll(fixedLocationsInBuilding); - } - // second step, add locations where there is already quantities stored // we will suggest locations with highest quantities first ArticleStorageService articleStorageService =

1 0

r362 - in trunk: . magalie-persistence magalie-services magalie-web
by maven-release＠users.forge.codelutin.com 01 Aug '13

01 Aug '13

Author: maven-release Date: 2013-08-01 17:07:06 +0200 (Thu, 01 Aug 2013) New Revision: 362 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/magalie-persistence/pom.xml trunk/magalie-services/pom.xml trunk/magalie-web/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-08-01 15:06:59 UTC (rev 361) +++ trunk/magalie-persistence/pom.xml 2013-08-01 15:07:06 UTC (rev 362) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-3</version> + <version>1.0-rc-4-SNAPSHOT</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-08-01 15:06:59 UTC (rev 361) +++ trunk/magalie-services/pom.xml 2013-08-01 15:07:06 UTC (rev 362) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-3</version> + <version>1.0-rc-4-SNAPSHOT</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-08-01 15:06:59 UTC (rev 361) +++ trunk/magalie-web/pom.xml 2013-08-01 15:07:06 UTC (rev 362) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-3</version> + <version>1.0-rc-4-SNAPSHOT</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-01 15:06:59 UTC (rev 361) +++ trunk/pom.xml 2013-08-01 15:07:06 UTC (rev 362) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-3</version> + <version>1.0-rc-4-SNAPSHOT</version> <packaging>pom</packaging> <name>MagaLiE</name> @@ -92,9 +92,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/tags/fra…</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/trunk</url> </scm> <distributionManagement> <site>

1 0

r361 - in tags: . franciaflex-magalie-1.0-rc-3
by maven-release＠users.forge.codelutin.com 01 Aug '13

01 Aug '13

Author: maven-release Date: 2013-08-01 17:06:59 +0200 (Thu, 01 Aug 2013) New Revision: 361 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] copy for tag franciaflex-magalie-1.0-rc-3 Added: tags/franciaflex-magalie-1.0-rc-3/ Property changes on: tags/franciaflex-magalie-1.0-rc-3 ___________________________________________________________________ Added: svn:ignore + target *.iml *.ipr .idea *~ Added: svn:mergeinfo + /branches/magalie-eugene:191-224

1 0

r360 - in trunk: . magalie-persistence magalie-services magalie-web
by maven-release＠users.forge.codelutin.com 01 Aug '13

01 Aug '13

Author: maven-release Date: 2013-08-01 17:06:50 +0200 (Thu, 01 Aug 2013) New Revision: 360 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] prepare release franciaflex-magalie-1.0-rc-3 Modified: trunk/magalie-persistence/pom.xml trunk/magalie-services/pom.xml trunk/magalie-web/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-08-01 13:34:06 UTC (rev 359) +++ trunk/magalie-persistence/pom.xml 2013-08-01 15:06:50 UTC (rev 360) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-3-SNAPSHOT</version> + <version>1.0-rc-3</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-08-01 13:34:06 UTC (rev 359) +++ trunk/magalie-services/pom.xml 2013-08-01 15:06:50 UTC (rev 360) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-3-SNAPSHOT</version> + <version>1.0-rc-3</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-08-01 13:34:06 UTC (rev 359) +++ trunk/magalie-web/pom.xml 2013-08-01 15:06:50 UTC (rev 360) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-3-SNAPSHOT</version> + <version>1.0-rc-3</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-01 13:34:06 UTC (rev 359) +++ trunk/pom.xml 2013-08-01 15:06:50 UTC (rev 360) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-3-SNAPSHOT</version> + <version>1.0-rc-3</version> <packaging>pom</packaging> <name>MagaLiE</name> @@ -92,9 +92,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/tags/fra…</url> </scm> <distributionManagement> <site>

1 0

r359 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence
by bleny＠users.forge.codelutin.com 01 Aug '13

01 Aug '13

Author: bleny Date: 2013-08-01 15:34:06 +0200 (Thu, 01 Aug 2013) New Revision: 359 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2996 use guava instead of manuel code Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java 2013-08-01 13:19:34 UTC (rev 358) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java 2013-08-01 13:34:06 UTC (rev 359) @@ -33,28 +33,12 @@ public class RequestedArticles { - protected static class RequestedListComparator implements Comparator<RequestedArticle> { - - public RequestedListComparator(Comparator<RequestedList> requestedListComparator) { - this.requestedListComparator = requestedListComparator; - } - - protected Comparator<RequestedList> requestedListComparator; - - @Override - public int compare(RequestedArticle x, RequestedArticle y) { - return requestedListComparator.compare(x.getRequestedList(), y.getRequestedList()); - } - } - public static Comparator<RequestedArticle> comparator(RequestedList affectedRequestedList) { + Comparator<RequestedList> requestedListComparator = RequestedLists.comparator(affectedRequestedList); Comparator<RequestedArticle> comparator = Ordering.compound( Lists.newArrayList( - - new RequestedListComparator(RequestedLists.comparator(affectedRequestedList)), - - // we can still have ambiguous or priorities, so to be deterministic, use arbitrary order + Ordering.from(requestedListComparator).onResultOf(getRequestList()), priorityComparator() ) );

1 0

r358 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/xmi magalie-services/src/main/resources magalie-services/src/test/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 01 Aug '13

01 Aug '13

Author: bleny Date: 2013-08-01 15:19:34 +0200 (Thu, 01 Aug 2013) New Revision: 358 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2996 add a priority field in RequestedArticle to sort articles in a given list Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java trunk/magalie-persistence/src/main/xmi/magalie.zargo trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java 2013-08-01 12:59:15 UTC (rev 357) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java 2013-08-01 13:19:34 UTC (rev 358) @@ -28,7 +28,6 @@ import com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; -import org.nuiton.jpa.api.JpaEntities; import java.util.Comparator; @@ -56,12 +55,16 @@ new RequestedListComparator(RequestedLists.comparator(affectedRequestedList)), // we can still have ambiguous or priorities, so to be deterministic, use arbitrary order - JpaEntities.<RequestedArticle>arbitraryComparator() + priorityComparator() ) ); return comparator; } + public static Comparator<RequestedArticle> priorityComparator() { + return Ordering.natural().onResultOf(new GetPriority()); + } + protected static class GetRequestList implements Function<RequestedArticle, RequestedList> { @Override @@ -73,4 +76,13 @@ public static Function<RequestedArticle, RequestedList> getRequestList() { return new GetRequestList(); } + + protected static class GetPriority implements Function<RequestedArticle, String> { + + @Override + public String apply(RequestedArticle requestedArticle) { + return requestedArticle.getPriority(); + } + } + } Modified: trunk/magalie-persistence/src/main/xmi/magalie.zargo =================================================================== (Binary files differ) Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-08-01 12:59:15 UTC (rev 357) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-08-01 13:19:34 UTC (rev 358) @@ -648,6 +648,7 @@ quantity: 80 requestedList: *requestedList1 destinationLocation: *location14 + priority: B22 requestedArticle2: &requestedArticle2 !requested-article @@ -656,6 +657,7 @@ quantity: 11 requestedList: *requestedList1 destinationLocation: *location14 + priority: F66 requestedArticle3: &requestedArticle3 !requested-article @@ -664,6 +666,7 @@ quantity: 111 requestedList: *requestedList1 destinationLocation: *location14 + priority: A11 requestedArticle4: &requestedArticle4 !requested-article @@ -672,6 +675,7 @@ quantity: 2 requestedList: *requestedList1 destinationLocation: *location14 + priority: E55 requestedArticle5: &requestedArticle5 !requested-article @@ -680,6 +684,7 @@ quantity: 5 requestedList: *requestedList2 destinationLocation: *location14 + priority: D44 requestedArticle6: &requestedArticle6 !requested-article @@ -688,6 +693,7 @@ quantity: 27 requestedList: *requestedList2 destinationLocation: *location14 + priority: C33 requestedArticles: - *requestedArticle1 Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-08-01 12:59:15 UTC (rev 357) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-08-01 13:19:34 UTC (rev 358) @@ -93,12 +93,12 @@ Assert.assertEquals(requestedArticles.size(), requestedArticlesByPriority.size()); - Assert.assertEquals("requestedArticle1", Iterables.get(requestedArticlesByPriority, 0).getId()); - Assert.assertEquals("requestedArticle2", Iterables.get(requestedArticlesByPriority, 1).getId()); - Assert.assertEquals("requestedArticle3", Iterables.get(requestedArticlesByPriority, 2).getId()); - Assert.assertEquals("requestedArticle4", Iterables.get(requestedArticlesByPriority, 3).getId()); - Assert.assertEquals("requestedArticle5", Iterables.get(requestedArticlesByPriority, 4).getId()); - Assert.assertEquals("requestedArticle6", Iterables.get(requestedArticlesByPriority, 5).getId()); + Assert.assertEquals("requestedArticle3", Iterables.get(requestedArticlesByPriority, 0).getId()); + Assert.assertEquals("requestedArticle1", Iterables.get(requestedArticlesByPriority, 1).getId()); + Assert.assertEquals("requestedArticle4", Iterables.get(requestedArticlesByPriority, 2).getId()); + Assert.assertEquals("requestedArticle2", Iterables.get(requestedArticlesByPriority, 3).getId()); + Assert.assertEquals("requestedArticle6", Iterables.get(requestedArticlesByPriority, 4).getId()); + Assert.assertEquals("requestedArticle5", Iterables.get(requestedArticlesByPriority, 5).getId()); }

1 0

r357 - in trunk/magalie-web/src/main/webapp: WEB-INF/content js
by bleny＠users.forge.codelutin.com 01 Aug '13

01 Aug '13

Author: bleny Date: 2013-08-01 14:59:15 +0200 (Thu, 01 Aug 2013) New Revision: 357 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3031 quote generated shortcut in bindKey Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 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/storage-transfer-input.jsp trunk/magalie-web/src/main/webapp/js/magalie.js Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp 2013-08-01 12:39:29 UTC (rev 356) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/choose-company.jsp 2013-08-01 12:59:15 UTC (rev 357) @@ -40,7 +40,7 @@ <script type="text/javascript"> $(document).ready(function () { var id = '<s:property value="elementCompanyId" />'; - bindKey(<s:property value="shortcuts.get(#stat.index)" />, function(){ redirectTo($('#' + id));}); + bindKey('<s:property value="shortcuts.get(#stat.index)" />', function(){ redirectTo($('#' + id));}); }); </script> <s:a href="%{loginUrl}" id="%{elementCompanyId}"> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-08-01 12:39:29 UTC (rev 356) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-08-01 12:59:15 UTC (rev 357) @@ -50,7 +50,7 @@ <script type="text/javascript"> $(document).ready(function () { var id = '<s:property value="deliverRequestedArticleId" />'; - bindKey(<s:property value="shortcuts.get(#stat.index)" />, function(){ redirectTo($('#' + id));}); + bindKey('<s:property value="shortcuts.get(#stat.index)" />', function(){ redirectTo($('#' + id));}); }); </script> <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="%{deliverRequestedArticleId}"> 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-08-01 12:39:29 UTC (rev 356) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-08-01 12:59:15 UTC (rev 357) @@ -38,7 +38,7 @@ <li> <script type="text/javascript"> $(document).ready(function () { - bindKey(<s:property value="shortcuts.get(0)" />, function(){ redirectTo($('#prepareArticleReceptionLink'));}); + bindKey('<s:property value="shortcuts.get(0)" />', function(){ redirectTo($('#prepareArticleReceptionLink'));}); }); </script> <s:url action="prepare-article-reception" id="prepareArticleReceptionUrl" /> @@ -65,7 +65,7 @@ <script type="text/javascript"> $(document).ready(function () { var id = '<s:property value="prepareArticleReceptionId" />'; - bindKey(<s:property value="shortcuts.get(#stat.index + 1)" />, function(){ redirectTo($('#' + id));}); + bindKey('<s:property value="shortcuts.get(#stat.index + 1)" />', function(){ redirectTo($('#' + id));}); }); </script> <s:a href="%{prepareArticleReceptionUrl}" id="%{prepareArticleReceptionId}"> 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-08-01 12:39:29 UTC (rev 356) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-08-01 12:59:15 UTC (rev 357) @@ -41,7 +41,7 @@ <script type="text/javascript"> $(document).ready(function () { var id = '<s:property value="receiveArticleId" />'; - bindKey(<s:property value="shortcuts.get(#stat.index)" />, function(){ redirectTo($('#' + id));}); + bindKey('<s:property value="shortcuts.get(#stat.index)" />', function(){ redirectTo($('#' + id));}); }); </script> <li> Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-08-01 12:39:29 UTC (rev 356) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/storage-transfer-input.jsp 2013-08-01 12:59:15 UTC (rev 357) @@ -28,8 +28,8 @@ <title>Transfert de stock</title> <script type="text/javascript"> $(document).ready(function () { - bindKey("Esc", function(){ redirectTo($('#cancelLink'));}); - bindKey("F5", function(){ redirectTo($('#reportErrorLink'));}); + bindKey('Esc', function(){ redirectTo($('#cancelLink'));}); + bindKey('F5', function(){ redirectTo($('#reportErrorLink'));}); <s:if test="storedArticle != null"> $('#storage-transfer_destinationBarcode').focus(); </s:if> @@ -71,7 +71,7 @@ <script type="text/javascript"> $(document).ready(function () { var id = '<s:property value="elementStoredArticleId" />'; - bindKey(<s:property value="shortcuts.get(#stat.index)" />, function(){ redirectTo($('#' + id));}); + bindKey('<s:property value="shortcuts.get(#stat.index)" />', function(){ redirectTo($('#' + id));}); }); </script> <s:a href="%{storageTransferNextStepUrl}" id="%{elementStoredArticleId}"> Modified: trunk/magalie-web/src/main/webapp/js/magalie.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/magalie.js 2013-08-01 12:39:29 UTC (rev 356) +++ trunk/magalie-web/src/main/webapp/js/magalie.js 2013-08-01 12:59:15 UTC (rev 357) @@ -25,12 +25,12 @@ KEYS = {"F1": 112, "F2": 113, - "F3" : 114 , - "F4" : 115 , - "F5" : 116 , - "tab" : 9 , - "del" : 8 , - "Esc" : 27 , + "F3" : 114, + "F4" : 115, + "F5" : 116, + "tab" : 9, + "del" : 8, + "Esc" : 27, "0" : 48, "1" : 49, "2" : 50,

1 0

r356 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/xmi magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/main/resources magalie-services/src/test/java/com/franciaflex/magalie/services/service magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 01 Aug '13

01 Aug '13

Author: bleny Date: 2013-08-01 14:39:29 +0200 (Thu, 01 Aug 2013) New Revision: 356 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2990 by adding supplierGroup column Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java trunk/magalie-persistence/src/main/xmi/magalie.zargo trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SuppliersToReceive.java trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java 2013-08-01 10:09:09 UTC (rev 355) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Suppliers.java 2013-08-01 12:39:29 UTC (rev 356) @@ -31,6 +31,15 @@ public class Suppliers { + public static Function<Supplier, String> getSupplierGroup() { + return new GetSupplierGroup(); + } + + public static Comparator<Supplier> orderByNamesComparator() { + Comparator<Supplier> orderByNamesComparator = Ordering.natural().onResultOf(new GetName()); + return orderByNamesComparator; + } + protected static class GetName implements Function<Supplier, String> { @Override @@ -39,9 +48,12 @@ } } - public static Comparator<Supplier> orderByNamesComparator() { - Comparator<Supplier> orderByNamesComparator = Ordering.natural().onResultOf(new GetName()); - return orderByNamesComparator; + protected static class GetSupplierGroup implements Function<Supplier, String> { + + @Override + public String apply(Supplier supplier) { + return supplier.getSupplierGroup(); + } } } Modified: trunk/magalie-persistence/src/main/xmi/magalie.zargo =================================================================== (Binary files differ) Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SuppliersToReceive.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SuppliersToReceive.java 2013-08-01 10:09:09 UTC (rev 355) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/SuppliersToReceive.java 2013-08-01 12:39:29 UTC (rev 356) @@ -26,44 +26,61 @@ import com.franciaflex.magalie.persistence.Suppliers; import com.franciaflex.magalie.persistence.entity.Supplier; import com.google.common.base.Predicates; -import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableListMultimap; +import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; +import com.google.common.collect.Multimaps; +import com.google.common.collect.Ordering; -import java.util.List; -import java.util.Set; +import java.util.Comparator; public class SuppliersToReceive { - protected List<Supplier> suppliers; - protected boolean articlesWithoutSuppliers; protected boolean somethingToReceive; + protected ImmutableSetMultimap<String,Supplier> suppliersByGroup; + public SuppliersToReceive(Iterable<Supplier> suppliers) { somethingToReceive = ! Iterables.isEmpty(suppliers); articlesWithoutSuppliers = Iterables.contains(suppliers, null); - Set<Supplier> sortedSuppliers = Sets.newTreeSet(Suppliers.orderByNamesComparator()); + // on veut présenter les groupes dans l'ordre alphabétique + Comparator<String> supplierGroupsOrder = Ordering.natural(); - Iterables.addAll(sortedSuppliers, Iterables.filter(suppliers, Predicates.notNull())); + // dans chaque groupe, on veut présenter les fournisseurs triés par nom + Comparator<Supplier> suppliersOrdering = Suppliers.orderByNamesComparator(); - this.suppliers = ImmutableList.copyOf(sortedSuppliers); + ImmutableListMultimap<String, Supplier> suppliersIndexedByGroups = + Multimaps.index( + Iterables.filter( + suppliers, + Predicates.notNull()), + Suppliers.getSupplierGroup() + ); + suppliersByGroup = ImmutableSetMultimap + .<String, Supplier> builder() + .orderKeysBy(supplierGroupsOrder) + .orderValuesBy(suppliersOrdering) + .putAll(suppliersIndexedByGroups) + .build(); + } public boolean isSomethingToReceive() { return somethingToReceive; } - public List<Supplier> getSuppliers() { - return suppliers; - } - public boolean isArticlesWithoutSuppliers() { return articlesWithoutSuppliers; } + + public ImmutableSetMultimap<String, Supplier> getSuppliersByGroup() { + return suppliersByGroup; + } + } Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-08-01 10:09:09 UTC (rev 355) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-08-01 12:39:29 UTC (rev 356) @@ -324,15 +324,38 @@ &supplier1 !supplier id: supplier1 name: Somfy + supplierGroup: Matériel supplier2: &supplier2 !supplier id: supplier2 name: Soliris + supplierGroup: Toiles +supplier3: + &supplier3 !supplier + id: supplier3 + name: MégaToiles + supplierGroup: Toiles + +supplier4: + &supplier4 !supplier + id: supplier4 + name: onatout + supplierGroup: Matériel + +supplier5: + &supplier5 !supplier + id: supplier5 + name: SuperStores + supplierGroup: Toiles + suppliers: - *supplier1 - *supplier2 + - *supplier3 + - *supplier4 + - *supplier5 article1: &article1 !article 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-08-01 10:09:09 UTC (rev 355) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-08-01 12:39:29 UTC (rev 356) @@ -41,7 +41,9 @@ import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.Iterables; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -51,6 +53,7 @@ import javax.persistence.EntityManager; import javax.persistence.EntityTransaction; import java.text.ParseException; +import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Map; @@ -96,11 +99,11 @@ Assert.assertTrue(receivedSuppliers.isSomethingToReceive()); - List<Supplier> suppliers = receivedSuppliers.getSuppliers(); + ImmutableSetMultimap<String, Supplier> suppliersByGroup = receivedSuppliers.getSuppliersByGroup(); - Assert.assertEquals(1, suppliers.size()); + Assert.assertEquals(1, suppliersByGroup.size()); - Assert.assertEquals(supplier, suppliers.get(0)); + Assert.assertEquals(supplier, Iterables.get(suppliersByGroup.entries(), 0).getValue()); Assert.assertTrue(receivedSuppliers.isArticlesWithoutSuppliers()); @@ -214,7 +217,7 @@ SuppliersToReceive receivedSuppliers = service.getReceivedSuppliers(building); - List<Supplier> suppliers = receivedSuppliers.getSuppliers(); + ImmutableSetMultimap<String, Supplier> suppliers = receivedSuppliers.getSuppliersByGroup(); Assert.assertTrue(receivedSuppliers.isSomethingToReceive()); @@ -370,4 +373,28 @@ } + @Test + public void testSuppliersPresentation() { + + Iterable<Supplier> suppliers = fixture("suppliers"); + + SuppliersToReceive suppliersToReceive = new SuppliersToReceive(suppliers); + + ImmutableSetMultimap<String,Supplier> suppliersByGroup = suppliersToReceive.getSuppliersByGroup(); + + for (Map.Entry<String, Collection<Supplier>> suppliersByGroupEntry : suppliersByGroup.asMap().entrySet()) { + + String supplierGroup = suppliersByGroupEntry.getKey(); + + Collection<Supplier> suppliersInGroup = suppliersByGroupEntry.getValue(); + + if (log.isDebugEnabled()) { + log.debug(supplierGroup + " ↓\n " + StringUtils.join(suppliersInGroup, "\n ")); + } + + } + + // just check that there is no exception, user can check is order is OK + } + } 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-08-01 10:09:09 UTC (rev 355) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception-input.jsp 2013-08-01 12:39:29 UTC (rev 356) @@ -47,11 +47,19 @@ </s:a> </li> - <s:iterator value="suppliersToReceive.suppliers" status="stat"> + <s:iterator value="suppliersToReceive.suppliersByGroup.entries()" status="stat"> + + <%-- Afficher le nom du groupe --%> + <s:set var="currentGroup"><s:property value="key" /></s:set> + <s:if test="#lastGroup != #currentGroup"> + <s:set var="lastGroup"><s:property value="key" /></s:set> + Groupe <s:property value="key" /> + </s:if> + <li> <s:set var="prepareArticleReceptionId">prepareArticleReceptionId<s:property value="#stat.index" /></s:set> <s:url action="prepare-article-reception" id="prepareArticleReceptionUrl"> - <s:param name="supplierId" value="%{id}" /> + <s:param name="supplierId" value="%{value.id}" /> </s:url> <s:if test="#stat.index + 1 < shortcuts.size()"> <script type="text/javascript"> @@ -60,13 +68,13 @@ bindKey(<s:property value="shortcuts.get(#stat.index + 1)" />, function(){ redirectTo($('#' + id));}); }); </script> - <s:a href="%{prepareArticleReceptionUrl}" id="%{prepareArticleReceptionId}"> - (<s:property value="shortcuts.get(#stat.index + 1)" />) <s:property value="name" /> + <s:a href="%{prepareArticleReceptionUrl}" id="%{prepareArticleReceptionId}"> + (<s:property value="shortcuts.get(#stat.index + 1)" />) <s:property value="value.name" /> </s:a> </s:if> <s:else> <s:a href="%{prepareArticleReceptionUrl}" > - <s:property value="name" /> + <s:property value="value.name" /> </s:a> </s:else> </li>

1 0

r355 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 01 Aug '13

01 Aug '13

Author: bleny Date: 2013-08-01 12:09:09 +0200 (Thu, 01 Aug 2013) New Revision: 355 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: facorize document.ready call Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-08-01 08:27:29 UTC (rev 354) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-08-01 10:09:09 UTC (rev 355) @@ -28,6 +28,7 @@ $(document).ready(function () { $("#requestedArticle").focus(); bindKey('0', function(){ redirectTo($('#requestedArticle'));}); + bindKey('Esc', function(){ redirectTo($('#removeUserAffectationLink'));}); }); </script> @@ -65,12 +66,5 @@ </s:iterator> </s:else> -<script type="text/javascript"> - $(document).ready(function () { - $("#requestedArticle").focus(); - bindKey('Esc', function(){ redirectTo($('#removeUserAffectationLink'));}); - }); -</script> - <s:url action="remove-user-affectation" id="removeUserAffectationUrl"/> <s:a href="%{removeUserAffectationUrl}" cssClass="btn btn-block" id="removeUserAffectationLink">Changer d'activité (Esc)</s:a>

1 0

r354 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 01 Aug '13

01 Aug '13

Author: bleny Date: 2013-08-01 10:27:29 +0200 (Thu, 01 Aug 2013) New Revision: 354 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3006 don't show next location if confirm, if one location is not used or if quantity withdraw > expected Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-07-31 16:15:32 UTC (rev 353) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-08-01 08:27:29 UTC (rev 354) @@ -44,31 +44,42 @@ } model.newEmptyStorageMovementForNextLocation = function() { - var storageMovement; - $.ajax({ - dataType: "json", - url: getRealTimeStorageMovementTaskJsonUrl, - data: { articleId: this.articleId }, - async: false, - success: function(data) { - storageMovement = data.realTimeStorageMovementTask; - }, - fail: function(jqXHR, textStatus, errorThrown) { - console.error(jqXHR); - console.error(textStatus); - console.error(errorThrown); - } - }); - if (storageMovement.articleUnavailable) { - alert('Plus de stock'); - } else { - if (this.expectedQuantity) { - storageMovement.expectedQuantity = Math.min(model.remaining(), storageMovement.storedArticle.quantity); + var quantityIsRemaining = ! model.expectedQuantity // pas de quantité demandée précisée au départ donc on ne sait pas s'il faut s'arrêter donc on propose au cas où + || model.withdrawn() < model.expectedQuantity // on a une quantité demandée mais on ne l'a pas encore atteinte + var allIsUsed = true; + for (var i = 0; i < this.storageMovements.length; i++) { + if ( ! this.storageMovements[i].used) { + allIsUsed = false; + } + } + var proposeAnotherLocation = quantityIsRemaining && allIsUsed; + if (proposeAnotherLocation) { + var storageMovement; + $.ajax({ + dataType: "json", + url: getRealTimeStorageMovementTaskJsonUrl, + data: { articleId: this.articleId }, + async: false, + success: function(data) { + storageMovement = data.realTimeStorageMovementTask; + }, + fail: function(jqXHR, textStatus, errorThrown) { + console.error(jqXHR); + console.error(textStatus); + console.error(errorThrown); + } + }); + if (storageMovement.articleUnavailable) { + alert('Plus de stock'); } else { - storageMovement.expectedQuantity = storageMovement.storedArticle.quantity; + if (this.expectedQuantity) { + storageMovement.expectedQuantity = Math.min(model.remaining(), storageMovement.storedArticle.quantity); + } else { + storageMovement.expectedQuantity = storageMovement.storedArticle.quantity; + } + this.storageMovements.push(storageMovement); + this.storageMovementsIndex += 1; } - this.storageMovements.push(storageMovement); - this.storageMovementsIndex += 1; } } @@ -233,14 +244,6 @@ view.refresh(); - var proposeAnotherLocation = ! model.expectedQuantity // pas de quantité demandée précisée au départ donc on ne sait pas s'il faut s'arrêter donc on propose au cas où - || model.withdrawn() < model.expectedQuantity // on a une quantité demandée mais on ne l'a pas encore atteinte - if (proposeAnotherLocation) { - model.newEmptyStorageMovementForNextLocation(); - } - - view.refresh(); - }, onNext : function() { @@ -249,6 +252,10 @@ controller.next(false); + model.newEmptyStorageMovementForNextLocation(); + + view.refresh(); + } catch (ex) { if (ex instanceof ValidationError) { @@ -266,6 +273,10 @@ controller.next(true); + model.newEmptyStorageMovementForNextLocation(); + + view.refresh(); + } catch (ex) { if (ex instanceof ValidationError) { @@ -306,6 +317,12 @@ $('#withdraw-item').submit(); + } else { + + model.newEmptyStorageMovementForNextLocation(); + + view.refresh(); + } }

1 0