From 2d5ad6f2a334794acb81f1c7f19d2163b9abcbf6 Mon Sep 17 00:00:00 2001 From: FabioISTI Date: Fri, 17 Apr 2020 17:47:07 +0200 Subject: [PATCH] Fixes #19603 --- pom.xml | 2 +- .../accounting/summary/access/impl/AccountingDaoImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 948c252..a11892a 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.gcube.accounting accounting-summary-access - 1.0.1 + 1.0.2 Accounting Summary Access Java library for accessing accounting summary data diff --git a/src/main/java/org/gcube/accounting/accounting/summary/access/impl/AccountingDaoImpl.java b/src/main/java/org/gcube/accounting/accounting/summary/access/impl/AccountingDaoImpl.java index f5030a9..0d59eb8 100644 --- a/src/main/java/org/gcube/accounting/accounting/summary/access/impl/AccountingDaoImpl.java +++ b/src/main/java/org/gcube/accounting/accounting/summary/access/impl/AccountingDaoImpl.java @@ -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()]))); }