summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-analytics/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/main')
-rw-r--r--ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java9
-rw-r--r--ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java7
2 files changed, 13 insertions, 3 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java
index 9e9428cf..888cf1e0 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java
@@ -80,12 +80,21 @@ public class DefinitionJSON implements WizardJSON {
private String dashboardLayoutHTML;
private String dashboardLayoutJSON;
private DashboardReports dashboardReports;
+ private String chartType;
@Override
public String getTabName() {
return tabName;
}
+ public String getChartType() {
+ return chartType;
+ }
+
+ public void setChartType(String chartType) {
+ this.chartType = chartType;
+ }
+
@Override
public void setTabName(String tabName) {
this.tabName = tabName;
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java
index a39d371d..a62129f8 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java
@@ -206,11 +206,12 @@ public class RaptorControllerAsync extends RestrictedBaseController {
{
String sql_whole = rr.getReportDataSQL(userId, downloadLimit, request);
request.setAttribute(AppConstants.RI_REPORT_SQL_WHOLE, sql_whole);
- }
+ }
+
try {
OutputStreamWriter out = new OutputStreamWriter(response.getOutputStream());
if(rr != null)
- //rr.setSinglePageDownload(isPageDownload);
+ rr.setSinglePageDownload(isPageDownload);
if ("report.download.pdf.session".equals(actionKey)) {
new PdfReportHandler().createPdfFileContent(request, response, 3);
} else if ("report.download.csv.session".equals(actionKey)) {
@@ -1556,7 +1557,7 @@ public class RaptorControllerAsync extends RestrictedBaseController {
if (tabId.equals("Def")) {
wizardJSON.setTabId("Def");
wizardJSON.setTabName("Definition");
-
+ wizardJSON.setChartType(rdef.getChartType());
wizardJSON.setReportId((rdef != null) ? rdef.getReportID() + "" : "");
wizardJSON.setReportName((rdef != null) ? rdef.getReportName() : "");
wizardJSON.setReportDescr((rdef != null) ? rdef.getReportDescr() : "");