Author: bleny Date: 2013-04-17 12:35:44 +0200 (Wed, 17 Apr 2013) New Revision: 104 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: introduce current activity in session to redirect user Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/Activity.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/Activity.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/Activity.java (rev 0) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/Activity.java 2013-04-17 10:35:44 UTC (rev 104) @@ -0,0 +1,14 @@ +package com.franciaflex.magalie.web; + +/** + * Current activity of the user. May be used for redirection since a user + * keep doing the same thing until manually declare otherwise. + * + * @author bleny + */ +public enum Activity { + + REQUESTED_LISTS, + KANBANS + +} Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-04-17 10:27:04 UTC (rev 103) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-04-17 10:35:44 UTC (rev 104) @@ -26,6 +26,8 @@ protected Warehouse lastUsedDestinationWarehouseForKanbans; + protected Activity activity; + protected Collection<String> messages; public MagalieUser getMagalieUser() { @@ -63,4 +65,12 @@ getMessages().add(message); } + public Activity getActivity() { + return activity; + } + + public void setActivity(Activity activity) { + this.activity = activity; + } + } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-04-17 10:27:04 UTC (rev 103) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-04-17 10:35:44 UTC (rev 104) @@ -6,6 +6,7 @@ import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; import com.franciaflex.magalie.services.service.FindOrderToExecuteResult; import com.franciaflex.magalie.services.service.RequestedArticleService; +import com.franciaflex.magalie.web.Activity; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; import org.apache.commons.logging.Log; @@ -37,6 +38,8 @@ @Override public String execute() { + session.setActivity(Activity.REQUESTED_LISTS); + MagalieUser magalieUser = session.getMagalieUser(); Building building = session.getBuilding(); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-04-17 10:27:04 UTC (rev 103) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/FulfilKanbanAction.java 2013-04-17 10:35:44 UTC (rev 104) @@ -7,6 +7,7 @@ import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; import com.franciaflex.magalie.services.service.BookArticleResult; import com.franciaflex.magalie.services.service.FulfilKanbanService; +import com.franciaflex.magalie.web.Activity; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; import org.apache.commons.logging.Log; @@ -45,8 +46,10 @@ } @Override - public String input() throws Exception { + public String input() { + session.setActivity(Activity.KANBANS); + Building building = session.getBuilding(); destinationWarehouses = service.getDestinationWarehouses(building); @@ -84,6 +87,8 @@ @Override public String execute() { + session.setActivity(Activity.KANBANS); + if (log.isDebugEnabled()) { log.debug("article barcode is " + articleBarcode); } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-04-17 10:27:04 UTC (rev 103) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-04-17 10:35:44 UTC (rev 104) @@ -42,7 +42,8 @@ import java.util.Map; @Results({ - @Result(name="success", type="redirectAction", params = { "actionName", "report" }) + @Result(name="KANBANS", type="redirectAction", params = { "actionName", "fulfil-kanban!input" }), + @Result(name="REQUESTED_LISTS", type="redirectAction", params = { "actionName", "deliver-requested-article!input" }) }) public class WithdrawItemAction extends MagalieActionSupport { @@ -119,7 +120,9 @@ service.confirmStorageMovement(confirmation, magalieUser); - return SUCCESS; + String resultName = session.getActivity().name(); + return resultName; + } }