From a91868b4d461d903c2e0ef78a75afe89385bc7e9 Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Tue, 13 Jun 2017 14:33:51 -0400 Subject: [PORTAL-15] RAPTOR reporting fixes Also repairs a bug in the user-management overlay screen. Ticket number all caps this time. Restore epsdk-app-os pom -SNAPSHOT suffix Change-Id: I7ef620c4ebc52259bcf474908bc4810dfd7e41e7 Signed-off-by: Christopher Lott (cl778h) --- .../analytics/system/fusion/web/RaptorControllerAsync.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java') diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java index 0194b52d..48fdbe4c 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java @@ -29,6 +29,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -1276,6 +1277,10 @@ public class RaptorControllerAsync extends RestrictedBaseController { ArrayList rangeAxisList = chartJSON.getRangeAxisList(); int r = 0; + HashSet removeRangeAxisMap = new HashSet<>(); + for(RangeAxisJSON rangeAxis:chartJSON.getRangeAxisRemoveList()){ + removeRangeAxisMap.add(rangeAxis.getRangeAxis()); + } for (int i = 0; i < rangeAxisList.size(); i++) { RangeAxisJSON rangeAxisJSON = rangeAxisList.get(i); String rangeAxis = rangeAxisJSON.getRangeAxis(); @@ -1287,7 +1292,10 @@ public class RaptorControllerAsync extends RestrictedBaseController { rangefor: for (Iterator iterator = reportCols.iterator(); iterator.hasNext();) { DataColumnType dct = (DataColumnType) iterator.next(); if (dct.getColId().equals(rangeAxis)) { - dct.setChartSeq(++r); + if(removeRangeAxisMap.contains(rangeAxis)) + dct.setChartSeq(-1); // if we set it to -1, means this range axis will not be included + else + dct.setChartSeq(++r); dct.setColOnChart("0"); dct.setYAxis(rangeYAxis); // +"|"+dct.getColId()); dct.setChartGroup(rangeChartGroup); // +"|"+dct.getColId()); -- cgit 1.2.3-korg