diff options
Diffstat (limited to 'ecomp-sdk/epsdk-analytics')
-rw-r--r-- | ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartWebRuntime.java | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartWebRuntime.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartWebRuntime.java index d10cd1c4..63aef767 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartWebRuntime.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartWebRuntime.java @@ -115,12 +115,8 @@ public class ChartWebRuntime implements Serializable { logger.error(EELFLoggerDelegate.errorLogger, "RaptorException occurred in generateChart",ex); } List roleList = getRolesCommaSeperated(request); - // final Map<String, Object> params = new HashMap<String, Object>(); params.put("user_id", user_id); params.put("role_list", roleList); - // params.put("public_yn", "Y"); - - // String action = request.getParameter(AppConstants.RI_ACTION); String reportID = AppUtils.getRequestValue(request, AppConstants.RI_REPORT_ID); ReportHandler rh = new ReportHandler(); @@ -131,9 +127,6 @@ public class ChartWebRuntime implements Serializable { if (rr.getReportType().equals(AppConstants.RT_HIVE)) { String sql = rr.getReportSQL(); rr.setWholeSQL(sql); - // if(genReportData) - // reportData = rr.loadHiveLinearReportData(rr.getWholeSQL(),user_id.toString(), - // 10000,request); } else { if (genReportData) reportData = rr.loadReportData(0, user_id.toString(), 10000, request, @@ -247,16 +240,6 @@ public class ChartWebRuntime implements Serializable { ? AppUtils.getRequestNvlValue(request, "precision") : "2"; - /* - * boolean animation = AppUtils.getRequestFlag(request, "animation"); boolean staggerLabels - * = AppUtils.getRequestFlag(request, "staggerLabels"); boolean showMaxMin = - * (showMaxMinStr.length()<=0)?false:Boolean.parseBoolean(showMaxMinStr); boolean - * showControls = (showControlsStr.length()<=0)?true:Boolean.parseBoolean(showControlsStr); - * boolean showLegend = - * (showLegendStr.length()<=0)?true:Boolean.parseBoolean(showLegendStr); boolean showTitle = - * (showTitleStr.length()<=0)?true:Boolean.parseBoolean(showTitleStr); boolean stacked = - * (stackedStr.length()<=0)?true:Boolean.parseBoolean(stackedStr); - */ // Add all options to Map chartOptionsMap.put("width", width); chartOptionsMap.put("height", height); @@ -293,17 +276,12 @@ public class ChartWebRuntime implements Serializable { reportRuntime.getChartType(); return drawD3Charts(chartOptionsMap, request); - // drawD3Charts(); - } else /* if (action.equals("chart.json")) */ { + } else{ reportRuntime.getChartType(); return returnChartJSON(chartOptionsMap, request, showData); - } /* - * else { - * - * return ("Internal Error Occurred."); } - */ + } } @@ -441,14 +419,6 @@ public class ChartWebRuntime implements Serializable { } - - /* - * public void drawD3Charts(HashMap<String,String> chartOptionsMap) { - * drawD3Charts(chartOptionsMap); - * - * } - */ - public String drawD3Charts(Map<String, String> chartOptionsMap, HttpServletRequest request) { ChartD3Helper chartHelper = new ChartD3Helper(reportRuntime); |