diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java index 6bec0071a..c1b7fe390 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java @@ -371,4 +371,8 @@ public class TaskComponent extends Div implements AfterCompose { return isTopLevel; } + public String getTooltipText() { + return task.getTooltipText(); + } + } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java index e3c9fbc35..104824c34 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java @@ -20,6 +20,7 @@ package org.zkoss.ganttz.data; +import java.math.BigDecimal; import java.util.Date; /** @@ -39,19 +40,29 @@ public class DefaultFundamentalProperties implements ITaskFundamentalProperties private Date advanceEndDate; + private BigDecimal hoursAdvancePercentage; + + private BigDecimal advancePercentage; + + private String tooltipText; + public DefaultFundamentalProperties() { } public DefaultFundamentalProperties(String name, Date beginDate, long lengthMilliseconds, String notes, - Date hoursAdvancePercentage, - Date advancePercentage) { + Date hoursAdvanceEndDate, + Date advanceEndDate, + BigDecimal hoursAdvancePercentage, BigDecimal advancePercentage) { this.name = name; this.beginDate = beginDate; this.lengthMilliseconds = lengthMilliseconds; this.notes = notes; - this.hoursAdvanceEndDate = hoursAdvancePercentage; - this.advanceEndDate = advancePercentage; + this.hoursAdvanceEndDate = hoursAdvanceEndDate; + this.advanceEndDate = advanceEndDate; + this.hoursAdvancePercentage = hoursAdvancePercentage; + this.advancePercentage = advancePercentage; + this.tooltipText = "Default tooltip"; } public String getName() { @@ -99,5 +110,19 @@ public class DefaultFundamentalProperties implements ITaskFundamentalProperties public Date getAdvanceEndDate() { return advanceEndDate; } + @Override + public BigDecimal getHoursAdvancePercentage() { + return hoursAdvancePercentage; + } + + @Override + public BigDecimal getAdvancePercentage() { + return advancePercentage; + + + @Override + public String getTooltipText() { + return tooltipText; + } } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java index 49e44db57..f0490b83a 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java @@ -47,4 +47,6 @@ public interface ITaskFundamentalProperties { public Date getAdvanceEndDate(); + public String getTooltipText(); + } 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 c0383bf4e..ff73ee060 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java @@ -168,4 +168,8 @@ public abstract class Task implements ITaskFundamentalProperties { return fundamentalProperties.getAdvanceEndDate(); } + public String getTooltipText() { + return fundamentalProperties.getTooltipText(); + } + } diff --git a/ganttzk/src/main/resources/web/ganttz/task.dsp b/ganttzk/src/main/resources/web/ganttz/task.dsp index 4b25e19c2..017dfee98 100644 --- a/ganttzk/src/main/resources/web/ganttz/task.dsp +++ b/ganttzk/src/main/resources/web/ganttz/task.dsp @@ -32,6 +32,6 @@ onMouseOut="zkTasklist.hideTooltip('tasktooltip${self.uuid}');">
-