Raptor Crosstab report UI Changes

Issue-ID: PORTAL-902
Change-Id: I02f1e5651251a8c26d6c524d659617e5941343a2
Signed-off-by: mravula <mr257h@att.com>

1 files changed, 24 insertions, 11 deletions

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 9a2233e3..9885f2de 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
@@ -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;
@@ -134,6 +135,16 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme
 
 	private boolean triggerThisFormfield = false;
 
+	private Integer orderBySeq;
+
+	public Integer getOrderBySeq() {
+		return orderBySeq;
+	}
+
+	public void setOrderBySeq(Integer orderBySeq) {
+		this.orderBySeq = orderBySeq;
+	}
+
 	// Form field types
 	public static final String FFT_TEXT_W_POPUP = "TEXT_WITH_POPUP";
 
@@ -181,15 +192,15 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme
 	private FormField(String fieldName, String fieldDisplayName, String fieldType, String validationType,
 			boolean required, String defaultValue, String helpText, boolean visible, String dependsOn,
 			Calendar rangeStartDate, Calendar rangeEndDate, String rangeStartDateSQL, String rangeEndDateSQL,
-			String multiSelectListSize) {
+			String multiSelectListSize, Integer orderBySeq) {
 		this(fieldName, fieldDisplayName, fieldType, validationType, required, defaultValue, helpText, dependsOn,
-				rangeStartDate, rangeEndDate, rangeStartDateSQL, rangeEndDateSQL, multiSelectListSize);
+				rangeStartDate, rangeEndDate, rangeStartDateSQL, rangeEndDateSQL, multiSelectListSize, orderBySeq);
 		setVisible(visible);
 	} // FormField
 
 	private FormField(String fieldName, String fieldDisplayName, String fieldType, String validationType,
 			boolean required, String defaultValue, String helpText, String dependsOn, Calendar rangeStartDate,
-			Calendar rangeEndDate, String rangeStartDateSQL, String rangeEndDateSQL, String multiSelectListSize) {
+			Calendar rangeEndDate, String rangeStartDateSQL, String rangeEndDateSQL, String multiSelectListSize, Integer orderBySeq) {
 		super();
 		setFieldName(fieldName);
 		setFieldDisplayName(fieldDisplayName);
@@ -204,14 +215,15 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme
 		setRangeStartDateSQL(rangeStartDateSQL);
 		setRangeEndDateSQL(rangeEndDateSQL);
 		setMultiSelectListSize(multiSelectListSize);
+		setOrderBySeq(orderBySeq);
 	}
 
 	public FormField(String fieldName, String fieldDisplayName, String fieldType, String validationType,
 			boolean required, String defaultValue, String helpText, List predefinedValues, boolean visible,
 			String dependsOn, Calendar rangeStartDate, Calendar rangeEndDate, String rangeStartDateSQL,
-			String rangeEndDateSQL, String multiSelectListSize) {
+			String rangeEndDateSQL, String multiSelectListSize, Integer orderBySeq) {
 		this(fieldName, fieldDisplayName, fieldType, validationType, required, defaultValue, helpText, visible,
-				dependsOn, rangeStartDate, rangeEndDate, rangeStartDateSQL, rangeEndDateSQL, multiSelectListSize);
+				dependsOn, rangeStartDate, rangeEndDate, rangeStartDateSQL, rangeEndDateSQL, multiSelectListSize,orderBySeq);
 		if (predefinedValues != null)
 			setPredefinedListLookup(predefinedValues);
 	} // FormField
@@ -219,9 +231,9 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme
 	public FormField(String fieldName, String fieldDisplayName, String fieldType, String validationType,
 			boolean required, String defaultValue, String helpText, String lookupSql, boolean visible, String dependsOn,
 			Calendar rangeStartDate, Calendar rangeEndDate, String rangeStartDateSQL, String rangeEndDateSQL,
-			String multiSelectListSize) {
+			String multiSelectListSize, Integer orderBySeq) {
 		this(fieldName, fieldDisplayName, fieldType, validationType, required, defaultValue, helpText, visible,
-				dependsOn, rangeStartDate, rangeEndDate, rangeStartDateSQL, rangeEndDateSQL, multiSelectListSize);
+				dependsOn, rangeStartDate, rangeEndDate, rangeStartDateSQL, rangeEndDateSQL, multiSelectListSize,orderBySeq);
 		if (defaultValue != null && defaultValue.length() > 10
 				&& defaultValue.substring(0, 10).trim().toLowerCase().startsWith("select")) {
 			setFieldDefaultSQL(defaultValue);
@@ -233,19 +245,20 @@ public class FormField extends org.onap.portalsdk.analytics.RaptorObject impleme
 	public FormField(String fieldName, String fieldDisplayName, String fieldType, String validationType,
 			boolean required, String defaultValue, String helpText, String dbTableName, String dbIdField,
 			String dbNameField, String dbSortByField, boolean visible, String dependsOn, Calendar rangeStartDate,
-			Calendar rangeEndDate, String rangeStartDateSQL, String rangeEndDateSQL, String multiSelectListSize) {
+			Calendar rangeEndDate, String rangeStartDateSQL, String rangeEndDateSQL, String multiSelectListSize, Integer orderBySeq) {
 		this(fieldName, fieldDisplayName, fieldType, validationType, required, defaultValue, helpText, dbTableName,
 				dbIdField, dbNameField, dbSortByField, dependsOn, rangeStartDate, rangeEndDate, rangeStartDateSQL,
-				rangeEndDateSQL, multiSelectListSize);
+				rangeEndDateSQL, multiSelectListSize, orderBySeq);
 		setVisible(visible);
 	}
 
 	public FormField(String fieldName, String fieldDisplayName, String fieldType, String validationType,
 			boolean required, String defaultValue, String helpText, String dbTableName, String dbIdField,
 			String dbNameField, String dbSortByField, String dependsOn, Calendar rangeStartDate, Calendar rangeEndDate,
-			String rangeStartDateSQL, String rangeEndDateSQL, String multiSelectListSize) {
+			String rangeStartDateSQL, String rangeEndDateSQL, String multiSelectListSize, Integer orderBySeq) {
 		this(fieldName, fieldDisplayName, fieldType, validationType, required, defaultValue, helpText, dependsOn,
-				rangeStartDate, rangeEndDate, rangeStartDateSQL, rangeEndDateSQL, multiSelectListSize);
+				rangeStartDate, rangeEndDate, rangeStartDateSQL, rangeEndDateSQL, multiSelectListSize, orderBySeq);
+		// if(dependsOn !=null){ this.dependsOn = dependsOn; }else { this.dependsOn = ""
 		if (defaultValue != null && defaultValue.length() > 10
 				&& defaultValue.substring(0, 10).trim().toLowerCase().startsWith("select")) {
 			setFieldDefaultSQL(defaultValue);