From efb31c8139526215182dda47b949ddc11dfca534 Mon Sep 17 00:00:00 2001 From: mravula Date: Tue, 15 Dec 2020 16:00:49 -0500 Subject: Raptor Crosstab report UI Changes Issue-ID: PORTAL-902 Change-Id: I02f1e5651251a8c26d6c524d659617e5941343a2 Signed-off-by: mravula --- .../onap/portalsdk/analytics/model/base/ReportWrapper.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java') diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java index 65972806..07839aa9 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java @@ -1940,6 +1940,7 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject imp String chartGroup = chartGroupName.substring(0, chartGroupName.lastIndexOf("|")); int flag = 0; for (Iterator iter = reportCols.iterator(); iter.hasNext();) { + flag = 0; DataColumnType dc = (DataColumnType) iter.next(); flag = getDependsOnFormFieldFlag(dc, formValues); @@ -3684,6 +3685,7 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject imp String rSQL = Globals.getGenerateSubsetSql(); rSQL = rSQL.replace("[colNames.toString()]", colNames.toString()); rSQL = rSQL.replace("[reportSQL]", reportSQL); + rSQL = rSQL.replace("[rownum]", String.valueOf(endRow)); reportSQL = rSQL; @@ -3713,8 +3715,7 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject imp partSql += " " + orderbyclause + " "; } - CachingUtils.putPageSql(request.getSession().getId()+getWholeSQL(), partSql); - CachingUtils.putReportSql(request.getSession().getId()+getWholeSQL(), reportSQL); + if (!AppUtils.isNotEmpty(getDBType())) { setDBType(Globals.getDBType()); } @@ -3722,8 +3723,7 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject imp if (getDBType().equals(AppConstants.MYSQL)) { partSql = partSql + " LIMIT " + String.valueOf(startRow) + " , " + String.valueOf(endRow); } else if (getDBType().equals(AppConstants.ORACLE)) { - partSql = "where rnum >= " + String.valueOf(startRow) + " and rnum <= " - + ( Integer.parseInt(String.valueOf(endRow))); + partSql = " where rnum >= " + String.valueOf(startRow) + " ORDER BY rnum"; } else if (getDBType().equals(AppConstants.POSTGRESQL)) { partSql = partSql + " LIMIT " + String.valueOf(endRow) + " , " + String.valueOf(startRow); } @@ -4472,6 +4472,12 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject imp return ncft; } + public String getCrossTabDisplayValue(String crossTabValue) { + return nvl(crossTabValue).equals(AppConstants.CV_ROW) ? "Row headings" : (nvl( + crossTabValue).equals(AppConstants.CV_COLUMN) ? "Column headings" : (nvl( + crossTabValue).equals(AppConstants.CV_VALUE) ? "Report values" : "Invisible/Filter")); + } // getCrossTabDisplayValue + public DataColumnType cloneDataColumnType(ObjectFactory objFactory, DataColumnType dct) throws JAXBException { DataColumnType ndct = objFactory.createDataColumnType(); -- cgit 1.2.3-korg