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

r366 - in trunk/magalie-web/src/main: java/com/franciaflex/magalie/web/action webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com Aug. 19, 2013

Aug. 19, 2013

Author: bleny Date: 2013-08-19 17:43:42 +0200 (Mon, 19 Aug 2013) New Revision: 366 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #3000 change redirection after remove affectation Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java 2013-08-19 14:30:14 UTC (rev 365) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java 2013-08-19 15:43:42 UTC (rev 366) @@ -27,11 +27,13 @@ import com.franciaflex.magalie.services.service.RequestedArticleService; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; +import com.google.common.base.Preconditions; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; @Results({ - @Result(name="success", type="redirectAction", params = { "actionName", "choose-activity" }) + @Result(name="REDIRECT_TO_LIST_TYPES", type="redirectAction", params = { "actionName", "deliver-requested-article!input" }), + @Result(name="REDIRECT_TO_ACTIVITIES", type="redirectAction", params = { "actionName", "choose-activity" }) }) public class RemoveUserAffectationAction extends MagalieActionSupport { @@ -39,6 +41,8 @@ protected RequestedArticleService service; + protected String result; + public void setSession(MagalieSession session) { this.session = session; } @@ -47,14 +51,20 @@ this.service = service; } + public void setResult(String result) { + this.result = result; + } + @Override public String execute() { + Preconditions.checkState(result != null); + MagalieUser magalieUser = session.getMagalieUser(); service.removeAffectation(magalieUser); - return SUCCESS; + return result; } 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-19 14:30:14 UTC (rev 365) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-08-19 15:43:42 UTC (rev 366) @@ -39,6 +39,11 @@ <s:param name="listType" value="%{requestedList.listType}" /> </s:url> <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="requestedArticle" >Demander un article à servir (0)</s:a> + + <s:url action="remove-user-affectation" id="removeUserAffectationUrl"> + <s:param name="result">REDIRECT_TO_LIST_TYPES</s:param> + </s:url> + <s:a href="%{removeUserAffectationUrl}" cssClass="btn btn-block" id="removeUserAffectationLink">Abandonner la liste (Esc)</s:a> </s:if> <s:else> <s:iterator value="listTypes" var="listType" status="stat"> @@ -64,7 +69,9 @@ </s:a> </s:else> </s:iterator> + + <s:url action="remove-user-affectation" id="removeUserAffectationUrl"> + <s:param name="result">REDIRECT_TO_ACTIVITIES</s:param> + </s:url> + <s:a href="%{removeUserAffectationUrl}" cssClass="btn btn-block" id="removeUserAffectationLink">Changer d'activité (Esc)</s:a> </s:else> - -<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

r365 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao magalie-services/src/test/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com Aug. 19, 2013

Aug. 19, 2013

Author: bleny Date: 2013-08-19 16:30:14 +0200 (Mon, 19 Aug 2013) New Revision: 365 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #3000 exclude list with status complete or affected from listTypes Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java 2013-08-19 13:57:53 UTC (rev 364) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java 2013-08-19 14:30:14 UTC (rev 365) @@ -23,6 +23,8 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus; + import javax.persistence.EntityManager; import javax.persistence.TypedQuery; import java.util.List; @@ -35,7 +37,15 @@ @Override public List<String> findAllDistinctListTypes() { - TypedQuery<String> query = entityManager.createQuery("select distinct rl.listType from RequestedList rl", String.class); + TypedQuery<String> query = + entityManager.createQuery( + " select distinct rl.listType" + + " from RequestedList rl" + + " where rl not in (select drl.requestedList from DeliveredRequestedList drl where drl.status = :affectedDeliveredRequestedListStatus OR drl.status = :completeDeliveredRequestedListStatus)" + , String.class); + query.setParameter("affectedDeliveredRequestedListStatus", DeliveredRequestedListStatus.AFFECTED); + query.setParameter("completeDeliveredRequestedListStatus", DeliveredRequestedListStatus.COMPLETE); return query.getResultList(); } + } 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-19 13:57:53 UTC (rev 364) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-08-19 14:30:14 UTC (rev 365) @@ -68,9 +68,19 @@ magalieUser = fixture("bruno"); building = fixture("B1"); + } @Test + public void testListTypes() { + + List<String> listTypes = service.getListTypes(); + + Assert.assertEquals(1, listTypes.size()); + + } + + @Test public void testGetRequestedArticles() { List<RequestedArticle> requestedArticles = service.getRequestedArticles(building, magalieUser, LIST_TYPE);

