Fixes #19603
This commit is contained in:
parent
faaed7ae61
commit
2d5ad6f2a3
2
pom.xml
2
pom.xml
|
@ -8,7 +8,7 @@
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.gcube.accounting</groupId>
|
<groupId>org.gcube.accounting</groupId>
|
||||||
<artifactId>accounting-summary-access</artifactId>
|
<artifactId>accounting-summary-access</artifactId>
|
||||||
<version>1.0.1</version>
|
<version>1.0.2</version>
|
||||||
<name>Accounting Summary Access</name>
|
<name>Accounting Summary Access</name>
|
||||||
<description>Java library for accessing accounting summary data</description>
|
<description>Java library for accessing accounting summary data</description>
|
||||||
|
|
||||||
|
|
|
@ -107,7 +107,7 @@ public class AccountingDaoImpl implements AccountingDao{
|
||||||
String category=entry.getGroup();
|
String category=entry.getGroup();
|
||||||
|
|
||||||
// Report 1 series for selected Scope
|
// 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)}));
|
xLabel,yLabel,new Series[]{getSeries(queries, from, to, entry, desc, resolution, timeSlices)}));
|
||||||
|
|
||||||
// Report 2 series for each children
|
// Report 2 series for each children
|
||||||
|
@ -116,7 +116,7 @@ public class AccountingDaoImpl implements AccountingDao{
|
||||||
for(ScopeDescriptor child:desc.getChildren()){
|
for(ScopeDescriptor child:desc.getChildren()){
|
||||||
childrenSeries.add(getSeries(queries, from, to, entry, child, resolution, timeSlices));
|
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()])));
|
xLabel,yLabel,childrenSeries.toArray(new Series[childrenSeries.size()])));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue