From a66ff5cc313a820ff976b04bb22be121f53b005a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Thu, 3 Dec 2009 13:43:30 +0100 Subject: [PATCH] ItEr37S08CUCreacionUnidadesPlanificacionItEr36S11: Disabling worker search tab --- .../web/planner/allocation/FormBinder.java | 20 +++++++++++++++++++ .../ResourceAllocationController.java | 3 +++ .../src/main/webapp/planner/order.zul | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java index 691de7f3c..fd8ca2071 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java @@ -55,6 +55,7 @@ import org.zkoss.zul.Constraint; import org.zkoss.zul.Datebox; import org.zkoss.zul.Intbox; import org.zkoss.zul.Listbox; +import org.zkoss.zul.Tab; import org.zkoss.zul.impl.api.InputElement; class FormBinder { @@ -115,6 +116,10 @@ class FormBinder { } }; + private boolean recommendedAllocation = false; + + private Tab workerSearchTab; + public FormBinder( AllocationRowsHandler allocationRowsHandler, IResourceAllocationModel resourceAllocationModel) { @@ -390,6 +395,9 @@ class FormBinder { public void setCheckbox(Checkbox recommendedAllocation) { this.recommendedAllocationCheckbox = recommendedAllocation; + this.recommendedAllocationCheckbox + .setChecked(this.recommendedAllocation); + disableIfNeededWorkerSearchTab(); recommendedCheckboxListener = new EventListener() { @Override @@ -409,10 +417,22 @@ class FormBinder { private void activatingRecommendedAllocation() { allocationRowsHandler.removeAll(); resourceAllocationModel.addDefaultAllocations(); + this.recommendedAllocation = true; + disableIfNeededWorkerSearchTab(); Util.reloadBindings(allocationsList); } private void deactivatingRecommendedAllocation() { + this.recommendedAllocation = false; + disableIfNeededWorkerSearchTab(); + } + + private void disableIfNeededWorkerSearchTab() { + workerSearchTab.setDisabled(this.recommendedAllocation); + } + + public void setWorkerSearchTab(Tab workerSearchTab) { + this.workerSearchTab = workerSearchTab; } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java index e1e097785..c8211fbb5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java @@ -118,6 +118,8 @@ public class ResourceAllocationController extends GenericForwardComposer { private Tab tbResourceAllocation; + private Tab workerSearchTab; + public static void registerNeededScripts() { getScriptsRegister() .register(ScriptsRequiredByAdvancedAllocation.class); @@ -187,6 +189,7 @@ public class ResourceAllocationController extends GenericForwardComposer { formBinder.setApplyButton(applyButton); formBinder.setAllocationsList(allocationsList); formBinder.setMessagesForUser(messagesForUser); + formBinder.setWorkerSearchTab(workerSearchTab); formBinder.setCheckbox(recommendedAllocationCheckbox); CalculationTypeRadio calculationTypeRadio = CalculationTypeRadio .from(formBinder.getCalculatedValue()); diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul index fdae8fb44..69b00a025 100644 --- a/navalplanner-webapp/src/main/webapp/planner/order.zul +++ b/navalplanner-webapp/src/main/webapp/planner/order.zul @@ -88,7 +88,7 @@ - +