1 files changed, 14 insertions, 38 deletions

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..de5c892b 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
@@ -406,48 +406,12 @@ import org.onap.portalsdk.analytics.view.ColumnHeader;
     
 }*/
 
-/*class Row {
-	private String displayValue;
-	private String dataType;
-	private String colId;
-	private boolean visible;
-	
-	
-	public boolean isVisible() {
-		return visible;
-	}
-	public void setVisible(boolean visible) {
-		this.visible = visible;
-	}
-	public String getDisplayValue() {
-		return displayValue;
-	}
-	public void setDisplayValue(String displayValue) {
-		this.displayValue = displayValue;
-	}
-	public String getDataType() {
-		return dataType;
-	}
-	public void setDataType(String dataType) {
-		this.dataType = dataType;
-	}
-	public String getColId() {
-		return colId;
-	}
-	public void setColId(String colId) {
-		this.colId = colId;
-	}
-	
-	
-}*/
 class FormFieldJSON {
 	private String fieldId;
 	private String fieldDisplayName;
 	private String fieldType;
 	private String validationType;
 	private boolean required;
-	//private String defaultValue;
-	
 	private Calendar rangeStartDate;
 	private Calendar rangeEndDate;
 	private String multiSelectListSize;
@@ -544,6 +508,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 +678,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;
+	}
 
 	
 }