Author: bleny Date: 2013-05-27 16:32:50 +0200 (Mon, 27 May 2013) New Revision: 198 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refs #2167 redirect user after reception Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/Activity.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-05-27 11:34:33 UTC (rev 197) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/StoredArticleDao.java 2013-05-27 14:32:50 UTC (rev 198) @@ -36,4 +36,7 @@ List<StoredArticle> findAllReceivedForAllSupplier(Building building); List<StoredArticle> findAllReceivedForSupplier(Building building, String supplierId); + + StoredArticle findDetachedById(String storedArticleId); + } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-05-27 11:34:33 UTC (rev 197) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/StoredArticleJpaDao.java 2013-05-27 14:32:50 UTC (rev 198) @@ -80,4 +80,11 @@ } return resultList; } + + @Override + public StoredArticle findDetachedById(String storedArticleId) { + StoredArticle storedArticle = findById(storedArticleId); + entityManager.detach(storedArticle); + return storedArticle; + } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-05-27 11:34:33 UTC (rev 197) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-05-27 14:32:50 UTC (rev 198) @@ -329,6 +329,8 @@ } } + // TODO brendan 27/05/13 add extra info about the locations + return storageMovementTask; } 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-27 11:34:33 UTC (rev 197) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-05-27 14:32:50 UTC (rev 198) @@ -124,7 +124,7 @@ persistenceContext.getStoredArticleDao(); StoredArticle storedArticle = - storedArticleDao.findById(storedArticleId); + storedArticleDao.findDetachedById(storedArticleId); StorageMovementDao storageMovementDao = persistenceContext.getStorageMovementDao(); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/Activity.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/Activity.java 2013-05-27 11:34:33 UTC (rev 197) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/Activity.java 2013-05-27 14:32:50 UTC (rev 198) @@ -32,6 +32,8 @@ public enum Activity { REQUESTED_LISTS, - KANBANS + KANBANS, + RECEPTIONS, + PREPARED_RECEPTIONS } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java 2013-05-27 11:34:33 UTC (rev 197) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PrepareArticleReceptionAction.java 2013-05-27 14:32:50 UTC (rev 198) @@ -27,6 +27,7 @@ import com.franciaflex.magalie.persistence.entity.StoredArticle; import com.franciaflex.magalie.services.service.ReceptionService; import com.franciaflex.magalie.services.service.SuppliersToReceive; +import com.franciaflex.magalie.web.Activity; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; @@ -59,6 +60,8 @@ @Override public String input() { + session.setActivity(Activity.PREPARED_RECEPTIONS); + Building building = session.getBuilding(); suppliersToReceive = service.getReceivedSuppliers(building); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java 2013-05-27 11:34:33 UTC (rev 197) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/PreparePreparedArticleReceptionAction.java 2013-05-27 14:32:50 UTC (rev 198) @@ -2,7 +2,9 @@ import com.franciaflex.magalie.persistence.entity.PreparedArticleReception; import com.franciaflex.magalie.services.service.ReceptionService; +import com.franciaflex.magalie.web.Activity; import com.franciaflex.magalie.web.MagalieActionSupport; +import com.franciaflex.magalie.web.MagalieSession; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; @@ -15,6 +17,12 @@ protected String barcode; + protected MagalieSession session; + + public void setSession(MagalieSession session) { + this.session = session; + } + public void setReceptionService(ReceptionService receptionService) { this.receptionService = receptionService; } @@ -26,6 +34,8 @@ @Override public String execute() { + session.setActivity(Activity.PREPARED_RECEPTIONS); + PreparedArticleReception preparedArticleReception = receptionService.getPreparedArticleReception(barcode); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-05-27 11:34:33 UTC (rev 197) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-05-27 14:32:50 UTC (rev 198) @@ -42,7 +42,8 @@ import java.util.Map; @Results({ - @Result(name="success", type="redirectAction", params = { "actionName", "prepare-article-reception!input" }) + @Result(name= "RECEPTIONS", 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 { @@ -130,7 +131,7 @@ service.confirmReception(magalieUser, confirmation); - return SUCCESS; + return session.getActivity().name(); }