From 0de6106f867ebd7a09086fede9db30cdaa19c0f6 Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Tue, 6 Oct 2009 19:46:15 +0200 Subject: [PATCH] ItEr29S08CUCreacionProxectoPlanificacionItEr28S09: Reinclude getPercentage methods to show numeric advance in tooltip --- .../web/planner/DataForPlanner.java | 4 +++- .../data/DefaultFundamentalProperties.java | 2 +- .../data/ITaskFundamentalProperties.java | 5 +++++ .../main/java/org/zkoss/ganttz/data/Task.java | 11 +++++++++++ .../web/planner/DataForPlanner.java | 4 +++- .../web/planner/TaskElementAdapter.java | 19 +++++++++++++++++++ 6 files changed, 42 insertions(+), 3 deletions(-) diff --git a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java index 3f3ec13d7..b1268ba63 100644 --- a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java +++ b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java @@ -22,6 +22,7 @@ package org.navalplanner.web.planner; import static org.navalplanner.web.I18nHelper._; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -193,7 +194,8 @@ public class DataForPlanner { private DefaultFundamentalProperties createTask(String name, Date now, Date end) { return new DefaultFundamentalProperties(name, end, end.getTime() - - now.getTime(), "bla", now, now); + - now.getTime(), _("bla"), now, now, new BigDecimal(0.25), + new BigDecimal(0.5)); } private void addNewTask(IContext context) { 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 104824c34..5fef0a10b 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java @@ -118,7 +118,7 @@ public class DefaultFundamentalProperties implements ITaskFundamentalProperties @Override public BigDecimal getAdvancePercentage() { return advancePercentage; - + } @Override public String getTooltipText() { 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 f0490b83a..787c2d398 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java @@ -20,6 +20,7 @@ package org.zkoss.ganttz.data; +import java.math.BigDecimal; import java.util.Date; /** @@ -47,6 +48,10 @@ public interface ITaskFundamentalProperties { public Date getAdvanceEndDate(); + public BigDecimal getHoursAdvancePercentage(); + + public BigDecimal getAdvancePercentage(); + 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 ff73ee060..58dab6ad5 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java @@ -22,6 +22,7 @@ package org.zkoss.ganttz.data; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -158,6 +159,16 @@ public abstract class Task implements ITaskFundamentalProperties { setVisible(false); } + @Override + public BigDecimal getHoursAdvancePercentage() { + return fundamentalProperties.getHoursAdvancePercentage(); + } + + @Override + public BigDecimal getAdvancePercentage() { + return fundamentalProperties.getAdvancePercentage(); + } + @Override public Date getHoursAdvanceEndDate() { return fundamentalProperties.getHoursAdvanceEndDate(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java index 138eeb170..43de9e3e6 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java @@ -22,6 +22,7 @@ package org.navalplanner.web.planner; import static org.navalplanner.web.I18nHelper._; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -369,7 +370,8 @@ public class DataForPlanner { private DefaultFundamentalProperties createTask(String name, Date now, Date end) { return new DefaultFundamentalProperties(name, end, end.getTime() - - now.getTime(), _("bla"), now, now); + - now.getTime(), _("bla"), now, now, new BigDecimal(0.25), + new BigDecimal(0.5)); } private void addNewTask(IContext context) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java index f0d1a0e35..be544cec3 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java @@ -144,6 +144,12 @@ public class TaskElementAdapter implements ITaskElementAdapter { return date.toDateTimeAtStartOfDay().toDate(); } + @Override + public BigDecimal getHoursAdvancePercentage() { + OrderElement orderElement = taskElement.getOrderElement(); + return orderElementDAO.getHoursAdvancePercentage(orderElement); + } + @Override public Date getAdvanceEndDate() { OrderElement orderElement = taskElement.getOrderElement(); @@ -161,6 +167,11 @@ public class TaskElementAdapter implements ITaskElementAdapter { return date.toDateTimeAtStartOfDay().toDate(); } + @Override + public BigDecimal getAdvancePercentage() { + return taskElement.getOrderElement().getAdvancePercentage(); + } + private LocalDate calculateLimitDate(Integer hours) { boolean limitReached = false; @@ -196,6 +207,14 @@ public class TaskElementAdapter implements ITaskElementAdapter { return lastDay.plusDays(1); } + @Override + public String getTooltipText() { + + return "Advance percentage : " + getAdvancePercentage().multiply(new BigDecimal(100)).toString() + + "% \n" + "Hours advance percentage : " + + getHoursAdvancePercentage().multiply(new BigDecimal(100)).toString() + "%"; + } + } @Override