From 3991e79c098fcf6851582d767b13ba4d0e235ccf Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Mon, 16 Aug 2010 17:43:36 +0200 Subject: [PATCH] ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #593] Adding option to go to resources load of an order from company view. --- .../planner/tabs/IGlobalViewEntryPoints.java | 2 ++ .../tabs/MultipleTabsPlannerController.java | 6 ++++ .../web/planner/tabs/PlanningTabCreator.java | 34 +++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/IGlobalViewEntryPoints.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/IGlobalViewEntryPoints.java index 44fb6ad34..8738a2290 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/IGlobalViewEntryPoints.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/IGlobalViewEntryPoints.java @@ -53,4 +53,6 @@ public interface IGlobalViewEntryPoints { void goToOrderDetails(Order order); + void goToResourcesLoad(Order order); + } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java index 287b75da2..8888f6ddf 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java @@ -408,4 +408,10 @@ public class MultipleTabsPlannerController implements Composer, getTabsRegistry().show(ordersTab); } + @Override + public void goToResourcesLoad(Order order) { + mode.goToOrderMode(order); + getTabsRegistry().show(resourceLoadTab); + } + } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java index b713d9db2..afc3ebd9e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java @@ -112,6 +112,8 @@ public class PlanningTabCreator { commands.add(scheduleCommand); ICommandOnTask orderDetailsCommand = buildOrderDetailsCommand(); commands.add(orderDetailsCommand); + ICommandOnTask resourcesLoadCommand = buildResourcesLoadCommand(); + commands.add(resourcesLoadCommand); companyPlanningController.setAdditional(commands); companyPlanningController.setTabsController(tabsController); @@ -189,6 +191,38 @@ public class PlanningTabCreator { }; } + private ICommandOnTask buildResourcesLoadCommand() { + return new ICommandOnTask() { + + @Override + public void doAction( + IContextWithPlannerTask context, + TaskElement task) { + OrderElement orderElement = task.getOrderElement(); + if (orderElement instanceof Order) { + Order order = (Order) orderElement; + mode.goToOrderMode(order); + tabsController.goToResourcesLoad(order); + } + } + + @Override + public String getName() { + return _("Resources Load"); + } + + @Override + public String getIcon() { + return null; + } + + @Override + public boolean isApplicableTo(TaskElement task) { + return true; + } + }; + } + }; return new CreatedOnDemandTab(_("Projects Planning"), "company-scheduling",