RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr29S08CUCreacionProxectoPlanificacionItEr28S09: Reinclude getPercentage methods to show numeric advance in tooltip

Browse source
This commit is contained in:
Lorenzo Tilve 2009-10-06 19:46:15 +02:00 • committed by Javier Moran Rua
parent 12e3412e16
commit 0de6106f86
6 changed files with 42 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java
View file

@ -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<ITaskFundamentalProperties> context) {

2
ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java
View file

@ -118,7 +118,7 @@ public class DefaultFundamentalProperties implements ITaskFundamentalProperties
@Override
public BigDecimal getAdvancePercentage() {
return advancePercentage;
}
@Override
public String getTooltipText() {

5
ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java
View file

@ -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();
}

11
ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java
View file

@ -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();

4
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java
View file

@ -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<ITaskFundamentalProperties> context) {

19
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
View file

@ -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