|
|
|
@ -107,7 +107,7 @@ public class AccountingDaoImpl implements AccountingDao{
|
|
|
|
|
String category=entry.getGroup();
|
|
|
|
|
|
|
|
|
|
// Report 1 series for selected Scope
|
|
|
|
|
reports.add(new ReportElement(desc.getName()+" "+yLabel,category,
|
|
|
|
|
reports.add(new ReportElement(desc.getName()+(desc.hasChildren()?" Aggregated ":" ")+yLabel,category,
|
|
|
|
|
xLabel,yLabel,new Series[]{getSeries(queries, from, to, entry, desc, resolution, timeSlices)}));
|
|
|
|
|
|
|
|
|
|
// Report 2 series for each children
|
|
|
|
@ -116,7 +116,7 @@ public class AccountingDaoImpl implements AccountingDao{
|
|
|
|
|
for(ScopeDescriptor child:desc.getChildren()){
|
|
|
|
|
childrenSeries.add(getSeries(queries, from, to, entry, child, resolution, timeSlices));
|
|
|
|
|
}
|
|
|
|
|
reports.add(new ReportElement(desc.getName()+" children "+yLabel,category,
|
|
|
|
|
reports.add(new ReportElement(desc.getName()+" Detailed "+yLabel,category,
|
|
|
|
|
xLabel,yLabel,childrenSeries.toArray(new Series[childrenSeries.size()])));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|