From 39ca0a1321f23d849847f2e17139809fdaa0ee33 Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Mon, 26 Apr 2010 09:45:16 +0200 Subject: [PATCH] ItEr55S11RFAspectosGraficosRecursoLimitantesItEr54S12: Created entry poing and hidden perspective for limiting resources window --- .../org/navalplanner/web/common/CustomMenuController.java | 3 ++- .../web/planner/tabs/IGlobalViewEntryPoints.java | 3 +++ .../web/planner/tabs/MultipleTabsPlannerController.java | 5 +++++ .../src/main/webapp/common/css/navalplan_zk.css | 4 ++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java index 14a34dff2..528b7c9c9 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java @@ -197,10 +197,11 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { subItem(_("Company view"), "/planner/index.zul;company_scheduling","01-introducion.html"), subItem(_("General resource allocation"),"/planner/index.zul;company_load","01-introducion.html#id1"), subItem(_("Orders list"), "/planner/index.zul;orders_list","01-introducion.html#id2"), + // FIX: Temporary hidden in main menu + // subItem(_("Limiting resources"),"/planner/index.zul;limiting_resources","01-introducion.html"), subItem(_("Templates list"), "/templates/templates.zul", ""), subItem(_("Subcontracted tasks list"), "/subcontract/subcontractedTasks.zul", ""), subItem(_("Report advances"), "/subcontract/reportAdvances.zul", "")); - topItem(_("Resources"), "/resources/worker/worker.zul", "", subItem(_("Workers List"), "/resources/worker/worker.zul","05-recursos.html#xesti-n-de-traballadores"), subItem(_("Machines List"), "/resources/machine/machines.zul","05-recursos.html#xesti-n-de-m-quinas"), 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 bf467254d..307c2dc13 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 @@ -37,6 +37,9 @@ public interface IGlobalViewEntryPoints { @EntryPoint("company_load") public void goToCompanyLoad(); + @EntryPoint("limiting_resources") + public void goToLimitingResources(); + @EntryPoint("orders_list") public void goToOrdersList(); 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 d9847c1f5..f479e2293 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 @@ -393,4 +393,9 @@ public class MultipleTabsPlannerController implements Composer, orderCRUDController.highLight(orderElement); } + @Override + public void goToLimitingResources() { + getTabsRegistry().show(limitingResourcesTab); + } + } diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css index fc6661d22..cce7804b0 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css @@ -1052,6 +1052,10 @@ span.z-dottree-line { .perspective-active.limiting-resources .z-button-cm { background-image: url(../img/ico_order-load.png); } +.perspective.limiting-resources { + /* FIX: Temporary disabled */ + display: none; +} .perspective.order-limiting-resources { display: none; }