From 181fccc1aab7a0769eeb0f8a884aa4724f2ce1ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 23 Feb 2010 18:50:23 +0100 Subject: [PATCH] ItEr49S10CUVisualizacionResponsabilidadesTRaballoNaPlanificacionItEr48S10: AllocationRow keeps track if it is satisfied or not. --- .../web/planner/allocation/AllocationRow.java | 28 +++++++++++++++++++ .../web/planner/allocation/FormBinder.java | 7 +++++ 2 files changed, 35 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java index 9dcdbede7..b4ccbc299 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java @@ -41,6 +41,7 @@ import org.navalplanner.web.planner.allocation.ResourceAllocationController.Deri import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; +import org.zkoss.zul.Checkbox; import org.zkoss.zul.Constraint; import org.zkoss.zul.Decimalbox; import org.zkoss.zul.Detail; @@ -175,6 +176,8 @@ public abstract class AllocationRow { private Grid derivedAllocationsGrid; + private Checkbox satisfiedCheckbox; + private void initializeResourcesPerDayInput() { resourcesPerDayInput.setConstraint(new SimpleConstraint( SimpleConstraint.NO_NEGATIVE)); @@ -400,4 +403,29 @@ public abstract class AllocationRow { .createRenderer()); } + public boolean isSatisfied() { + if (temporal != null) { + return temporal.isSatisfied(); + } else if (origin != null) { + return origin.isSatisfied(); + } else { + return false; + } + } + + public Checkbox getSatisfiedCheckbox() { + if (satisfiedCheckbox != null) { + satisfiedCheckbox.setChecked(isSatisfied()); + return satisfiedCheckbox; + } + Checkbox result = new Checkbox(); + result.setChecked(isSatisfied()); + result.setDisabled(true); + return satisfiedCheckbox = result; + } + + public void loadSatisfied() { + satisfiedCheckbox.setChecked(isSatisfied()); + } + } 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 c96a827a6..f8b32d88a 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 @@ -366,6 +366,7 @@ public class FormBinder { private void reloadValues() { loadHoursValues(); + loadIsSatisfiedValues(); loadValueForAssignedHoursComponent(); loadValueForTaskStartDateBox(); loadValueForEndDate(); @@ -378,6 +379,12 @@ public class FormBinder { } } + private void loadIsSatisfiedValues() { + for (AllocationRow each : rows) { + each.loadSatisfied(); + } + } + private void loadDerivedAllocations() { for (AllocationRow each : rows) { each.reloadDerivedAllocationsGrid();