Updated Accounting Manager

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

src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/HightChartPanel.java

@@ -131,14 +131,14 @@ public class HightChartPanel extends FramedPanel {
 			return 14 * 24 * 3600 * 1000;
 		case HOURLY:
 			return 24 * 3600 * 1000;
-		case MILLISECONDLY:
-			return 10 * 100;
+		//case MILLISECONDLY:
+		//	return 10 * 100;
 		case MINUTELY:
 			return 10 * 60 * 1000;
 		case MONTHLY:
 			return 6 * 28 * 24 * 3600 * 1000;
-		case SECONDLY:
-			return 30 * 1000;
+		//case SECONDLY:
+		//	return 30 * 1000;
 		case YEARLY:
 			return 5 * 12 * 28 * 24 * 3600 * 1000;
 
@@ -159,14 +159,14 @@ public class HightChartPanel extends FramedPanel {
 			return 24 * 3600 * 1000;
 		case HOURLY:
 			return 3600 * 1000;
-		case MILLISECONDLY:
-			return 100;
+		//case MILLISECONDLY:
+		//	return 100;
 		case MINUTELY:
 			return 60 * 1000;
 		case MONTHLY:
 			return 28 * 24 * 3600 * 1000;
-		case SECONDLY:
-			return 1000;
+		//case SECONDLY:
+		//	return 1000;
 		case YEARLY:
 			return 12 * 28 * 24 * 3600 * 1000;
 

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

@@ -78,13 +78,33 @@ public interface AccountingManagerResources extends ClientBundle {
 	@Source("accounting-job_32.png")
 	ImageResource accountingJob32();	
 	
-	@Source("accounting-reload_16.png")
-	ImageResource accountingReload16();
 	
+	@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();
+
+	@Source("accounting-task_24.png")
+	ImageResource accountingTask24();
+
+	@Source("accounting-job_24.png")
+	ImageResource accountingJob24();	
+	
+
 	@Source("accounting-reload_24.png")
 	ImageResource accountingReload24();
 	
 	@Source("accounting-reload_32.png")
 	ImageResource accountingReload32();
+	
+	@Source("accounting-reload_48.png")
+	ImageResource accountingReload48();
 
 }

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

@@ -62,7 +62,7 @@ public class AccountingCaller {
 			}
 
 			List<Info> infos = rrq.getInfo(query.getType(),
-					query.getTemporalConstraint(), null);
+					query.getTemporalConstraint(), null, true);
 			if (infos == null) {
 				throw new AccountingManagerServiceException(
 						"Error retrieving list of info: list is null!");

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

@@ -17,14 +17,10 @@ public class PeriodModeMap {
 			return AggregationMode.DAILY;
 		case HOURLY:
 			return AggregationMode.HOURLY;
-		case MILLISECONDLY:
-			return AggregationMode.MILLISECONDLY;
 		case MINUTELY:
 			return AggregationMode.MINUTELY;
 		case MONTHLY:
 			return AggregationMode.MONTHLY;
-		case SECONDLY:
-			return AggregationMode.SECONDLY;
 		case YEARLY:
 			return AggregationMode.YEARLY;
 		default:
@@ -40,14 +36,10 @@ public class PeriodModeMap {
 			return AccountingPeriodMode.DAILY;
 		case HOURLY:
 			return AccountingPeriodMode.HOURLY;
-		case MILLISECONDLY:
-			return AccountingPeriodMode.MILLISECONDLY;
 		case MINUTELY:
 			return AccountingPeriodMode.MINUTELY;
 		case MONTHLY:
 			return AccountingPeriodMode.MONTHLY;
-		case SECONDLY:
-			return AccountingPeriodMode.SECONDLY;
 		case YEARLY:
 			return AccountingPeriodMode.YEARLY;
 		default:

src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingPeriodMode.java

@@ -14,9 +14,9 @@ public enum AccountingPeriodMode {
 	MONTHLY("Monthly"), 
 	DAILY("Dayly"), 
 	HOURLY("Hourly"), 
-	MINUTELY("Minutely"), 
-	SECONDLY("Secondly"), 
-	MILLISECONDLY("Per Millisecond");
+	MINUTELY("Minutely"); 
+	//SECONDLY("Secondly"), 
+	//MILLISECONDLY("Per Millisecond");
 	
 	
 	/**