From 1d51b8a0a417baa846c0bc31d3729dfdd4498c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 12 Jan 2010 12:06:23 +0100 Subject: [PATCH] ItEr43S09ImplantacionAplicacionItEr42S13: Instead of invalidating all task, only the resources text is updated. The method to trigger this update is renamed to reflect the new meaning. --- .../java/org/zkoss/ganttz/TaskComponent.java | 16 ++++----- .../main/java/org/zkoss/ganttz/data/Task.java | 22 ++++++------- .../main/resources/web/js/ganttz/tasklist.js | 33 +++++++------------ .../allocation/ResourceAllocationModel.java | 2 +- 4 files changed, 30 insertions(+), 43 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java index 0955ab037..f80971bef 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java @@ -34,7 +34,7 @@ import org.zkoss.ganttz.adapters.IDisabilityConfiguration; import org.zkoss.ganttz.data.Milestone; import org.zkoss.ganttz.data.Task; import org.zkoss.ganttz.data.TaskContainer; -import org.zkoss.ganttz.data.Task.IReloadComponentRequested; +import org.zkoss.ganttz.data.Task.IReloadResourcesTextRequested; import org.zkoss.ganttz.data.constraint.Constraint; import org.zkoss.ganttz.data.constraint.Constraint.IConstraintViolationListener; import org.zkoss.lang.Objects; @@ -176,7 +176,7 @@ public class TaskComponent extends Div implements AfterCompose { return asTaskComponent(task, taskList, true); } - private IReloadComponentRequested reloadComponentRequested; + private IReloadResourcesTextRequested reloadResourcesTextRequested; public TaskComponent(Task task, IDisabilityConfiguration disabilityConfiguration) { @@ -195,16 +195,14 @@ public class TaskComponent extends Div implements AfterCompose { } }; this.task.addConstraintViolationListener(taskViolationListener); - reloadComponentRequested = new IReloadComponentRequested() { + reloadResourcesTextRequested = new IReloadResourcesTextRequested() { @Override - public void reloadComponentRequested() { - // TODO can't call to invalidate because the task was - // disappearing. Fix the problem and just invalidate this task - getParent().invalidate(); + public void reloadResourcesTextRequested() { + smartUpdate("resourcesText", getResourcesText()); } }; - this.task.addReloadListener(reloadComponentRequested); + this.task.addReloadListener(reloadResourcesTextRequested); } protected String calculateClass() { @@ -454,7 +452,7 @@ public class TaskComponent extends Div implements AfterCompose { protected void remove() { this.detach(); - task.removeReloadListener(reloadComponentRequested); + task.removeReloadListener(reloadResourcesTextRequested); } public boolean isTopLevel() { diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java index 91b88756e..0e2b1d9b3 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java @@ -40,11 +40,11 @@ import org.zkoss.ganttz.util.ConstraintViolationNotificator; */ public abstract class Task implements ITaskFundamentalProperties { - public interface IReloadComponentRequested { - public void reloadComponentRequested(); + public interface IReloadResourcesTextRequested { + public void reloadResourcesTextRequested(); } - private List reloadRequestedListeners = new ArrayList(); + private List reloadRequestedListeners = new ArrayList(); private PropertyChangeSupport fundamentalPropertiesListeners = new PropertyChangeSupport( this); @@ -280,19 +280,19 @@ public abstract class Task implements ITaskFundamentalProperties { } public void addReloadListener( - IReloadComponentRequested reloadComponentRequested) { - Validate.notNull(reloadComponentRequested); - this.reloadRequestedListeners.add(reloadComponentRequested); + IReloadResourcesTextRequested reloadResourcesTextRequested) { + Validate.notNull(reloadResourcesTextRequested); + this.reloadRequestedListeners.add(reloadResourcesTextRequested); } public void removeReloadListener( - IReloadComponentRequested reloadComponentRequested) { - this.reloadRequestedListeners.remove(reloadComponentRequested); + IReloadResourcesTextRequested reloadResourcesTextRequested) { + this.reloadRequestedListeners.remove(reloadResourcesTextRequested); } - public void reloadComponent() { - for (IReloadComponentRequested each : reloadRequestedListeners) { - each.reloadComponentRequested(); + public void reloadResourcesText() { + for (IReloadResourcesTextRequested each : reloadRequestedListeners) { + each.reloadResourcesTextRequested(); } } diff --git a/ganttzk/src/main/resources/web/js/ganttz/tasklist.js b/ganttzk/src/main/resources/web/js/ganttz/tasklist.js index 4715dea77..0cec7d558 100644 --- a/ganttzk/src/main/resources/web/js/ganttz/tasklist.js +++ b/ganttzk/src/main/resources/web/js/ganttz/tasklist.js @@ -423,17 +423,17 @@ zkTask.setClass = function(cmp, newclass) { cmp.className = newclass; }; -zkTask.setAttr = function(cmp, nm, val) { - - switch (nm) { - - case "style.top": - case "style.width": - case "style.left": { - zkau.setAttr(cmp, nm, val); - return true; - } - +zkTask.setAttr = function(cmp, name, val) { + switch (name) { + case "resourcesText":{ + var resourcesTextElement = YAHOO.util.Selector.query( + '.task-resources .task-resources-inner', cmp, true); + resourcesTextElement.innerHTML = val; + return true; + } + default: { + return false; + } } }; @@ -448,17 +448,6 @@ zkTask.next = function(elem) { return elem; } - -zkTask.setAttr = function(cmp, name, value) { - // Obsolete as far as tasks will not show name inside - // if ("name" == name) { - // var span = YAHOO.util.Selector.query("span", cmp, true); - // span.innerHTML = value; - // return true; - // } - return false; -} - zkTask.addRelatedDependency = function(cmp, dependency) { if (!cmp['relatedDependencies']) { cmp.relatedDependencies = []; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java index ef8383267..ec4bd6385 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java @@ -206,7 +206,7 @@ public class ResourceAllocationModel implements IResourceAllocationModel { allocationResult.applyTo(task); ganttTask.fireChangesForPreviousValues(previousStartDate, previousLength); - ganttTask.reloadComponent(); + ganttTask.reloadResourcesText(); context.reloadCharts(); }