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

r165 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action
by Bavencoff＠users.forge.codelutin.com 17 May '13

17 May '13

Author: Bavencoff Date: 2013-05-17 15:07:37 +0200 (Fri, 17 May 2013) New Revision: 165 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: disable most number of user Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java 2013-05-17 12:45:51 UTC (rev 164) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java 2013-05-17 13:07:37 UTC (rev 165) @@ -29,7 +29,6 @@ import com.franciaflex.magalie.services.service.MagalieUsersService; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; -import com.google.common.collect.Lists; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; @@ -94,15 +93,7 @@ } public List<MagalieUser> getAllMagalieUsers() { - // TODO brendan 17/05/13 for test only, suppress it ASAP - List<MagalieUser> magalieUsers = Lists.newLinkedList(); - magalieUsers.addAll(allMagalieUsers); - magalieUsers.addAll(allMagalieUsers); - magalieUsers.addAll(allMagalieUsers); - magalieUsers.addAll(allMagalieUsers); - magalieUsers.addAll(allMagalieUsers); - magalieUsers.addAll(allMagalieUsers); - return magalieUsers; + return allMagalieUsers; } public List<Building> getAllBuildings() {

1 0

r164 - trunk/magalie-services/src/test/resources
by bleny＠users.forge.codelutin.com 17 May '13

17 May '13

Author: bleny Date: 2013-05-17 14:45:51 +0200 (Fri, 17 May 2013) New Revision: 164 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add a commented line in log4j tests Modified: trunk/magalie-services/src/test/resources/log4j.properties Modified: trunk/magalie-services/src/test/resources/log4j.properties =================================================================== --- trunk/magalie-services/src/test/resources/log4j.properties 2013-05-17 09:51:28 UTC (rev 163) +++ trunk/magalie-services/src/test/resources/log4j.properties 2013-05-17 12:45:51 UTC (rev 164) @@ -24,7 +24,8 @@ log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d [%p] %c %m%n +log4j.appender.console.layout.ConversionPattern=%d{hh:mm:ss} %5p (%F:%L) %m%n -log4j.logger.com.franciaflex.magalie=TRACE +# log4j.logger.com.franciaflex.magalie=TRACE +# log4j.logger.org.hibernate.tool.hbm2ddl.SchemaExport=FATAL

1 0

r163 - in trunk/magalie-web/src/main/webapp: WEB-INF/content css js
by Bavencoff＠users.forge.codelutin.com 17 May '13

17 May '13

Author: Bavencoff Date: 2013-05-17 11:51:28 +0200 (Fri, 17 May 2013) New Revision: 163 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2431 : user experience Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css trunk/magalie-web/src/main/webapp/js/receive-article-input.js trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 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-05-17 09:38:46 UTC (rev 162) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-05-17 09:51:28 UTC (rev 163) @@ -24,13 +24,21 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <s:if test="requestedList"> + <head> + <script type="text/javascript"> + $(document).ready(function () { + $("#requestedArticle").focus(); + }); + </script> + </head> + <p> Vous êtes affecté à la liste <s:property value="requestedList.code" /> </p> <s:url namespace="/" action="deliver-requested-article" id="deliverRequestedArticleUrl"> <s:param name="listType" value="%{requestedList.listType}" /> </s:url> - <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block">Demander un article à servir</s:a> + <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="requestedArticle" >Demander un article à servir</s:a> </s:if> <s:else> <s:iterator value="listTypes" var="listType"> Modified: trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css =================================================================== --- trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-17 09:38:46 UTC (rev 162) +++ trunk/magalie-web/src/main/webapp/css/magalie-ck3x.css 2013-05-17 09:51:28 UTC (rev 163) @@ -33,6 +33,9 @@ height: 320px; overflow: auto; background-color: white; + margin-top: 30px; + margin-left: 5px; + margin-right: 5px; } .dl-horizontal dt, @@ -52,21 +55,5 @@ left: 10px; right: auto; } -} -/* -@media screen and (min-width: 300px) and (min-height: 400px) and (max-width: 480px) and (max-height: 640px) and (orientation: portrait) { - -body { - background-color: grey; } - -#container { - background-color: white; - position: absolute; - left: 20px; - top: 20px; -} - -} -*/ \ No newline at end of file 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-17 09:38:46 UTC (rev 162) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-05-17 09:51:28 UTC (rev 163) @@ -154,6 +154,7 @@ this.refreshLocations(); this.refreshForm(); this.refreshButtons(); + $('#receive-article_locationBarcode').focus(); } }; 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-17 09:38:46 UTC (rev 162) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-05-17 09:51:28 UTC (rev 163) @@ -177,6 +177,7 @@ this.refreshLocations(); this.refreshForm(); this.refreshButtons(); + $('#withdraw-item_locationBarcode').focus(); } };

1 0

r162 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 17 May '13

17 May '13

Author: bleny Date: 2013-05-17 11:38:46 +0200 (Fri, 17 May 2013) New Revision: 162 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: on login screen make a field with more values to check that CK3X reacts well Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java 2013-05-17 09:11:15 UTC (rev 161) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LoginAction.java 2013-05-17 09:38:46 UTC (rev 162) @@ -29,6 +29,7 @@ import com.franciaflex.magalie.services.service.MagalieUsersService; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; +import com.google.common.collect.Lists; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; @@ -93,7 +94,15 @@ } public List<MagalieUser> getAllMagalieUsers() { - return allMagalieUsers; + // TODO brendan 17/05/13 for test only, suppress it ASAP + List<MagalieUser> magalieUsers = Lists.newLinkedList(); + magalieUsers.addAll(allMagalieUsers); + magalieUsers.addAll(allMagalieUsers); + magalieUsers.addAll(allMagalieUsers); + magalieUsers.addAll(allMagalieUsers); + magalieUsers.addAll(allMagalieUsers); + magalieUsers.addAll(allMagalieUsers); + return magalieUsers; } public List<Building> getAllBuildings() {

1 0

r161 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa 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
by bleny＠users.forge.codelutin.com 17 May '13

17 May '13

Author: bleny Date: 2013-05-17 11:11:15 +0200 (Fri, 17 May 2013) New Revision: 161 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2165 exclude full locations from suggested locations on reception Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.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-17 08:45:28 UTC (rev 160) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-05-17 09:11:15 UTC (rev 161) @@ -23,10 +23,11 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; -import com.franciaflex.magalie.persistence.entity.Location; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import com.google.common.collect.Lists; import java.util.Collection; import java.util.Comparator; @@ -41,6 +42,14 @@ } } + protected static class IsFullLocation implements Predicate<Location> { + + @Override + public boolean apply(Location location) { + return location.isFullLocation(); + } + } + protected static class AccessibleLocationPredicate implements Predicate<Location> { protected MagalieUser magalieUser; @@ -93,4 +102,19 @@ public static Predicate<Location> isNotReceptionLocation() { return Predicates.not(new IsReceptionLocation()); } + + public static Predicate<Location> isNotFullLocation() { + return Predicates.not(new IsFullLocation()); + } + + public static Predicate<Location> isAcceptableForReception() { + Predicate<Location> isAcceptableForReception = + Predicates.and( + Lists.newArrayList( + isNotReceptionLocation(), + isNotFullLocation() + ) + ); + return isAcceptableForReception; + } } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java 2013-05-17 08:45:28 UTC (rev 160) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationJpaDao.java 2013-05-17 09:11:15 UTC (rev 161) @@ -58,7 +58,8 @@ " from Location l where" + " l.warehouse.building = :building and " + " l.code != :codeForReceptionLocations and " - + " l.code != :codeForWarehouseWithoutLocations " + + " l.code != :codeForWarehouseWithoutLocations and " + + " l.fullLocation = false " + " order by l.warehouse.building.code, l.warehouse.code, l.code"); query.setParameter("building", building); query.setParameter("codeForReceptionLocations", Locations.codeForReceptionLocations()); 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-17 08:45:28 UTC (rev 160) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-05-17 09:11:15 UTC (rev 161) @@ -164,11 +164,12 @@ // fourth step, remove reception locations because it's stupid to // move an article from reception location to another reception location + // also, remove full locations List<Location> result = Lists.newArrayList( Iterables.filter( locations, - Locations.isNotReceptionLocation() + Locations.isAcceptableForReception() ) ); Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-05-17 08:45:28 UTC (rev 160) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-05-17 09:11:15 UTC (rev 161) @@ -260,6 +260,15 @@ requiredAccreditationLevel: 0 requiredCraneMan : false +locationFull1: + &locationFull1 !location + id: locationFull1 + warehouse: *U01 + code: C04 + requiredAccreditationLevel: 0 + requiredCraneMan : false + fullLocation: true + locations: - *location1 - *location2 @@ -281,6 +290,7 @@ - *locationRecU04 - *locationRecSOM - *locationRecB01 + - *locationFull1 supplier1: &supplier1 !supplier 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-17 08:45:28 UTC (rev 160) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-05-17 09:11:15 UTC (rev 161) @@ -123,6 +123,10 @@ for (Location location : receptionTask.getLocations()) { + if (log.isDebugEnabled()) { + log.debug("location " + location.getBarcode()); + } + Assert.assertNotEquals( "we should never suggest someone to store something in a reception location", Locations.codeForReceptionLocations(), @@ -133,6 +137,10 @@ Locations.codeForWarehouseWithoutLocations(), location.getCode()); + Assert.assertFalse( + "we should never suggest someone to store something in a full location", + location.isFullLocation()); + } }

