Raptor backend java API Code(Analytics), UI Code(Overlay) and pages

component in os project

Issue-ID: PORTAL-902
Change-Id: Id297d9493a77e6816ed0f2a82c15b2eaa1e57a72
Signed-off-by: Sudarshan Kumar <sudarshan.kumar@att.com>

4 files changed, 28 insertions, 7 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java
index 52077aa8..217c81e8 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java
@@ -59,10 +59,10 @@ import java.util.TimeZone;
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-
 import org.apache.commons.lang.time.DateUtils;
 import org.onap.portalsdk.analytics.error.RaptorException;
 import org.onap.portalsdk.analytics.model.base.ChartSeqComparator;
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ErrorJSONRuntime.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ErrorJSONRuntime.java
index 24c46180..f670da40 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ErrorJSONRuntime.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ErrorJSONRuntime.java
@@ -41,6 +41,7 @@ public class ErrorJSONRuntime {
 
 	private String errormessage;
 	private String stacktrace;
+	private boolean allowEdit;
 	
 	public String getErrormessage() {
 		return errormessage;
@@ -54,8 +55,12 @@ public class ErrorJSONRuntime {
 	public void setStacktrace(String stacktrace) {
 		this.stacktrace = stacktrace;
 	}
-
-	
+	public boolean isAllowEdit() {
+		return allowEdit;
+	}
+	public void setAllowEdit(boolean allowEdit) {
+		this.allowEdit = allowEdit;
+	}
 
 	
 }
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java
index 3af59e56..f3633a67 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java
@@ -70,7 +70,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.regex.Matcher;
-import java.util.regex.Pattern; 
+import java.util.regex.Pattern;
 
 import org.onap.portalsdk.analytics.error.RaptorRuntimeException;
 import org.onap.portalsdk.analytics.error.UserDefinedException;
@@ -80,6 +80,7 @@ import org.onap.portalsdk.analytics.model.base.IdNameSql;
 import org.onap.portalsdk.analytics.model.base.IdNameValue;
 import org.onap.portalsdk.analytics.system.AppUtils;
 import org.onap.portalsdk.analytics.system.ConnectionUtils;
+import org.onap.portalsdk.analytics.system.ExecuteQuery;
 import org.onap.portalsdk.analytics.system.Globals;
 import org.onap.portalsdk.analytics.util.DataSet;
 import org.onap.portalsdk.analytics.util.Utils;
@@ -139,7 +140,10 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme
 
 	public static final String FFT_TEXT = "TEXT";
 
-	public static final String FFT_TEXTAREA = "TEXTAREA";
+	public static final String FFT_TEXTAREA = "TEXT";
+
+// Changed to "TEXT"	
+//	public static final String FFT_TEXTAREA = "TEXTAREA";
 
 	public static final String FFT_COMBO_BOX = "COMBO_BOX";
 
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportJSONRuntime.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportJSONRuntime.java
index 916791e1..d3d44ac3 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportJSONRuntime.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportJSONRuntime.java
@@ -544,6 +544,8 @@ public class ReportJSONRuntime {
 	private String formfield_comments;
 	private ArrayList<ColumnHeader> reportDataColumns;
 	private ArrayList<Map<String,Object>> reportDataRows;
+	private ArrayList<ColumnHeader> reportTotalDataColumns;
+	private ArrayList<Map<String,Object>> reportTotalDataRows;
 	private int totalRows;
 	private int pageSize;
 	private String sqlWhole;
@@ -712,8 +714,18 @@ public class ReportJSONRuntime {
 	public void setHideFormFieldsAfterRun(boolean hideFormFieldsAfterRun) {
 		this.hideFormFieldsAfterRun = hideFormFieldsAfterRun;
 	}
-	
-   
+	public ArrayList<ColumnHeader> getReportTotalDataColumns() {
+		return reportTotalDataColumns;
+	}
+	public void setReportTotalDataColumns(ArrayList<ColumnHeader> reportTotalDataColumns) {
+		this.reportTotalDataColumns = reportTotalDataColumns;
+	}
+	public ArrayList<Map<String, Object>> getReportTotalDataRows() {
+		return reportTotalDataRows;
+	}
+	public void setReportTotalDataRows(ArrayList<Map<String, Object>> reportTotalDataRows) {
+		this.reportTotalDataRows = reportTotalDataRows;
+	}
 
 	
 }