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

[Bug #975] Use stretchesPlusConsolidated for drawing Graph

Browse source 
FEA: ItEr74S04BugFixing
This commit is contained in:
Diego Pino Garcia 2011-05-04 12:27:42 +02:00
parent 3cc1718288
commit 6aa602be5f
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/GraphicForStreches.java
View file

@ -55,26 +55,27 @@ public abstract class GraphicForStreches implements IGraphicGenerator {
@Override
public XYModel getAccumulatedHoursChartData(
IStretchesFunctionModel stretchesFunctionModel) {
List<Stretch> stretches = stretchesFunctionModel.getStretches();
List<Stretch> stretches = stretchesFunctionModel.getStretchesPlusConsolidated();
if (stretches.isEmpty()) {
return new SimpleXYModel();
} else {
return getAccumulatedHoursChartData(stretches,
stretchesFunctionModel.getTaskStartDate(), new BigDecimal(
stretchesFunctionModel.getAllocationHours()));
}
return getAccumulatedHoursChartData(stretches,
stretchesFunctionModel.getTaskStartDate(), new BigDecimal(
stretchesFunctionModel.getAllocationHours()));
}
@Override
public XYModel getDedicationChart(
IStretchesFunctionModel stretchesFunctionModel) {
List<Stretch> stretches = stretchesFunctionModel.getStretches();
List<Stretch> stretches = stretchesFunctionModel
.getStretchesPlusConsolidated();
if (stretches.isEmpty()) {
return new SimpleXYModel();
}
return getDedicationChart(stretches, stretchesFunctionModel
.getTaskStartDate(), new BigDecimal(stretchesFunctionModel
.getAllocationHours()), stretchesFunctionModel.getTaskCalendar());
return getDedicationChart(stretches,
stretchesFunctionModel.getTaskStartDate(),
new BigDecimal(stretchesFunctionModel.getAllocationHours()),
stretchesFunctionModel.getTaskCalendar());
}
protected abstract XYModel getDedicationChart(List<Stretch> stretches,
@ -161,8 +162,8 @@ public abstract class GraphicForStreches implements IGraphicGenerator {
@Override
public boolean areChartsEnabled(IStretchesFunctionModel model) {
return canComputeChartFrom(model.getAllStretches(), model
.getTaskStartDate());
return canComputeChartFrom(model.getStretchesPlusConsolidated(),
model.getTaskStartDate());
}
@Override