2251: Accounting Manager - Stacked column chart for tops

Task-Url: https://support.d4science.org/issues/2251

Updated calls to service


git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager@124293 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/storage/StorageChartBasicPanel.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import org.gcube.portlets.admin.accountingmanager.client.maindata.charts.utils.ByteUnitMeasure;
 import org.gcube.portlets.admin.accountingmanager.client.maindata.charts.utils.ChartTimeMeasure;
 import org.gcube.portlets.admin.accountingmanager.client.maindata.charts.utils.DownloadConstants;
+import org.gcube.portlets.admin.accountingmanager.client.maindata.charts.utils.StorageChartMeasure;
 import org.gcube.portlets.admin.accountingmanager.client.resource.AccountingManagerResources;
 import org.gcube.portlets.admin.accountingmanager.client.state.AccountingStateData;
 import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesStorage;
@@ -59,7 +60,7 @@ public class StorageChartBasicPanel extends SimpleContainer {
 	private MenuItem downloadJPGItem;
 	private MenuItem downloadPDFItem;
 	private MenuItem downloadSVGItem;
-	
+
 	// Unit Menu
 	private MenuItem kBItem;
 	private MenuItem MBItem;
@@ -72,6 +73,8 @@ public class StorageChartBasicPanel extends SimpleContainer {
 	private long unitMeasure = ByteUnitMeasure.getMegaByteDimForStorage();
 	private String unitMeasureLabel = ByteUnitMeasure.MB;
 
+	private TextButton unitButton;
+
 	public StorageChartBasicPanel(AccountingStateData accountingStateData) {
 		this.accountingStateData = accountingStateData;
 		forceLayoutOnResize = true;
@@ -91,8 +94,8 @@ public class StorageChartBasicPanel extends SimpleContainer {
 		downloadButton.setArrowAlign(ButtonArrowAlign.RIGHT);
 		downloadButton.setMenu(createDownloadMenu());
 
-		final TextButton unitButton = new TextButton(DATA_VOLUME_UNIT,
-				AccountingManagerResources.INSTANCE.accountingByte24());
+		unitButton = new TextButton(DATA_VOLUME_UNIT,
+				AccountingManagerResources.INSTANCE.accountingUnitMB24());
 		unitButton.setIconAlign(IconAlign.RIGHT);
 		unitButton.setArrowAlign(ButtonArrowAlign.RIGHT);
 		unitButton.setMenu(createUnitMenu());
@@ -116,7 +119,6 @@ public class StorageChartBasicPanel extends SimpleContainer {
 
 	}
 
-
 	private void updateChart() {
 		vert.remove(highchartsLayoutPanel);
 		//
@@ -191,16 +193,19 @@ public class StorageChartBasicPanel extends SimpleContainer {
 
 	}
 
-
 	private Menu createUnitMenu() {
 		Menu menuUnit = new Menu();
-		kBItem = new MenuItem(ByteUnitMeasure.KILOBYTE);
+		kBItem = new MenuItem(ByteUnitMeasure.KILOBYTE,
+				AccountingManagerResources.INSTANCE.accountingUnitkB24());
 		kBItem.setHeight(30);
-		MBItem = new MenuItem(ByteUnitMeasure.MEGABYTE);
+		MBItem = new MenuItem(ByteUnitMeasure.MEGABYTE,
+				AccountingManagerResources.INSTANCE.accountingUnitMB24());
 		MBItem.setHeight(30);
-		GBItem = new MenuItem(ByteUnitMeasure.GIGABYTE);
+		GBItem = new MenuItem(ByteUnitMeasure.GIGABYTE,
+				AccountingManagerResources.INSTANCE.accountingUnitGB24());
 		GBItem.setHeight(30);
-		TBItem = new MenuItem(ByteUnitMeasure.TERABYTE);
+		TBItem = new MenuItem(ByteUnitMeasure.TERABYTE,
+				AccountingManagerResources.INSTANCE.accountingUnitTB24());
 		TBItem.setHeight(30);
 
 		kBItem.addSelectionHandler(new SelectionHandler<Item>() {
@@ -209,6 +214,8 @@ public class StorageChartBasicPanel extends SimpleContainer {
 			public void onSelection(SelectionEvent<Item> event) {
 				unitMeasure = ByteUnitMeasure.getKiloByteDimForStorage();
 				unitMeasureLabel = ByteUnitMeasure.kB;
+				unitButton.setIcon(AccountingManagerResources.INSTANCE
+						.accountingUnitkB24());
 				updateChart();
 			}
 		});
@@ -219,6 +226,8 @@ public class StorageChartBasicPanel extends SimpleContainer {
 			public void onSelection(SelectionEvent<Item> event) {
 				unitMeasure = ByteUnitMeasure.getMegaByteDimForStorage();
 				unitMeasureLabel = ByteUnitMeasure.MB;
+				unitButton.setIcon(AccountingManagerResources.INSTANCE
+						.accountingUnitMB24());
 				updateChart();
 			}
 		});
@@ -229,6 +238,8 @@ public class StorageChartBasicPanel extends SimpleContainer {
 			public void onSelection(SelectionEvent<Item> event) {
 				unitMeasure = ByteUnitMeasure.getGigaByteDimForStorage();
 				unitMeasureLabel = ByteUnitMeasure.GB;
+				unitButton.setIcon(AccountingManagerResources.INSTANCE
+						.accountingUnitGB24());
 				updateChart();
 			}
 		});
@@ -239,6 +250,8 @@ public class StorageChartBasicPanel extends SimpleContainer {
 			public void onSelection(SelectionEvent<Item> event) {
 				unitMeasure = ByteUnitMeasure.getTeraByteDimForStorage();
 				unitMeasureLabel = ByteUnitMeasure.TB;
+				unitButton.setIcon(AccountingManagerResources.INSTANCE
+						.accountingUnitTB24());
 				updateChart();
 			}
 		});
@@ -306,12 +319,13 @@ public class StorageChartBasicPanel extends SimpleContainer {
 	private void createChart() {
 		SeriesStorage seriesStorage = (SeriesStorage) accountingStateData
 				.getSeriesResponse();
-		
-		if(!(seriesStorage.getSeriesStorageDefinition() instanceof SeriesStorageBasic)){
+
+		if (!(seriesStorage.getSeriesStorageDefinition() instanceof SeriesStorageBasic)) {
 			Log.debug("Invalid SeriesStorageBasic!");
 			return;
 		}
-		SeriesStorageBasic seriesStorageBasic=(SeriesStorageBasic)seriesStorage.getSeriesStorageDefinition();
+		SeriesStorageBasic seriesStorageBasic = (SeriesStorageBasic) seriesStorage
+				.getSeriesStorageDefinition();
 
 		double minRange = ChartTimeMeasure
 				.calculateMinRange(accountingStateData.getSeriesRequest()
@@ -354,38 +368,22 @@ public class StorageChartBasicPanel extends SimpleContainer {
 		// options.yAxis().title().text("Exchange rate");
 		// Highcharts.getOptions().colors[0]
 
-		String multiAxis = "[{" + " \"id\": \"OperationCount\","
+		String multiAxis = "[{" + " \"id\": \""
+				+ StorageChartMeasure.OperationCount.name() + "\","
 				+ " \"labels\": { " + "    \"format\": \"{value}\","
-				+ "    \"style\": { " + "      \"color\": \""
-				+ colors.get(1)
-				+ "\""
-				+ "    }"
-				+ " },"
-				+ " \"title\": { "
-				+ "    \"text\": \"Operation Count\","
-				+ "    \"style\": {"
-				+ "       \"color\": \""
-				+ colors.get(1)
-				+ "\""
-				+ "    }"
-				+ " }"
-				+ "} , {"
-				+ " \"id\": \"DataVolume\", "
-				+ " \"title\": {"
-				+ "    \"text\": \"Data Volume\","
-				+ "    \"style\": {"
-				+ "       \"color\": \""
-				+ colors.get(0)
-				+ "\""
-				+ "    }"
-				+ " },"
-				+ " \"labels\": {"
-				+ "    \"format\": \"{value} "
-				+ unitMeasureLabel
-				+ "\","
-				+ "    \"style\": {"
-				+ "       \"color\": \""
-				+ colors.get(0)
+				+ "    \"style\": { " + "      \"color\": \"" + colors.get(1)
+				+ "\"" + "    }" + " }," + " \"title\": { "
+				+ "    \"text\": \""
+				+ StorageChartMeasure.OperationCount.getLabel() + "\","
+				+ "    \"style\": {" + "       \"color\": \"" + colors.get(1)
+				+ "\"" + "    }" + " }" + "} , {" + " \"id\": \""
+				+ StorageChartMeasure.DataVolume.name() + "\", "
+				+ " \"title\": {" + "    \"text\": \""
+				+ StorageChartMeasure.DataVolume.getLabel() + "\","
+				+ "    \"style\": {" + "       \"color\": \"" + colors.get(0)
+				+ "\"" + "    }" + " }," + " \"labels\": {"
+				+ "    \"format\": \"{value} " + unitMeasureLabel + "\","
+				+ "    \"style\": {" + "       \"color\": \"" + colors.get(0)
 				+ "\"" + "     }" + " }," + " \"opposite\": \"true\"" + "}]";
 
 		options.setFieldAsJsonObject("yAxis", multiAxis);
@@ -402,7 +400,8 @@ public class StorageChartBasicPanel extends SimpleContainer {
 
 		SeriesColumn seriesOperationCount = highchartsFactory
 				.createSeriesColumn();
-		seriesOperationCount.name("Operation Count");
+		seriesOperationCount
+				.name(StorageChartMeasure.OperationCount.getLabel());
 		seriesOperationCount.color(colors.get(1));
 		seriesOperationCount.type("column");
 
@@ -413,16 +412,17 @@ public class StorageChartBasicPanel extends SimpleContainer {
 				dateStart.getTime());
 
 		SeriesArea seriesDataVolume = highchartsFactory.createSeriesArea();
-		seriesDataVolume.name("Data Volume");
+		seriesDataVolume.name(StorageChartMeasure.DataVolume.getLabel());
 		seriesDataVolume.color(colors.get(0));
-		seriesDataVolume.yAxisAsString("DataVolume");
+		seriesDataVolume.yAxisAsString(StorageChartMeasure.DataVolume.name());
 
 		ArrayNumber dataDataVolume = seriesDataVolume.dataAsArrayNumber();
 
 		seriesDataVolume.pointInterval(interval)
 				.pointStart(dateStart.getTime());
 
-		for (SeriesStorageData seriesStorageData : seriesStorageBasic.getSeries()) {
+		for (SeriesStorageData seriesStorageData : seriesStorageBasic
+				.getSeries()) {
 			dataOperationCount.push(seriesStorageData.getOperationCount());
 			dataDataVolume
 					.push(seriesStorageData.getDataVolume() / unitMeasure);
@@ -446,5 +446,4 @@ public class StorageChartBasicPanel extends SimpleContainer {
 		return;
 	}
 
-
 }

src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/storage/StorageChartTopPanel.java

@@ -111,7 +111,7 @@ public class StorageChartTopPanel extends SimpleContainer {
 
 		// Unit
 		unitButton = new TextButton(DATA_VOLUME_UNIT,
-				AccountingManagerResources.INSTANCE.accountingByte24());
+				AccountingManagerResources.INSTANCE.accountingUnitMB24());
 		unitButton.setIconAlign(IconAlign.RIGHT);
 		unitButton.setArrowAlign(ButtonArrowAlign.RIGHT);
 		unitButton.setMenu(createUnitMenu());
@@ -223,6 +223,7 @@ public class StorageChartTopPanel extends SimpleContainer {
 			public void onSelection(SelectionEvent<Item> event) {
 				measureButton.setText(StorageChartMeasure.DataVolume.getLabel());
 				measure=StorageChartMeasure.DataVolume;
+				unitButton.setVisible(true);
 				updateChart();
 			}
 		});
@@ -234,6 +235,7 @@ public class StorageChartTopPanel extends SimpleContainer {
 				measureButton.setText(StorageChartMeasure.OperationCount
 						.getLabel());
 				measure=StorageChartMeasure.OperationCount;
+				unitButton.setVisible(false);
 				updateChart();
 			}
 		});
@@ -247,13 +249,17 @@ public class StorageChartTopPanel extends SimpleContainer {
 
 	private Menu createUnitMenu() {
 		Menu menuUnit = new Menu();
-		kBItem = new MenuItem(ByteUnitMeasure.KILOBYTE);
+		kBItem = new MenuItem(ByteUnitMeasure.KILOBYTE,
+				AccountingManagerResources.INSTANCE.accountingUnitkB24());
 		kBItem.setHeight(30);
-		MBItem = new MenuItem(ByteUnitMeasure.MEGABYTE);
+		MBItem = new MenuItem(ByteUnitMeasure.MEGABYTE,
+				AccountingManagerResources.INSTANCE.accountingUnitMB24());
 		MBItem.setHeight(30);
-		GBItem = new MenuItem(ByteUnitMeasure.GIGABYTE);
+		GBItem = new MenuItem(ByteUnitMeasure.GIGABYTE,
+				AccountingManagerResources.INSTANCE.accountingUnitGB24());
 		GBItem.setHeight(30);
-		TBItem = new MenuItem(ByteUnitMeasure.TERABYTE);
+		TBItem = new MenuItem(ByteUnitMeasure.TERABYTE,
+				AccountingManagerResources.INSTANCE.accountingUnitTB24());
 		TBItem.setHeight(30);
 
 		kBItem.addSelectionHandler(new SelectionHandler<Item>() {
@@ -262,6 +268,7 @@ public class StorageChartTopPanel extends SimpleContainer {
 			public void onSelection(SelectionEvent<Item> event) {
 				unitMeasure = ByteUnitMeasure.getKiloByteDimForStorage();
 				unitMeasureLabel = ByteUnitMeasure.kB;
+				unitButton.setIcon(AccountingManagerResources.INSTANCE.accountingUnitkB24());
 				updateChart();
 			}
 		});
@@ -272,6 +279,7 @@ public class StorageChartTopPanel extends SimpleContainer {
 			public void onSelection(SelectionEvent<Item> event) {
 				unitMeasure = ByteUnitMeasure.getMegaByteDimForStorage();
 				unitMeasureLabel = ByteUnitMeasure.MB;
+				unitButton.setIcon(AccountingManagerResources.INSTANCE.accountingUnitMB24());
 				updateChart();
 			}
 		});
@@ -282,6 +290,7 @@ public class StorageChartTopPanel extends SimpleContainer {
 			public void onSelection(SelectionEvent<Item> event) {
 				unitMeasure = ByteUnitMeasure.getGigaByteDimForStorage();
 				unitMeasureLabel = ByteUnitMeasure.GB;
+				unitButton.setIcon(AccountingManagerResources.INSTANCE.accountingUnitGB24());
 				updateChart();
 			}
 		});
@@ -292,6 +301,7 @@ public class StorageChartTopPanel extends SimpleContainer {
 			public void onSelection(SelectionEvent<Item> event) {
 				unitMeasure = ByteUnitMeasure.getTeraByteDimForStorage();
 				unitMeasureLabel = ByteUnitMeasure.TB;
+				unitButton.setIcon(AccountingManagerResources.INSTANCE.accountingUnitTB24());
 				updateChart();
 			}
 		});
@@ -433,7 +443,7 @@ public class StorageChartTopPanel extends SimpleContainer {
 					.getSeriesStorageDataTopList().get(i).getSeries()) {
 				switch (measure) {
 				case DataVolume:
-					data.push(seriesStorageData.getDataVolume());
+					data.push(seriesStorageData.getDataVolume()/unitMeasure);
 					break;
 				case OperationCount:
 					data.push(seriesStorageData.getOperationCount());

src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/charts/utils/ByteUnitMeasure.java

@@ -9,10 +9,10 @@ package org.gcube.portlets.admin.accountingmanager.client.maindata.charts.utils;
  *
  */
 public class ByteUnitMeasure {
-	public static final String KILOBYTE = "KiloByte (kB)";
-	public static final String MEGABYTE = "MegaByte (MB)";
-	public static final String GIGABYTE = "GigaByte (GB)";
-	public static final String TERABYTE = "TeraByte (TB)";
+	public static final String KILOBYTE = "KiloByte";
+	public static final String MEGABYTE = "MegaByte";
+	public static final String GIGABYTE = "GigaByte";
+	public static final String TERABYTE = "TeraByte";
 
 	public static final String kB = "kB";
 	public static final String MB = "MB";

src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManagerResources.java

@@ -3,12 +3,10 @@
  */
 package org.gcube.portlets.admin.accountingmanager.client.resource;
 
-
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ClientBundle;
 import com.google.gwt.resources.client.ImageResource;
 
-
 /**
  * 
  * @author "Giancarlo Panichi" <a
@@ -19,20 +17,19 @@ public interface AccountingManagerResources extends ClientBundle {
 
 	public static final AccountingManagerResources INSTANCE = GWT
 			.create(AccountingManagerResources.class);
-	
+
 	@Source("AccountingManager.css")
 	AccountingManagerCSS accountingManagerCSS();
-	
-	
+
 	@Source("accounting-manager_128.png")
 	ImageResource accountingManager128();
 
 	@Source("accounting-storage_128.png")
 	ImageResource accountingStorage128();
-	
+
 	@Source("accounting-service_128.png")
 	ImageResource accountingService128();
-	
+
 	@Source("accounting-portlet_128.png")
 	ImageResource accountingPortlet128();
 
@@ -41,16 +38,16 @@ public interface AccountingManagerResources extends ClientBundle {
 
 	@Source("accounting-job_128.png")
 	ImageResource accountingJob128();
-	
+
 	@Source("accounting-manager_48.png")
 	ImageResource accountingManager48();
 
 	@Source("accounting-storage_48.png")
 	ImageResource accountingStorage48();
-	
+
 	@Source("accounting-service_48.png")
 	ImageResource accountingService48();
-	
+
 	@Source("accounting-portlet_48.png")
 	ImageResource accountingPortlet48();
 
@@ -59,16 +56,16 @@ public interface AccountingManagerResources extends ClientBundle {
 
 	@Source("accounting-job_48.png")
 	ImageResource accountingJob48();
-	
+
 	@Source("accounting-manager_32.png")
 	ImageResource accountingManager32();
 
 	@Source("accounting-storage_32.png")
 	ImageResource accountingStorage32();
-	
+
 	@Source("accounting-service_32.png")
 	ImageResource accountingService32();
-	
+
 	@Source("accounting-portlet_32.png")
 	ImageResource accountingPortlet32();
 
@@ -76,18 +73,17 @@ public interface AccountingManagerResources extends ClientBundle {
 	ImageResource accountingTask32();
 
 	@Source("accounting-job_32.png")
-	ImageResource accountingJob32();	
-	
-	
+	ImageResource accountingJob32();
+
 	@Source("accounting-manager_24.png")
 	ImageResource accountingManager24();
 
 	@Source("accounting-storage_24.png")
 	ImageResource accountingStorage24();
-	
+
 	@Source("accounting-service_24.png")
 	ImageResource accountingService24();
-	
+
 	@Source("accounting-portlet_24.png")
 	ImageResource accountingPortlet24();
 
@@ -95,71 +91,93 @@ public interface AccountingManagerResources extends ClientBundle {
 	ImageResource accountingTask24();
 
 	@Source("accounting-job_24.png")
-	ImageResource accountingJob24();	
-	
+	ImageResource accountingJob24();
 
 	@Source("accounting-reload_24.png")
 	ImageResource accountingReload24();
-	
+
 	@Source("accounting-reload_32.png")
 	ImageResource accountingReload32();
-	
+
 	@Source("accounting-reload_48.png")
 	ImageResource accountingReload48();
-	
+
 	@Source("accounting-chart-variable-axis_24.png")
 	ImageResource accountingChartVariableAxis24();
-		
+
 	@Source("accounting-chart-variable-axis_32.png")
 	ImageResource accountingChartVariableAxis32();
-	
+
 	@Source("accounting-filter_24.png")
 	ImageResource accountingFilter24();
-		
+
 	@Source("accounting-filter_32.png")
 	ImageResource accountingFilter32();
-	
+
 	@Source("accounting-download_24.png")
 	ImageResource accountingDownload24();
-		
+
 	@Source("accounting-byte_32.png")
 	ImageResource accountingByte32();
-	
+
 	@Source("accounting-byte_24.png")
 	ImageResource accountingByte24();
-		
+
+	@Source("accounting-unit-kB_32.png")
+	ImageResource accountingUnitkB32();
+
+	@Source("accounting-unit-kB_24.png")
+	ImageResource accountingUnitkB24();
+
+	@Source("accounting-unit-MB_32.png")
+	ImageResource accountingUnitMB32();
+
+	@Source("accounting-unit-MB_24.png")
+	ImageResource accountingUnitMB24();
+
+	@Source("accounting-unit-GB_32.png")
+	ImageResource accountingUnitGB32();
+
+	@Source("accounting-unit-GB_24.png")
+	ImageResource accountingUnitGB24();
+
+	@Source("accounting-unit-TB_32.png")
+	ImageResource accountingUnitTB32();
+
+	@Source("accounting-unit-TB_24.png")
+	ImageResource accountingUnitTB24();
+
 	@Source("accounting-download_32.png")
 	ImageResource accountingDownload32();
 
 	@Source("accounting-file_24.png")
 	ImageResource accountingFile24();
-		
+
 	@Source("accounting-file_32.png")
 	ImageResource accountingFile32();
 
 	@Source("accounting-file-png_24.png")
 	ImageResource accountingFilePNG24();
-		
+
 	@Source("accounting-file-png_32.png")
 	ImageResource accountingFilePNG32();
-	
+
 	@Source("accounting-file-jpg_24.png")
 	ImageResource accountingFileJPG24();
-		
+
 	@Source("accounting-file-jpg_32.png")
 	ImageResource accountingFileJPG32();
-	
+
 	@Source("accounting-file-pdf_24.png")
 	ImageResource accountingFilePDF24();
-		
+
 	@Source("accounting-file-pdf_32.png")
 	ImageResource accountingFilePDF32();
-	
+
 	@Source("accounting-file-svg_24.png")
 	ImageResource accountingFileSVG24();
-		
+
 	@Source("accounting-file-svg_32.png")
 	ImageResource accountingFileSVG32();
 
-	
 }

src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCallerTester.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingFilterTop;
 import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType;
 import org.gcube.portlets.admin.accountingmanager.shared.data.FilterKey;
 import org.gcube.portlets.admin.accountingmanager.shared.data.FilterValue;
@@ -133,8 +134,7 @@ public class AccountingCallerTester implements AccountingCallerInterface {
 						.getChartType() != null) {
 					ArrayList<SeriesJobData> seriesJobData = new ArrayList<>();
 					for (int i = 0; i < 30; i++) {
-						SeriesJobData data = new SeriesJobData(
-								new Date(),
+						SeriesJobData data = new SeriesJobData(new Date(),
 								new Double(10 * Math.random()).longValue(),
 								new Double(10 * Math.random()).longValue(),
 								new Double(10 * Math.random()).longValue(),
@@ -148,11 +148,16 @@ public class AccountingCallerTester implements AccountingCallerInterface {
 						serieJobDefinition = new SeriesJobBasic(seriesJobData);
 						break;
 					case Top:
-						ArrayList<SeriesJobDataTop> seriesJobDataTopList=new ArrayList<>();	
-						SeriesJobDataTop seriesJobDataTop = new SeriesJobDataTop(
-								new FilterValue("giancarlo.panichi"),
-								seriesJobData);
-						seriesJobDataTopList.add(seriesJobDataTop);
+						AccountingFilterTop accountingFilterTop = (AccountingFilterTop) seriesRequest
+								.getAccountingFilterDefinition();
+
+						ArrayList<SeriesJobDataTop> seriesJobDataTopList = new ArrayList<>();
+						for (int i = 0; i < accountingFilterTop.getTopNumber(); i++) {
+
+							SeriesJobDataTop seriesJobDataTop = new SeriesJobDataTop(
+									new FilterValue("User" + i), seriesJobData);
+							seriesJobDataTopList.add(seriesJobDataTop);
+						}
 						serieJobDefinition = new SeriesJobTop(
 								seriesJobDataTopList);
 						break;
@@ -163,7 +168,7 @@ public class AccountingCallerTester implements AccountingCallerInterface {
 				}
 
 				seriesResponse = new SeriesJob(serieJobDefinition);
-				
+
 				break;
 			case PORTLET:
 				break;
@@ -185,14 +190,23 @@ public class AccountingCallerTester implements AccountingCallerInterface {
 					switch (seriesRequest.getAccountingFilterDefinition()
 							.getChartType()) {
 					case Basic:
-						serieServiceDefinition = new SeriesServiceBasic(seriesServiceData);
+						serieServiceDefinition = new SeriesServiceBasic(
+								seriesServiceData);
 						break;
 					case Top:
-						ArrayList<SeriesServiceDataTop> seriesServiceDataTopList=new ArrayList<>();
-						SeriesServiceDataTop seriesServiceDataTop = new SeriesServiceDataTop(
-								new FilterValue("giancarlo.panichi"),
-								seriesServiceData);
-						seriesServiceDataTopList.add(seriesServiceDataTop);
+
+						AccountingFilterTop accountingFilterTop = (AccountingFilterTop) seriesRequest
+								.getAccountingFilterDefinition();
+						ArrayList<SeriesServiceDataTop> seriesServiceDataTopList = new ArrayList<>();
+
+						for (int i = 0; i < accountingFilterTop.getTopNumber(); i++) {
+
+							SeriesServiceDataTop seriesServiceDataTop1 = new SeriesServiceDataTop(
+									new FilterValue("User" + i),
+									seriesServiceData);
+							seriesServiceDataTopList.add(seriesServiceDataTop1);
+						}
+
 						serieServiceDefinition = new SeriesServiceTop(
 								seriesServiceDataTopList);
 						break;
@@ -203,8 +217,7 @@ public class AccountingCallerTester implements AccountingCallerInterface {
 				}
 
 				seriesResponse = new SeriesService(serieServiceDefinition);
-				
-				
+
 				break;
 			case STORAGE:
 				SeriesStorageDefinition serieStorageDefinition = null;
@@ -214,7 +227,7 @@ public class AccountingCallerTester implements AccountingCallerInterface {
 					for (int i = 0; i < 30; i++) {
 						SeriesStorageData data = new SeriesStorageData(
 								new Date(),
-								new Double(10 * Math.random()).longValue(),
+								new Double(1024*1024 * Math.random()).longValue(),
 								new Double(100 * Math.random()).longValue());
 						seriesStorageData.add(data);
 
@@ -226,11 +239,15 @@ public class AccountingCallerTester implements AccountingCallerInterface {
 								seriesStorageData);
 						break;
 					case Top:
-						ArrayList<SeriesStorageDataTop> seriesStorageDataTopList=new ArrayList<>();	
-						SeriesStorageDataTop seriesStorageDataTop = new SeriesStorageDataTop(
-								new FilterValue("giancarlo.panichi"),
-								seriesStorageData);
-						seriesStorageDataTopList.add(seriesStorageDataTop);
+						AccountingFilterTop accountingFilterTop = (AccountingFilterTop) seriesRequest
+								.getAccountingFilterDefinition();
+						ArrayList<SeriesStorageDataTop> seriesStorageDataTopList = new ArrayList<>();
+						for (int i = 0; i < accountingFilterTop.getTopNumber(); i++) {
+							SeriesStorageDataTop seriesStorageDataTop = new SeriesStorageDataTop(
+									new FilterValue("User"+i),
+									seriesStorageData);
+							seriesStorageDataTopList.add(seriesStorageDataTop);
+						}
 						serieStorageDefinition = new SeriesStorageTop(
 								seriesStorageDataTopList);
 						break;