From aa68949061cee0aae706d5fedce9500ac54f006f Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 1 Oct 2009 13:09:09 +0200 Subject: [PATCH] ItEr28S14RFVistaGraficaInformacionAvance: Showing basic info about hours advance at planner. --- .../org/navalplanner/web/planner/DataForPlanner.java | 3 ++- .../main/java/org/zkoss/ganttz/TaskComponent.java | 8 ++++++-- .../ganttz/data/DefaultFundamentalProperties.java | 11 ++++++++++- .../ganttz/data/ITaskFundamentalProperties.java | 4 +++- .../src/main/java/org/zkoss/ganttz/data/Task.java | 7 ++++++- ganttzk/src/main/resources/web/js/ganttz/tasklist.js | 6 ++++++ .../org/navalplanner/web/planner/DataForPlanner.java | 3 ++- .../navalplanner/web/planner/TaskElementAdapter.java | 12 ++++++++++++ 8 files changed, 47 insertions(+), 7 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 fe2a4d9bd..06a572654 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 @@ -183,7 +183,8 @@ public class DataForPlanner { private DefaultFundamentalProperties createTask(String name, Date now, Date end) { return new DefaultFundamentalProperties(name, end, end.getTime() - - now.getTime(), "bla", new BigDecimal(0.5)); + - now.getTime(), "bla", new BigDecimal(0.25), new BigDecimal( + 0.5)); } private void addNewTask(IContext context) { diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java index 40456a7ad..f9ba057d8 100755 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java @@ -296,10 +296,14 @@ public class TaskComponent extends Div implements AfterCompose { } private void updateCompletion() { + BigDecimal hoursAdvancePercentage = task.getHoursAdvancePercentage() + .multiply(new BigDecimal(100)); + response(null, new AuInvoke(this, "resizeCompletionAdvance", + hoursAdvancePercentage.intValue() + "%")); + BigDecimal advancePercentage = task.getAdvancePercentage().multiply( new BigDecimal(100)); - - response(null, new AuInvoke(this, "resizeCompletionAdvance", + response(null, new AuInvoke(this, "resizeCompletion2Advance", advancePercentage.intValue() + "%")); } 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 714183654..e25433c53 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java @@ -16,17 +16,21 @@ public class DefaultFundamentalProperties implements ITaskFundamentalProperties private String notes; + private BigDecimal hoursAdvancePercentage; + private BigDecimal advancePercentage; public DefaultFundamentalProperties() { } public DefaultFundamentalProperties(String name, Date beginDate, - long lengthMilliseconds, String notes, BigDecimal advancePercentage) { + long lengthMilliseconds, String notes, + BigDecimal hoursAdvancePercentage, BigDecimal advancePercentage) { this.name = name; this.beginDate = beginDate; this.lengthMilliseconds = lengthMilliseconds; this.notes = notes; + this.hoursAdvancePercentage = hoursAdvancePercentage; this.advancePercentage = advancePercentage; } @@ -66,6 +70,11 @@ public class DefaultFundamentalProperties implements ITaskFundamentalProperties this.notes = notes; } + @Override + public BigDecimal getHoursAdvancePercentage() { + return hoursAdvancePercentage; + } + @Override public BigDecimal getAdvancePercentage() { return advancePercentage; 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 10bcc1c48..066847915 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java @@ -24,6 +24,8 @@ public interface ITaskFundamentalProperties { public void setNotes(String notes); + public BigDecimal getHoursAdvancePercentage(); + public BigDecimal getAdvancePercentage(); -} \ No newline at end of file +} 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 05250c88b..470aa1b02 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java @@ -139,9 +139,14 @@ public abstract class Task implements ITaskFundamentalProperties { setVisible(false); } + @Override + public BigDecimal getHoursAdvancePercentage() { + return fundamentalProperties.getHoursAdvancePercentage(); + } + @Override public BigDecimal getAdvancePercentage() { return fundamentalProperties.getAdvancePercentage(); } -} \ No newline at end of file +} diff --git a/ganttzk/src/main/resources/web/js/ganttz/tasklist.js b/ganttzk/src/main/resources/web/js/ganttz/tasklist.js index 7c240147b..a61c523b8 100644 --- a/ganttzk/src/main/resources/web/js/ganttz/tasklist.js +++ b/ganttzk/src/main/resources/web/js/ganttz/tasklist.js @@ -406,6 +406,11 @@ zkTask.getElementsByAttribute = function(oElm, strTagName, strAttributeName, } zkTask.resizeCompletionAdvance = function(cmp, width) { + var completionDiv = YAHOO.util.Selector.query('.completion', cmp, true); + completionDiv["style"].width = width; +} + +zkTask.resizeCompletion2Advance = function(cmp, width) { var completionDiv = YAHOO.util.Selector.query('.completion2', cmp, true); completionDiv["style"].width = width; } @@ -538,6 +543,7 @@ zkTaskContainer.setClass = function(cmp, newclass) { }; zkTaskContainer.resizeCompletionAdvance = zkTask.resizeCompletionAdvance; +zkTaskContainer.resizeCompletion2Advance = zkTask.resizeCompletion2Advance; /* We will not allow taskcontainer move or resize untill its behaviour its * clearly specified 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 5e239c44d..4a42172a0 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 @@ -351,7 +351,8 @@ public class DataForPlanner { private DefaultFundamentalProperties createTask(String name, Date now, Date end) { return new DefaultFundamentalProperties(name, end, end.getTime() - - now.getTime(), _("bla"), new BigDecimal(0.5)); + - now.getTime(), _("bla"), 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 6adb000e0..01dc9dcfa 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 @@ -8,10 +8,13 @@ import java.util.Collection; import java.util.Date; import java.util.List; +import org.navalplanner.business.orders.daos.IOrderElementDAO; import org.navalplanner.business.orders.entities.Order; +import org.navalplanner.business.orders.entities.OrderElement; import org.navalplanner.business.planner.entities.Dependency; import org.navalplanner.business.planner.entities.TaskElement; import org.navalplanner.business.planner.entities.Dependency.Type; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; @@ -32,6 +35,9 @@ public class TaskElementAdapter implements ITaskElementAdapter { private Order order; + @Autowired + private IOrderElementDAO orderElementDAO; + @Override public void setOrder(Order order) { this.order = order; @@ -98,6 +104,12 @@ public class TaskElementAdapter implements ITaskElementAdapter { + this.lengthMilliseconds)); } + @Override + public BigDecimal getHoursAdvancePercentage() { + OrderElement orderElement = taskElement.getOrderElement(); + return orderElementDAO.getHoursAdvancePercentage(orderElement); + } + @Override public BigDecimal getAdvancePercentage() { return taskElement.getOrderElement().getAdvancePercentage();