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

[Bug #1269] Fix tooltip text using now configured progress type

Browse source 
FEA: ItEr75S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2011-11-17 17:54:28 +01:00
parent 4edfd0f2ab
commit cd9c71d18e
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
View file

@ -575,19 +575,7 @@ public class TaskElementAdapter {
@Override
public GanttDate getAdvanceEndDate() {
BigDecimal advancePercentage = BigDecimal.ZERO;
if (taskElement.getOrderElement() != null) {
if (isTaskRoot(taskElement)) {
ProgressType progressType = getProgressTypeFromConfiguration();
advancePercentage = taskElement
.getAdvancePercentage(progressType);
} else {
advancePercentage = taskElement.getAdvancePercentage();
}
}
return getAdvanceEndDate(advancePercentage);
return getAdvanceEndDate(getAdvancePercentage());
}
private boolean isTaskRoot(TaskElement taskElement) {
@ -887,14 +875,21 @@ public class TaskElementAdapter {
@Override
public BigDecimal getAdvancePercentage() {
if (taskElement != null) {
return taskElement.getAdvancePercentage();
BigDecimal advancePercentage;
if (isTaskRoot(taskElement)) {
ProgressType progressType = getProgressTypeFromConfiguration();
advancePercentage = taskElement
.getAdvancePercentage(progressType);
} else {
advancePercentage = taskElement.getAdvancePercentage();
}
return advancePercentage;
}
return new BigDecimal(0);
}
private String buildTooltipText() {
return buildTooltipText(asPercentage(taskElement
.getAdvancePercentage()));
return buildTooltipText(asPercentage(getAdvancePercentage()));
}
private BigDecimal asPercentage(BigDecimal value) {