1 0

r160 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence 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 17 May '13

17 May '13

Author: bleny Date: 2013-05-17 10:45:28 +0200 (Fri, 17 May 2013) New Revision: 160 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2165 prevent suggestion of 'REC' locations Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.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-16 15:56:34 UTC (rev 159) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-05-17 08:45:28 UTC (rev 160) @@ -33,6 +33,14 @@ public class Locations { + protected static class IsReceptionLocation implements Predicate<Location> { + + @Override + public boolean apply(Location location) { + return codeForReceptionLocations().equals(location.getCode()); + } + } + protected static class AccessibleLocationPredicate implements Predicate<Location> { protected MagalieUser magalieUser; @@ -81,4 +89,8 @@ public static String codeForReceptionLocations() { return "REC"; } + + public static Predicate<Location> isNotReceptionLocation() { + return Predicates.not(new IsReceptionLocation()); + } } 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-16 15:56:34 UTC (rev 159) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-05-17 08:45:28 UTC (rev 160) @@ -23,6 +23,7 @@ * #L% */ +import com.franciaflex.magalie.persistence.Locations; import com.franciaflex.magalie.persistence.MagaliePersistenceContext; import com.franciaflex.magalie.persistence.StoredArticles; import com.franciaflex.magalie.persistence.dao.LocationDao; @@ -119,6 +120,17 @@ protected List<Location> findLocationsToReceiveArticle(Building building, Article article) { + // first step, add fixed locations for this article first + Set<Location> locations = Sets.newLinkedHashSet(); + + if (article.getFixedLocations() != null) { + + locations.addAll(article.getFixedLocations()); + + } + + // second step, add locations where there is already quantities stored + // we will suggest locations with highest quantities first ArticleStorageService articleStorageService = serviceContext.newService(ArticleStorageService.class); @@ -135,30 +147,33 @@ Iterables.addAll(sortedStoredArticles, storedArticles); - Set<Location> result = Sets.newLinkedHashSet(); - - if (article.getFixedLocations() != null) { - - result.addAll(article.getFixedLocations()); - - } - Iterables.addAll( - result, + locations, Iterables.transform( - sortedStoredArticles, - StoredArticles.getLocationFunction())); + sortedStoredArticles, + StoredArticles.getLocationFunction())); + // third step, add extra locations MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); LocationDao locationDao = persistenceContext.getLocationDao(); - result.addAll(locationDao.findAllWithoutReception(building)); + locations.addAll(locationDao.findAllWithoutReception(building)); - return Lists.newArrayList(result); + // fourth step, remove reception locations because it's stupid to + // move an article from reception location to another reception location + List<Location> result = + Lists.newArrayList( + Iterables.filter( + locations, + Locations.isNotReceptionLocation() + ) + ); + return result; + } public void confirmReception(MagalieUser magalieUser, ReceptionConfirmation receptionConfirmation) { 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-16 15:56:34 UTC (rev 159) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-05-17 08:45:28 UTC (rev 160) @@ -23,6 +23,7 @@ * #L% */ +import com.franciaflex.magalie.persistence.Locations; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; @@ -120,6 +121,20 @@ Assert.assertEquals(fixedLocation, receptionTask.getLocations().get(0)); + for (Location location : receptionTask.getLocations()) { + + Assert.assertNotEquals( + "we should never suggest someone to store something in a reception location", + Locations.codeForReceptionLocations(), + location.getCode()); + + Assert.assertNotEquals( + "we should never suggest someone to store something in a warehouse without locations", + Locations.codeForWarehouseWithoutLocations(), + location.getCode()); + + } + } @Test

1 0

r159 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 16 May '13

16 May '13

Author: bleny Date: 2013-05-16 17:56:34 +0200 (Thu, 16 May 2013) New Revision: 159 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add craveMan field in report of magalie users Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-05-16 14:49:16 UTC (rev 158) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-05-16 15:56:34 UTC (rev 159) @@ -332,8 +332,11 @@ nom </th> <th> - permis ? + niveau de permis </th> + <th> + permis pontier + </th> </tr> </thead> @@ -350,8 +353,11 @@ <s:property value="name" /> </td> <td> - <s:property value="driverLicenseOwner" /> + <s:property value="accreditationLevel" /> </td> + <td> + <s:property value="craneMan" /> + </td> </tr> </s:iterator> </tbody>

1 0

r158 - trunk/magalie-web/src/main/webapp/WEB-INF
by bleny＠users.forge.codelutin.com 16 May '13

16 May '13

Author: bleny Date: 2013-05-16 16:49:16 +0200 (Thu, 16 May 2013) New Revision: 158 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: prevent caching of javascript files without expiration Modified: trunk/magalie-web/src/main/webapp/WEB-INF/web.xml Modified: trunk/magalie-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/web.xml 2013-05-16 12:37:12 UTC (rev 157) +++ trunk/magalie-web/src/main/webapp/WEB-INF/web.xml 2013-05-16 14:49:16 UTC (rev 158) @@ -33,7 +33,25 @@ <session-timeout>600</session-timeout> </session-config> +  <filter> + <filter-name>ExpiresFilter</filter-name> + <filter-class>org.apache.catalina.filters.ExpiresFilter</filter-class> + <init-param> + <param-name>ExpiresByType image</param-name> + <param-value>access plus 10 minutes</param-value> + </init-param> + <init-param> + <param-name>ExpiresByType text/css</param-name> + <param-value>access plus 10 minutes</param-value> + </init-param> + <init-param> + <param-name>ExpiresByType application/javascript</param-name> + <param-value>access plus 10 minutes</param-value> + </init-param> + </filter> + + <filter> <filter-name>jpaTransaction</filter-name> <filter-class>com.franciaflex.magalie.web.MagalieJpaTransactionFilter</filter-class> </filter> @@ -78,4 +96,10 @@ <listener-class>com.franciaflex.magalie.web.MagalieApplicationListener</listener-class> </listener> + <filter-mapping> + <filter-name>ExpiresFilter</filter-name> + <url-pattern>/*</url-pattern> + <dispatcher>REQUEST</dispatcher> + </filter-mapping> + </web-app>

1 0

r157 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 16 May '13

16 May '13

Author: bleny Date: 2013-05-16 14:37:12 +0200 (Thu, 16 May 2013) New Revision: 157 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: on fulfil kanban, put focus on articleBarcode Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-05-16 10:05:24 UTC (rev 156) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-05-16 12:37:12 UTC (rev 157) @@ -25,6 +25,11 @@ <head> <title>Traitement des kanbans</title> + <script type="text/javascript"> + $(document).ready(function () { + $("#fulfil-kanban_articleBarcode").focus(); + }); + </script> </head> <s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/>

1 0

r156 - 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/resources magalie-services/src/test/java/com/franciaflex/magalie/services/service
by Bavencoff＠users.forge.codelutin.com 16 May '13

16 May '13

Author: Bavencoff Date: 2013-05-16 12:05:24 +0200 (Thu, 16 May 2013) New Revision: 156 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2371 : add Crane man control 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/resources/fixtures.yaml trunk/magalie-services/src/main/resources/fixtures2.yaml trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.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-16 08:40:46 UTC (rev 155) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-05-16 10:05:24 UTC (rev 156) @@ -43,7 +43,8 @@ @Override public boolean apply(Location location) { - boolean isLocationAccessible = magalieUser.getAccreditationLevel() >= location.getRequiredAccreditationLevel(); + boolean isLocationAccessible = magalieUser.getAccreditationLevel() >= location.getRequiredAccreditationLevel() + && (magalieUser.isCraneMan() || !location.isRequiredCraneMan()) ; return isLocationAccessible; } 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-16 08:40:46 UTC (rev 155) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-05-16 10:05:24 UTC (rev 156) @@ -42,6 +42,8 @@ protected boolean fullLocation; + protected boolean requiredCraneMan; + @Override public String getId() { return id; @@ -87,4 +89,13 @@ public void setFullLocation(boolean fullLocation) { this.fullLocation = fullLocation; } + + public boolean isRequiredCraneMan() { + return requiredCraneMan; } + + public void setRequiredCraneMan(boolean requiredCraneMan) { + this.requiredCraneMan = requiredCraneMan; + } + +} 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-16 08:40:46 UTC (rev 155) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java 2013-05-16 10:05:24 UTC (rev 156) @@ -38,6 +38,8 @@ protected int accreditationLevel; + protected boolean craneMan; + @Override public String getId() { return id; @@ -71,4 +73,13 @@ this.accreditationLevel = accreditationLevel; } + + public boolean isCraneMan() { + return craneMan; + } + + public void setCraneMan(boolean craneMan) { + this.craneMan = craneMan; + } + } Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-05-16 08:40:46 UTC (rev 155) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-05-16 10:05:24 UTC (rev 156) @@ -4,6 +4,7 @@ login: phe name: Pascal Heinz accreditationLevel: 9 + craneMan: false bruno: &bruno !user @@ -11,6 +12,7 @@ login: bmr name: Bruno Menager accreditationLevel: 9 + craneMan: true corinne: &corinne !user @@ -18,6 +20,7 @@ login: ccr name: Corinne Cocolon accreditationLevel: 0 + craneMan: false xavier: &xavier !user @@ -25,6 +28,7 @@ login: xbe name: Xavier Bertini accreditationLevel: 0 + craneMan: false users: - *bruno @@ -102,6 +106,7 @@ warehouse: *U01 code: A01 requiredAccreditationLevel: 0 + requiredCraneMan : false location2: &location2 !location @@ -109,6 +114,7 @@ warehouse: *U01 code: B02 requiredAccreditationLevel: 9 + requiredCraneMan : false location3: &location3 !location @@ -116,6 +122,7 @@ warehouse: *U01 code: C03 requiredAccreditationLevel: 0 + requiredCraneMan : false location4: &location4 !location @@ -123,6 +130,7 @@ warehouse: *U01 code: D04 requiredAccreditationLevel: 9 + requiredCraneMan : false location5: &location5 !location @@ -130,6 +138,7 @@ warehouse: *U02 code: F01 requiredAccreditationLevel: 0 + requiredCraneMan : false location6: &location6 !location @@ -137,6 +146,7 @@ warehouse: *U02 code: G02 requiredAccreditationLevel: 0 + requiredCraneMan : false location7: &location7 !location @@ -144,6 +154,7 @@ warehouse: *U02 code: H03 requiredAccreditationLevel: 9 + requiredCraneMan : false location8: &location8 !location @@ -151,6 +162,7 @@ warehouse: *U04 code: A010 requiredAccreditationLevel: 0 + requiredCraneMan : false location9: &location9 !location @@ -158,6 +170,7 @@ warehouse: *SOM code: B10 requiredAccreditationLevel: 0 + requiredCraneMan : false location10: &location10 !location @@ -165,6 +178,7 @@ warehouse: *SOM code: B24 requiredAccreditationLevel: 0 + requiredCraneMan : false location11: &location11 !location @@ -172,6 +186,7 @@ warehouse: *SOM code: B77 requiredAccreditationLevel: 0 + requiredCraneMan : false location12: &location12 !location @@ -179,6 +194,7 @@ warehouse: *SOM code: C12 requiredAccreditationLevel: 0 + requiredCraneMan : false location13: &location13 !location @@ -186,6 +202,7 @@ warehouse: *U01 code: REC requiredAccreditationLevel: 0 + requiredCraneMan : false location14: &location14 !location @@ -193,6 +210,7 @@ warehouse: *B01 code: SANS requiredAccreditationLevel: 0 + requiredCraneMan : false locationRecU01: &locationRecU01 !location @@ -200,6 +218,7 @@ warehouse: *U01 code: REC requiredAccreditationLevel: 0 + requiredCraneMan : false locationRecU02: &locationRecU02 !location @@ -207,6 +226,7 @@ warehouse: *U02 code: REC requiredAccreditationLevel: 0 + requiredCraneMan : false locationRecU03: &locationRecU03 !location @@ -214,6 +234,7 @@ warehouse: *U03 code: REC requiredAccreditationLevel: 0 + requiredCraneMan : false locationRecU04: &locationRecU04 !location @@ -221,6 +242,7 @@ warehouse: *U04 code: REC requiredAccreditationLevel: 0 + requiredCraneMan : false locationRecSOM: &locationRecSOM !location @@ -228,6 +250,7 @@ warehouse: *SOM code: REC requiredAccreditationLevel: 0 + requiredCraneMan : false locationRecB01: &locationRecB01 !location @@ -235,6 +258,7 @@ warehouse: *B01 code: REC requiredAccreditationLevel: 0 + requiredCraneMan : false locations: - *location1 Modified: trunk/magalie-services/src/main/resources/fixtures2.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-05-16 08:40:46 UTC (rev 155) +++ trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-05-16 10:05:24 UTC (rev 156) @@ -4,6 +4,7 @@ login: ale name: Alexandre accreditationLevel: 9 + craneMan: true basile: &basile !user @@ -11,6 +12,7 @@ login: bas name: Basile accreditationLevel: 0 + craneMan: false cathy: &cathy !user @@ -18,6 +20,7 @@ login: cat name: Cathy accreditationLevel: 9 + craneMan: false david: &david !user @@ -25,6 +28,7 @@ login: dav name: David accreditationLevel: 0 + craneMan: false users: - *alexandre @@ -96,6 +100,7 @@ warehouse: *U01 code: A1 requiredAccreditationLevel: 0 + requiredCraneMan: false location2: &location2 !location @@ -103,6 +108,7 @@ warehouse: *U01 code: B2 requiredAccreditationLevel: 9 + requiredCraneMan: false location3: &location3 !location @@ -110,6 +116,7 @@ warehouse: *U01 code: C3 requiredAccreditationLevel: 0 + requiredCraneMan: false location4: &location4 !location @@ -117,6 +124,7 @@ warehouse: *U01 code: D4 requiredAccreditationLevel: 9 + requiredCraneMan: false location5: &location5 !location @@ -124,13 +132,23 @@ warehouse: *U02 code: A1 requiredAccreditationLevel: 0 + requiredCraneMan: false +location6: + &location6 !location + id: location6 + warehouse: *U02 + code: A2 + requiredAccreditationLevel: 0 + requiredCraneMan: true + locations: - *location1 - *location2 - *location3 - *location4 - *location5 + - *location6 supplier1: &supplier1 !supplier @@ -174,10 +192,19 @@ description: magic powder fixedLocationsFirst: false +article4: + &article4 !article + id: article4 + code: 444444444 + unit: g + description: lutins malins + fixedLocationsFirst: false + articles: - *article1 - *article2 - *article3 + - *article4 kanban1: &kanban1 !kanban @@ -230,12 +257,21 @@ location: *location4 quantity: 1000 +storedArticle5: + &storedArticle5 !stored-article + id: storedArticle5 + article: *article4 + location: *location6 + quantity: 1000 + storedArticles: - *storedArticle1 - *storedArticle2 - *storedArticle3 - *storedArticle4 + - *storedArticle5 + storedArticlesForArticle1: - *storedArticle1 - *storedArticle2 Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.java 2013-05-16 08:40:46 UTC (rev 155) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.java 2013-05-16 10:05:24 UTC (rev 156) @@ -138,6 +138,38 @@ } @Test + public void testThrowRequiredCraneManLicenceException() throws Exception { + + MagalieUser basile = fixture("basile"); + Article article = fixture("article4"); + + BookArticleRequest bookArticleRequest = new BookArticleRequest(basile, building, article, 70., destinationLocation, false); + + BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); + + Assert.assertFalse(bookArticleResult.isSuccess()); + Assert.assertTrue(bookArticleResult.isArticleInaccessible()); + Assert.assertFalse(bookArticleResult.isArticleUnavailable()); + + } + + @Test + public void testWithCraneManWithLocationRequiredCraneMan() throws Exception { + + MagalieUser basile = fixture("alexandre"); + Article article = fixture("article4"); + + BookArticleRequest bookArticleRequest = new BookArticleRequest(basile, building, article, 70., destinationLocation, false); + + BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); + + Assert.assertTrue(bookArticleResult.isSuccess()); + Assert.assertFalse(bookArticleResult.isArticleInaccessible()); + Assert.assertFalse(bookArticleResult.isArticleUnavailable()); + + } + + @Test public void testWithdrawArticleConsiderAlreadyRemovedItem() throws Exception { MagalieUser alexandre = fixture("alexandre");

1 0