Skip to content

Commit

Permalink
Fix aggregation in performance chart view
Browse files Browse the repository at this point in the history
  • Loading branch information
buchen committed Apr 21, 2013
1 parent ed19b39 commit d83b54e
Showing 1 changed file with 7 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -195,16 +195,19 @@ else if (item.getType() == ConsumerPriceIndex.class)
}
else if (item.getType() == Client.class)
{
PerformanceIndex aggregatedIndex = aggregationPeriod != null ? Aggregation.aggregate(index,
aggregationPeriod) : index;

if (item.getInstance() != null)
{
chart.addDateSeries(index.getDates(), //
index.getAccumulatedPercentage(), //
chart.addDateSeries(aggregatedIndex.getDates(), //
aggregatedIndex.getAccumulatedPercentage(), //
Colors.IRR, Messages.PerformanceChartLabelAccumulatedIRR);
}
else
{
IBarSeries barSeries = chart.addDateBarSeries(index.getDates(), //
index.getDeltaPercentage(), //
IBarSeries barSeries = chart.addDateBarSeries(aggregatedIndex.getDates(), //
aggregatedIndex.getDeltaPercentage(), //
aggregationPeriod != null ? aggregationPeriod.toString()
: Messages.LabelAggregationDaily);
barSeries.setBarPadding(50);
Expand Down

0 comments on commit d83b54e

Please sign in to comment.