1 0

r364 - in trunk: magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com Aug. 19, 2013

Aug. 19, 2013

Author: bleny Date: 2013-08-19 15:57:53 +0200 (Mon, 19 Aug 2013) New Revision: 364 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2994 change redirection after reception confirmation Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 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-05 15:06:30 UTC (rev 363) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-08-19 13:57:53 UTC (rev 364) @@ -49,6 +49,7 @@ import com.franciaflex.magalie.services.MagalieServiceContext; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; +import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableSet; @@ -431,4 +432,45 @@ } + /** + * On cherche à savoir si pour un storedArticle donné, il y a encore des articles à recevoir pour le même fournisseur + */ + public Optional<Supplier> isSupplierHaveOtherArticlesToReceive(Building building, String storedArticleId) { + + JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); + + StoredArticleJpaDao storedArticleDao = persistenceContext.getStoredArticleDao(); + + StoredArticle storedArticle = storedArticleDao.findById(storedArticleId); + + Supplier supplier = storedArticle.getArticle().getSupplier(); + + Optional<Supplier> result; + + if (supplier == null) { + + result = Optional.absent(); + + } else { + + SuppliersToReceive receivedSuppliers = getReceivedSuppliers(building); + + boolean isSupplierHaveOtherArticlesToReceive = receivedSuppliers.getSuppliersByGroup().values().contains(supplier); + + if (isSupplierHaveOtherArticlesToReceive) { + + result = Optional.of(supplier); + + } else { + + result = Optional.absent(); + + } + + } + + return result; + + } + } 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-08-05 15:06:30 UTC (rev 363) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-08-19 13:57:53 UTC (rev 364) @@ -26,13 +26,16 @@ import com.franciaflex.magalie.MagalieTechnicalException; import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.persistence.entity.Supplier; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; import com.franciaflex.magalie.services.service.ReceptionConfirmation; import com.franciaflex.magalie.services.service.ReceptionService; import com.franciaflex.magalie.services.service.ReceptionTask; +import com.franciaflex.magalie.web.Activity; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; +import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import org.apache.commons.logging.Log; @@ -46,7 +49,8 @@ import java.util.Map; @Results({ - @Result(name= "RECEPTIONS", type="redirectAction", params = { "actionName", "prepare-article-reception!input" }), + @Result(name= "REDIRECT_TO_ARTICLES", type="redirectAction", params = { "actionName", "prepare-article-reception", "supplierId", "%{supplierId}" }), + @Result(name= "REDIRECT_TO_SUPPLIERS", type="redirectAction", params = { "actionName", "prepare-article-reception!input" }), @Result(name= "PREPARED_RECEPTIONS", type="redirectAction", params = { "actionName", "prepare-prepared-article-reception!input" }) }) public class ReceiveArticleAction extends MagalieActionSupport { @@ -65,6 +69,8 @@ protected ReceptionConfirmation confirmation; + protected String supplierId; + public void setSession(MagalieSession session) { this.session = session; } @@ -165,10 +171,46 @@ MagalieUser magalieUser = session.getMagalieUser(); + Building building = session.getBuilding(); + service.confirmReception(magalieUser, confirmation, preparedArticleReceptionBarcode); - return session.getActivity().name(); + // on redirige selon l'activité + String result; + + if (Activity.PREPARED_RECEPTIONS.equals(session.getActivity())) { + + result = Activity.PREPARED_RECEPTIONS.name(); + + } else { + + // dans ce cas on redirige vers la listes des articles, s'il reste des articles à réceptionner pour le même fournisseur + // sinon, on renvoie vers la liste des fournisseurs + + Optional<Supplier> supplierOptional = + service.isSupplierHaveOtherArticlesToReceive(building, confirmation.getStoredArticleId()); + + if (supplierOptional.isPresent()) { + + result = "REDIRECT_TO_ARTICLES"; + + supplierId = supplierOptional.get().getId(); + + } else { + + result = "REDIRECT_TO_SUPPLIERS"; + + } + + } + + return result; + } + public String getSupplierId() { + return supplierId; + } + }

1 0

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 Aug. 5, 2013

Aug. 5, 2013

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 Aug. 1, 2013

Aug. 1, 2013

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 Aug. 1, 2013

Aug. 1, 2013

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 Aug. 1, 2013

Aug. 1, 2013

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 Aug. 1, 2013

Aug. 1, 2013

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 Aug. 1, 2013

Aug. 1, 2013

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 Aug. 1, 2013

Aug. 1, 2013

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