diff options
author | Christopher Lott (cl778h) <clott@research.att.com> | 2017-06-13 14:33:51 -0400 |
---|---|---|
committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-06-13 15:09:24 -0400 |
commit | a91868b4d461d903c2e0ef78a75afe89385bc7e9 (patch) | |
tree | 22ee5f9f096e0e650cf2804c6281233c63df5ab9 /ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model | |
parent | 0b2b3270d23bc1bec003f7bda3e6b4babd41ba38 (diff) |
[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) <clott@research.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model')
2 files changed, 10 insertions, 1 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model/runtime/ChartD3Helper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model/runtime/ChartD3Helper.java index 22602e03..698d52a5 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model/runtime/ChartD3Helper.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model/runtime/ChartD3Helper.java @@ -1074,7 +1074,7 @@ public class ChartD3Helper { } else { wholeScript.append(" .rotateLabels(\"0\") \n "); } - //wholeScript.append(" .axisLabel('" + legendColumnName + "')"); + wholeScript.append(" .axisLabel('" + legendColumnName + "')"); if(flagNoDate == 1 || !timeAxis) { wholeScript.append(";\n"); } else { diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model/runtime/ChartJSON.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model/runtime/ChartJSON.java index 8ec6bc19..66bce17a 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model/runtime/ChartJSON.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/model/runtime/ChartJSON.java @@ -130,6 +130,8 @@ public class ChartJSON { this.hasCategoryAxis = hasCategoryAxis; } private ArrayList <RangeAxisJSON> rangeAxisList; + private ArrayList <RangeAxisJSON> rangeAxisRemoveList; + private ArrayList <ArrayList<Row>> wholeList; private String primaryAxisLabel; @@ -447,5 +449,12 @@ public class ChartJSON { else return ""; } + public ArrayList<RangeAxisJSON> getRangeAxisRemoveList() { + return rangeAxisRemoveList; + } + public void setRangeAxisRemoveList(ArrayList<RangeAxisJSON> rangeAxisRemoveList) { + this.rangeAxisRemoveList = rangeAxisRemoveList; + } + } |