gCubeSystem
/
accounting-manager
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ref 8397:Accounting Manager - Add the Spaces management 

https://support.d4science.org/issues/8397

Fixed for Spaces graph issue DataVolume equals to null in some days

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager@148340 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2017-05-05 17:23:17 +00:00
parent 62be662e2f
commit 84aa4bea75
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManagerController.java
View File

@ -502,7 +502,6 @@ public class AccountingManagerController {
public void onSuccess(SeriesResponse seriesResponse) {
Log.debug("SeriesResponse: " + seriesResponse);
if (seriesResponse == null) {
// TODO
callDefaultSeriesRequestNoCache();
} else {
AccountingClientStateData accountingStateData = accountingState

5
src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/ChartViewerPanel.java
View File

@ -70,7 +70,6 @@ public class ChartViewerPanel extends FramedPanel {
case Restore:
case Update:
onStateChange(event);
break;
default:
break;
@ -103,9 +102,7 @@ public class ChartViewerPanel extends FramedPanel {
break;
case SPACE:
createChart(new AccountingChart4Space(eventBus, event.getAccountingStateData()));
break;
break;
default:
break;
}

8
src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingManagerServiceImpl.java
View File

@ -172,7 +172,7 @@ public class AccountingManagerServiceImpl extends RemoteServiceServlet
HttpServletRequest httpRequest = this.getThreadLocalRequest();
ServiceCredentials serviceCredentials = SessionUtil
.getServiceCredentials(httpRequest);
logger.debug("getSeriesInCache(): "+accountingType);
String key = new String(serviceCredentials.getScope() + "_"
+ accountingType.name() + "_" + seriesRequest.toString());
logger.info("Search Accounting data in Cache with key: " + key);
@ -195,6 +195,7 @@ public class AccountingManagerServiceImpl extends RemoteServiceServlet
accountingType, seriesRequest, seriesResponse);
SessionUtil.setAccountingStateData(httpRequest.getSession(),
serviceCredentials, accountingType, accountingStateData);
logger.debug("serriesResponse: "+seriesResponse);
return seriesResponse;
} catch (ServiceException e) {
@ -218,7 +219,8 @@ public class AccountingManagerServiceImpl extends RemoteServiceServlet
HttpServletRequest httpRequest = this.getThreadLocalRequest();
ServiceCredentials serviceCredentials = SessionUtil
.getServiceCredentials(httpRequest);
logger.debug("getSeries(): "+accountingType);
// HttpServletResponse httpResponse = this.getThreadLocalResponse();
/*
@ -240,7 +242,7 @@ public class AccountingManagerServiceImpl extends RemoteServiceServlet
.getAttribute(SessionConstants.TASK_REQUEST_QUEUE));
queue.add(taskRequest);
logger.debug("operationId: "+operationId);
return operationId;
} catch (ServiceException e) {

4
src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4SpaceSpaces.java
View File

@ -49,7 +49,9 @@ public class SeriesResponse4SpaceSpaces extends SeriesResponseBuilder {
SortedMap<Calendar, Long> infos = spaceSM.get(spaceValue);
for (Calendar calendar : infos.keySet()) {
Long value = infos.get(calendar);
if(value==null){
value=0L;
}
series.add(new SeriesSpaceData(calendar.getTime(), value));
}

4
src/main/resources/org/gcube/portlets/admin/accountingmanager/accountingman.gwt.xml
View File

@ -53,7 +53,7 @@
<set-property name="log_ConsoleLogger" value="ENABLED" /> <set-property
name="log_DivLogger" value="ENABLED" /> <set-property name="log_GWTLogger"
value="ENABLED" /> <set-property name="log_SystemLogger" value="ENABLED"
/> -->
/> -->
<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="ENABLED"
/> -->
@ -61,7 +61,7 @@
<set-property name="log_ConsoleLogger" value="DISABLED" />
<set-property name="log_DivLogger" value="DISABLED" />
<set-property name="log_GWTLogger" value="DISABLED" />
<set-property name="log_SystemLogger" value="DISABLED" />
<set-property name="log_SystemLogger" value="DISABLED" />
<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="DISABLED"
/> -->