From f51a3e2b128f0b96bc9ed67dfc3081f4b41d1303 Mon Sep 17 00:00:00 2001
From: "Kishore Reddy, Gujja (kg811t)" <kg811t@research.att.com>
Date: Fri, 8 Jun 2018 16:40:16 -0400
Subject: Junit Test Cases & Raptors

Issue-ID: PORTAL-273. PORTAL-301
Covered JUNITS for sdk modules and RAPTOR reports fixes

Change-Id: Ifaf3bf06f0ec123051a791cc8e7f10662f97a525
Signed-off-by: Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com>
---
 .../ds2-reports/modal/report-del-confirm.html      |  38 +--
 .../modal/report-formfield-del-confirm.html        |  37 +--
 .../modal/report-security-role-del-confirm.html    |  39 +--
 .../modal/report-security-user-del-confirm.html    |  38 +--
 .../modal/report-user-role-confirm-toggle.html     |  41 +--
 .../ds2-reports/modal/report-wizard-col-edit.html  | 338 ++++++++++++++-------
 .../modal/report-wizard-formfield-edit.html        | 253 +++++++--------
 .../modal/report-wizard-test-run-sql.html          |  89 +++---
 8 files changed, 472 insertions(+), 401 deletions(-)

(limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal')

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-del-confirm.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-del-confirm.html
index da255bbf..3f0338c9 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-del-confirm.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-del-confirm.html
@@ -1,26 +1,18 @@
-<div style="height:400px">
-    <div class="b2b-modal-header ng-scope in">
-        <h2 id="myModalLabel" modal-title="">Remove Report</h2>
-			<div class="corner-button in">
-			<button type="button" class="close" aria-label="Close"
-				ng-click="$dismiss('cancel')"></button>
-		</div>
+
+<div class="b2b-modal-header ng-scope in">
+	<h2 id="myModalLabel" modal-title="">Remove Report</h2>
+	<div class="corner-button in">
+		<button type="button" class="close" aria-label="Close"
+			ng-click="$dismiss('cancel')"></button>
 	</div>
-	<div class="b2b-modal-body ng-scope ng-isolate-scope in"  style="margin-bottom: -50px;">
-		<form name="workflowForm" class="css-form" novalidate>
-			
-			<div class="form-row input-emphasized-field">
-				<label class="span12 input-emphasized" for="textinputID-2a">The selected report will be removed. Do you want to continue</label>
-			</div>
-						
-					<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
-		<div class="cta-button-group in">
-					<button class="btn btn-alt btn-small" type="button"  ng-click="ok()">OK</button>
-			<button class="btn btn-alt btn-small" type="button"
-				ng-click="cancel()">Cancel</button>
-		</div>
-	</div>
-		</form>
-		<br />
+</div>
+<div class="b2b-modal-body ng-scope ng-isolate-scope in">
+	<h2>The selected report will be removed. Do you want to continue</h2>
+</div>
+<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+	<div class="cta-button-group in">
+		<button class="btn btn-alt btn-small" type="button" ng-click="ok()">OK</button>
+		<button class="btn btn-alt btn-small" type="button"
+			ng-click="cancel()">Cancel</button>
 	</div>
 </div>
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-formfield-del-confirm.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-formfield-del-confirm.html
index 7bdf5a29..20dd9202 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-formfield-del-confirm.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-formfield-del-confirm.html
@@ -1,26 +1,17 @@
-<div style="height:400px">
-    <div class="b2b-modal-header ng-scope in">
-        <h2 id="myModalLabel" modal-title="">Remove Formfield</h2>
-			<div class="corner-button in">
-			<button type="button" class="close" aria-label="Close"
-				ng-click="$dismiss('cancel')"></button>
-		</div>
+<div class="b2b-modal-header">
+	<h2 id="myModalLabel" modal-title="">Remove Formfield</h2>
+	<div class="corner-button in">
+		<button type="button" class="close" aria-label="Close"
+			ng-click="$dismiss('cancel')"></button>
 	</div>
-	<div class="b2b-modal-body ng-scope ng-isolate-scope in"  style="margin-bottom: -50px;">
-		<form name="workflowForm" class="css-form" novalidate>
-			
-			<div class="form-row input-emphasized-field">
-				<label class="span12 input-emphasized" for="textinputID-2a">The selected formfield {{tempFieldId}} will be removed. Do you want to continue</label>
-			</div>
-						
-					<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
-		<div class="cta-button-group in">
-					<button class="btn btn-alt btn-small" type="button"  ng-click="ok()">OK</button>
-			<button class="btn btn-alt btn-small" type="button"
-				ng-click="cancel()">Cancel</button>
-		</div>
-	</div>
-		</form>
-		<br />
+</div>
+<div class="b2b-modal-body">
+	The selected formfield {{tempFieldId}} will be removed. Do you want to continue?
+</div>
+<div class="b2b-modal-footer">
+	<div class="cta-button-group in">
+		<button class="btn btn-alt btn-small" type="button" ng-click="ok()">OK</button>
+		<button class="btn btn-alt btn-small" type="button"
+			ng-click="cancel()">Cancel</button>
 	</div>
 </div>
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-role-del-confirm.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-role-del-confirm.html
index 01d1e609..629b9a91 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-role-del-confirm.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-role-del-confirm.html
@@ -1,26 +1,19 @@
-<div style="height:300px">
-    <div class="b2b-modal-header ng-scope in">
-        <h2 id="myModalLabel" modal-title="">Remove Report Role</h2>
-			<div class="corner-button in">
-			<button type="button" class="close" aria-label="Close"
-				ng-click="$dismiss('cancel')"></button>
-		</div>
+
+<div class="b2b-modal-header">
+	<h2 id="myModalLabel" modal-title="">Remove Report Role</h2>
+	<div class="corner-button in">
+		<button type="button" class="close" aria-label="Close"
+			ng-click="$dismiss('cancel')"></button>
 	</div>
-	<div class="b2b-modal-body ng-scope ng-isolate-scope in"  style="margin-bottom: -50px;">
-		<form name="workflowForm" class="css-form" novalidate>
-			
-			<div class="form-row input-emphasized-field">
-				<label class="span12 input-emphasized" for="textinputID-2a">{{securityRoleName}} will be removed. Would you want to continue?</label>
-			</div>
-						
-					<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
-		<div class="cta-button-group in">
-					<button class="btn btn-alt btn-small" type="button"  ng-click="ok()">OK</button>
-			<button class="btn btn-alt btn-small" type="button"
-				ng-click="cancel()">Cancel</button>
-		</div>
-	</div>
-		</form>
-		<br />
+</div>
+<div class="b2b-modal-body">
+		{{securityRoleName}}
+			will be removed. Would you want to continue?
+</div>
+<div class="b2b-modal-footer">
+	<div class="cta-button-group in">
+		<button class="btn btn-alt btn-small" type="button" ng-click="ok()">OK</button>
+		<button class="btn btn-alt btn-small" type="button"
+			ng-click="cancel()">Cancel</button>
 	</div>
 </div>
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-user-del-confirm.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-user-del-confirm.html
index 6620fe7c..5af1b227 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-user-del-confirm.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-user-del-confirm.html
@@ -1,26 +1,18 @@
-<div style="height:300px">
-    <div class="b2b-modal-header ng-scope in">
-        <h2 id="myModalLabel" modal-title="">Remove Report User</h2>
-			<div class="corner-button in">
-			<button type="button" class="close" aria-label="Close"
-				ng-click="$dismiss('cancel')"></button>
-		</div>
+<div class="b2b-modal-header">
+	<h2 id="myModalLabel" modal-title="">Remove Report User</h2>
+	<div class="corner-button in">
+		<button type="button" class="close" aria-label="Close"
+			ng-click="$dismiss('cancel')"></button>
 	</div>
-	<div class="b2b-modal-body ng-scope ng-isolate-scope in"  style="margin-bottom: -50px;">
-		<form name="workflowForm" class="css-form" novalidate>
-			
-			<div class="form-row input-emphasized-field">
-				<label class="span12 input-emphasized" for="textinputID-2a">{{securityUserName}} will be removed. Would you want to continue?</label>
-			</div>
-						
-					<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
-		<div class="cta-button-group in">
-					<button class="btn btn-alt btn-small" type="button"  ng-click="ok()">OK</button>
-			<button class="btn btn-alt btn-small" type="button"
-				ng-click="cancel()">Cancel</button>
-		</div>
-	</div>
-		</form>
-		<br />
+</div>
+<div class="b2b-modal-body"">
+	{{securityUserName}}
+			will be removed. Would you want to continue?
+</div>
+<div class="b2b-modal-footer">
+	<div class="cta-button-group in">
+		<button class="btn btn-alt btn-small" type="button" ng-click="ok()">OK</button>
+		<button class="btn btn-alt btn-small" type="button"
+			ng-click="cancel()">Cancel</button>
 	</div>
 </div>
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-user-role-confirm-toggle.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-user-role-confirm-toggle.html
index 21bb046f..06f2049a 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-user-role-confirm-toggle.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-user-role-confirm-toggle.html
@@ -1,23 +1,24 @@
-<div>
-	<div class="b2b-modal-header ng-scope in">
-		<h1><i class="icon-primary-alert"></i></h1>
-		<h2 id="myModalLabel" modal-title="">Confirm</h2>
-		<div class="corner-button in">
-			<button type="button" class="close" aria-label="Close"
-				ng-click="$dismiss('cancel')"></button>
-		</div>
+
+<div class="b2b-modal-header">
+	<h1>
+		<i class="icon-primary-alert"></i>
+	</h1>
+	<h2 id="myModalLabel" modal-title="">Confirm</h2>
+	<div class="corner-button in">
+		<button type="button" class="close" aria-label="Close"
+			ng-click="$dismiss('cancel')"></button>
 	</div>
-	<div class="b2b-modal-body ng-scope ng-isolate-scope in" tabindex="0"
-		role="region" aria-label="Modal header text content"
-		style="height: 55px;">
-		You are about to {{rowData.accessAllowed?"grant":"revoke"}} {{rowData.name}} edit access. Would you like to continue?
-	</div>
-	<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
-		<div class="cta-button-group in">
-			<button class="btn btn-alt btn-medium" type="button"
-				ng-click="toggleEditAccessStatus(rowData);">Ok</button>
-			<button class="btn btn-clear btn-medium" type="button"
-				ng-click="cancelEditAccessToggle(rowData);">Cancel</button>
-		</div>
+</div>
+<div class="b2b-modal-body" tabindex="0" role="region"
+	aria-label="Modal header text content" style="height: 55px;">
+	You are about to {{rowData.accessAllowed?"grant":"revoke"}}
+		{{rowData.name}} edit access. Would you like to continue?
+</div>
+<div class="b2b-modal-footer">
+	<div class="cta-button-group in">
+		<button class="btn btn-alt btn-medium" type="button"
+			ng-click="toggleEditAccessStatus(rowData);">Ok</button>
+		<button class="btn btn-clear btn-medium" type="button"
+			ng-click="cancelEditAccessToggle(rowData);">Cancel</button>
 	</div>
 </div>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-col-edit.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-col-edit.html
index e74f89a8..3aadf27e 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-col-edit.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-col-edit.html
@@ -1,130 +1,232 @@
 <style>
 #columnEditTable table tbody td {
-    border: none;
+	border: none;
 }
 
 #columnEditTable table tbody tr {
-    border: none;
+	border: none;
 }
 
-.colTableLeftColumn {
-	width: 45%;
-	text-align: right;
-	vertical-align:middle;
-}
-
-.colTableInput {
-	width:220px;
-}
-
-#columnEditTable .selectWrap{
-	width:220px;
-}
 
-
-#drilldownOption .selectWrap{
-	width:450px;
-}
 </style>
 
-<div style="height: 700px;">
-    <div class="b2b-modal-header ng-scope in">
-        <h2 id="myModalLabel" modal-title="">Report Column - Edit </h2>
-			<div class="corner-button in">
-			<button type="button" class="close" aria-label="Close"
-				ng-click="$dismiss('cancel')"></button>
-		</div>
+<div class="b2b-modal-header">
+	<h2 id="myModalLabel" modal-title="">Report Column - Edit</h2>
+	<div class="corner-button in">
+		<button type="button" class="close" aria-label="Close"
+			ng-click="$dismiss('cancel')"></button>
 	</div>
-	<div class="b2b-modal-body ng-scope ng-isolate-scope in"  style="margin-bottom: -50px;">
-		<form name="workflowForm" class="css-form" novalidate>
-			
-<!-- 			<div class="form-row input-emphasized-field">
-				<label class="span12 input-emphasized" for="textinputID-2a">The selected report will be removed. Do you want to continue</label>
-			</div> -->
-	<div id="columnEditTable">
-    <table class="striped">
-<!--         <caption><span>Table caption</span></caption> -->
-<!--         <thead>
-            <tr>
-                <th>Column ID:</th>
-                <th>Name</th>
-                <th>ID</th>
-                <th>Edit</th>
-            </tr>
-        </thead> -->
-        <tbody>
-            <tr>
-                <td class="colTableLeftColumn">Column ID:</td>
-                <td>{{columnEditData.colId}}</td>
-            </tr>
-
-            <tr>
-                <td class="colTableLeftColumn">Display Name:</td>
-                <td><input type="text" name="displayName" ng-model="colName.value" class="colTableInput"></td>
-            </tr>
-
-<!--             <tr>
-                <td class="colTableLeftColumn">Display Width (px):</td>
-				<td><input type="text" name="displayWidth" ng-model="displayWidth" class="colTableInput"></td>            
-			</tr> -->
-            
-            <tr>
-                <td class="colTableLeftColumn">Display Alignment: </td>
-				<td>
-					<select name="displayAlignment" b2b-dropdown ng-model="selectedDisplayAlignment.value" placeholder-text="Select">
-						<option b2b-dropdown-list option-repeat="d in displayAlignmentOptions" value="{{d.value}}">{{d.text}}</option>
-                    </select>
-				</td>
-            </tr>
-            
-            <tr>
-                <td class="colTableLeftColumn">Display Header Alignment:</td>
-				<td>
-					<select name="displayHeaderAlignment" b2b-dropdown ng-model="selectedDisplayHeaderAlignment.value" placeholder-text="Select">
-						<option b2b-dropdown-list option-repeat="d in displayAlignmentOptions" value="{{d.value}}">{{d.text}}</option>
-                    </select>
-				</td>
-            </tr>                        
-
-            <tr>
-                <td class="colTableLeftColumn">Sortable:</td>
-				<td>
-					<select name="sortable" b2b-dropdown ng-model="sortable.value" placeholder-text="Select">
-						<option b2b-dropdown-list option-repeat="d in ynOptions" value="{{d.value}}">{{d.text}}</option>
-                    </select>
-				</td>
-            </tr>                        
-
-            <tr>
-                <td class="colTableLeftColumn">Visible:</td>
-				<td>
-					<select name="visible" b2b-dropdown ng-model="visible.value" placeholder-text="Select">
-						<option b2b-dropdown-list option-repeat="d in ynOptions" value="{{d.value}}">{{d.text}}</option>
-                    </select>
-				</td>
-            </tr>                        
-
-             <tr>
-                <td class="colTableLeftColumn" style="width:350px;">Drill-down Link:</td>
-				<td id="drilldownOption">
-					<select name="drillDown" b2b-dropdown ng-model="selectedDrillDownReport.value" placeholder-text="Select">
-						<option  b2b-dropdown-list option-repeat="d in drilldownReports" value="{{d.id}}">{{d.name}}</option>
-                    </select>
-				</td>
-            </tr>                         
-
-
-        </tbody>
-      </table>
-      </div>				
-					<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
-		<div class="cta-button-group in">
-					<button class="btn btn-alt btn-small" type="button"  ng-click="save()">Save</button>
-			<button class="btn btn-alt btn-small" type="button"
-				ng-click="cancel()">Cancel</button>
+</div>
+<div class="b2b-modal-body">
+		<div ng-show="processingData" class="span loader-container">
+			<i class="icon-primary-spinner" role="img"
+				aria-label="Please wait while we load your content"></i>
 		</div>
-	</div>
-		</form>
-		<br />
-	</div>
-</div>
\ No newline at end of file
+	
+		<div id="columnEditTable" ng-hide="processingData">
+			<table class="striped">
+				<tbody>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Column ID:</td>
+						<td>{{colInfo.colId}}</td>
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Column Name:</td>
+						<td>{{colInfo.colName}}</td>
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Depends on formfield:</td>
+						<td><input type="text" name="dependsOnFF"
+							ng-model="colInfo.depeondsOnForField" class="colTableInput"></td>
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Datatype:</td>
+						<td>
+							<select id="dataTypeDD" name="dataTypeDD" aria-describedby="dataTypeDD" b2b-dropdown placeholder-text="Select Data Type" ng-model="colInfo.dataType">
+					            <option b2b-dropdown-list option-repeat="d in dataTypeOptions" value="{{d.value}}">{{d.text}}</option>
+					        </select>
+					    </td>
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Group By Pos:</td>
+						<td>
+							<input type="text" name="groupByPos" ng-model="colInfo.groupByPos" class="colTableInput">
+						</td>
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Custom Text for Sub-Total:</td>
+						<td><input type="text" name="subTotalCus"
+							ng-model="colInfo.subTotalCustomText" class="colTableInput"></td>
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Hide Repeated Values:</td>
+						<td>
+							<label for="noWrap" class="checkbox">		
+								<input id="hideFormFieldsRun" type="checkbox" ng-model="colInfo.hideRepeatedKey" />	<i class="skin"></i>
+							</label>	
+						</td>
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Multi Group Column Level:</td>
+						<td>
+							<select id="mgcLevel" name="mgcLevel" aria-describedby="mgcLevel" b2b-dropdown placeholder-text="Select Level" ng-model="colInfo.level">
+					            <option b2b-dropdown-list option-repeat="d in multiGroupColLevel" value="{{d.value}}">{{d.text}}</option>
+					        </select>						
+					    </td>
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Multi group Column Range : Colspan:</td>
+						<td>
+							<input type="text" name="colSpan" ng-model="colInfo.colspan" class="colTableInput">
+						</td>
+					</tr>					
+					<!-- <tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Dataformat:</td>
+						<td>
+							<select id="mgcLevel" name="mgcLevel" aria-describedby="mgcLevel" b2b-dropdown placeholder-text="Select Level" ng-model="colInfo.level">
+					            <option b2b-dropdown-list option-repeat="d in multiGroupColLevel" value="{{d.value}}">{{d.text}}</option>
+					        </select>						
+					    </td>
+					</tr> -->
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Display Name:</td>
+						<td>
+							<input type="text" name="colSpan" ng-model="colInfo.displayName" class="colTableInput">
+						</td>
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Display Width (In Pxls):</td>
+						<td>
+							<input type="text" id="displayWidth" name="displayWidth" ng-model="colInfo.displayWidth" class="colTableInput">
+						</td>
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">No Wrap ?:</td>
+						<td>
+							<label for="noWrap" class="checkbox">		
+								<input id="noWrap" type="checkbox" ng-model="colInfo.noWrap" /><i class="skin"></i>
+							</label>
+						</td>
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Indent Parameter to display value:</td>
+						<td>
+							<select id="indentPara" name="indentPara" aria-describedby="indentPara" b2b-dropdown placeholder-text="Select Indent" ng-model="colInfo.indentation">
+					            <option b2b-dropdown-list option-repeat="d in indentValues" value="{{d.value}}">{{d.text}}</option>
+					        </select>							
+					    </td>
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Display Alignment:</td>
+						<td>
+							<select id="displayAlign" name="displayAlign" aria-describedby="displayAlign" b2b-dropdown placeholder-text="Select Display Alignment" ng-model="colInfo.displayAlignment">
+					            <option b2b-dropdown-list option-repeat="d in displayAlignmentOptions" value="{{d.value}}">{{d.text}}</option>
+					        </select>						
+					    </td>
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Display Header Alignment:</td>
+						<td>
+							<select id="displayHAlign" name="displayHAlign" aria-describedby="displayAlign" b2b-dropdown placeholder-text="Select Display Header Alignment" ng-model="colInfo.displayHeaderAlignment">
+					            <option b2b-dropdown-list option-repeat="d in displayAlignmentOptions" value="{{d.value}}">{{d.text}}</option>
+					        </select>						
+					    </td>
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Sortable:</td>
+						<td>
+							<label for="sortable" class="checkbox">					
+								<input id="sortable" type="checkbox" ng-model="colInfo.sortable" /><i class="skin"></i>				
+							</label>		
+					    </td>
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Visible:</td>
+						<td>
+						   <label for="visibleCheck" class="checkbox">					
+								<input id="visibleCheck" type="checkbox" ng-model="colInfo.visible" /><i class="skin"></i>
+							</label>						
+					    </td>	
+					</tr>
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Drill-down Link:	<a href="javascript:void(0);" ng-click="getDrillReportFormField(colInfo.drilldownURL,colInfo.drilldownParams)"><span class="icon-misc-pen" ></span></a></td>
+						<td id="drilldownOption">
+							<select name="drillDown" b2b-dropdown ng-model="colInfo.drilldownURL">
+								<option b2b-dropdown-list option-repeat="d in drilldownReports" value="{{d.id}}">{{d.name}}</option>
+							</select>					
+						</td>						
+					</tr> 
+					
+					<tr ng-hide="!isEditCol">
+						<td class="colTableLeftColumn">Total for the column:</td>
+						<td id="totalForTheCol">
+							<select name="totalForTheCol" b2b-dropdown ng-model="colInfo.displayTotal" placeholder-text="Select">
+								<option b2b-dropdown-list option-repeat="d in totalForTheColList" 	value="{{d.id}}">{{d.name}}</option>
+							</select>
+						</td>
+					</tr> 
+					<tr >
+						<table class="striped" ng-repeat="ff in drilDownFormField" ng-init="outerIndex=$index" ng-show="!isEditCol">
+							<thead> 
+								<tr>
+									<th>{{ff.name}}</th>
+									<th></th>
+								</tr>
+							</thead>
+							<tbody type="body" ng-repeat="dd in drilDownValues[$index]" ng-init="innerIndex=$index">
+								<tr>
+									<td>
+										<label for="{{dd.radioGroup}}" class="radio">
+							                <input type="radio" ng-model="selectedDrillReportFormField[outerIndex]"  id="{{dd.radioGroup}}" name="optionsRadio{{outerIndex}}" value="{{dd.radioGroup}}">
+							                <i class="skin"></i>
+							            </label>
+									</td>
+									<td>{{ dd.selection }} </td>
+									<td ng-if="dd.selection=='Value set'" ng-bind="dd.value"></td>
+									<td  ng-if='dd.selection=="No Value"'>
+											Accept default
+									</td>
+									<td  ng-if='dd.selection=="Fixed Value"'>
+										<div class="field-group">
+											<input id="emptyMessage" ddh-reset="" class="span12" type="text" data-ng-model="drillDownParams[outerIndex].valValue">
+										</div>	
+									</td>
+									<td  ng-if='dd.selection=="Value of Column"'>
+										<select name="drillDown" b2b-dropdown ng-model="drillDownParams[outerIndex].valColId" placeholder-text="Select">
+											<option b2b-dropdown-list option-repeat="d in childReportCol" value="{{d.id}}">{{d.name}}</option>
+										</select>
+									</td>
+									<td  ng-if='dd.selection=="Value of form field"'>
+										<select name="drillDownField" b2b-dropdown ng-model="drillDownParams[outerIndex].valFieldId" placeholder-text="Select">
+											<option b2b-dropdown-list option-repeat="d in childReportFF" value="{{d.id}}">{{d.name}}</option>
+										</select>									
+									</td>
+								</tr>
+							</tbody>
+						</table>
+					</tr>
+					
+					<!-- <tr>
+						<td class="colTableLeftColumn">Advanced Display Formatting:</td>
+						<td id="drilldownOption">
+							<select name="drillDown" b2b-dropdown ng-model="colInfo.drilldownURL" placeholder-text="Select">
+								<option b2b-dropdown-list option-repeat="d in drilldownReports" 	value="{{d.id}}">{{d.name}}</option>
+							</select>
+						</td>
+					</tr>  -->
+				
+				</tbody>
+			</table>
+		</div>
+		
+</div>
+<div class="b2b-modal-footer ng-scope">
+			<div class="cta-button-group in">
+				<button class="btn btn-alt btn-small" type="button" ng-show="isEditCol"
+					ng-click="save()">Save</button>
+				<button class="btn btn-alt btn-small" type="button" ng-hide="isEditCol"
+					ng-click="complete()">Complete</button>
+				<button class="btn btn-alt btn-small" type="button"
+					ng-click="cancel()">Cancel</button>
+			</div>
+		</div>
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-formfield-edit.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-formfield-edit.html
index c88eb596..3c17ff7b 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-formfield-edit.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-formfield-edit.html
@@ -1,149 +1,154 @@
 <style>
 #columnEditTable table tbody td {
-    border: none;
+	border: none;
 }
 
 #columnEditTable table tbody tr {
-    border: none;
+	border: none;
 }
 
 .colTableLeftColumn {
 	width: 45%;
 	text-align: right;
-	vertical-align:middle;
+	vertical-align: middle;
 }
 
 .colTableInput {
-	width:220px;
+	width: 220px;
 }
 
-#columnEditTable .selectWrap{
-	width:220px;
+#columnEditTable .selectWrap {
+	width: 220px;
+}
+table {
+     border-bottom: none;
 }
 </style>
 
-<div style="height: 700px;">
-    <div class="b2b-modal-header ng-scope in">
-        <h2 id="myModalLabel" modal-title="">Report Form Field - Edit</h2>
-			<div class="corner-button in">
-			<button type="button" class="close" aria-label="Close"
-				ng-click="$dismiss('cancel')"></button>
-		</div>
+<div class="b2b-modal-header">
+	<h2 id="myModalLabel" modal-title="">Report Form Field - Edit</h2>
+	<div class="corner-button in">
+		<button type="button" class="close" aria-label="Close"
+			ng-click="$dismiss('cancel')"></button>
 	</div>
-	<div class="b2b-modal-body ng-scope ng-isolate-scope in"  style="margin-bottom: -50px;">
-		<form name="workflowForm" class="css-form" novalidate>
-			
-<!-- 			<div class="form-row input-emphasized-field">
-				<label class="span12 input-emphasized" for="textinputID-2a">The selected report will be removed. Do you want to continue</label>
-			</div> -->
-	<div id="columnEditTable">
-    <table class="striped">
-<!--         <caption><span>Table caption</span></caption> -->
-<!--         <thead>
-            <tr>
-                <th>Column ID:</th>
-                <th>Name</th>
-                <th>ID</th>
-                <th>Edit</th>
-            </tr>
-        </thead> -->
-        <tbody>
-<!--             <tr>
-                <td class="colTableLeftColumn">Field ID:</td>
-                <td>{{formFieldEditData.fieldId}}</td>
-            </tr> -->
-
-            <tr>
-                <td class="colTableLeftColumn">Field Name:</td>
-                <td><input type="text" name="displayName" ng-model="fieldName.value" class="colTableInput"></td>
-            </tr>
-            
-            <tr>
-                <td class="colTableLeftColumn">Field Type: </td>
-				<td>
-					<select name="displayAlignment" b2b-dropdown ng-model="selectedFieldType.value" placeholder-text="Select">
-						<option b2b-dropdown-list option-repeat="d in fieldTypeOptions" value="{{d.value}}">{{d.text}}</option>
-                    </select>
-				</td>
-            </tr>
-            
-            <tr>
-                <td class="colTableLeftColumn">Visible:</td>
-				<td>
-					<select name="displayHeaderAlignment" b2b-dropdown ng-model="selectedVisible.value" placeholder-text="Select">
-						<option b2b-dropdown-list option-repeat="d in ynOptions" value="{{d.value}}">{{d.text}}</option>
-                    </select>
-				</td>
-            </tr>
-            
-            <tr>
-                <td class="colTableLeftColumn">SQL as Default Value:</td>
-				<td>
-	                <label for="checkbox1" class="checkbox">
-	                    <input id="checkbox1" type="checkbox" ng-model="sqlDefaultValueSelected.value" /><i class="skin"></i><span></span>
-	                </label>
-				</td>
-            </tr>
-                                    
-            <tr ng-hide="sqlDefaultValueSelected.value">	
-                <td class="colTableLeftColumn">Default Value:</td>
-                <td><input type="text" name="defaultValue" ng-model="defaultValue.value" class="colTableInput"></td>
-            </tr>
-
-
-            <tr ng-show="sqlDefaultValueSelected.value">
-                <td class="colTableLeftColumn">Default SQL:</td>
-                <td>
-                <textarea b2b-reset b2b-dragon-input b2b-reset-textarea ng-model="fieldDefaultSQL.value" style="height:80px">
-                </textarea>                
-                </td>
-                <td>
-                <p><button ng-click="formFieldVerifySQL(fieldDefaultSQL.value)" class="btn btn-alt btn-small">Verify</button></p>
-                </td>
-            </tr>
-            
-<!--             <tr>
-                <td class="colTableLeftColumn">Verify Field Value As: </td>
-				<td>
-					<select name="displayAlignment" b2b-dropdown ng-model="selectedVerifyFieldValue.value" placeholder-text="Select">
-						<option b2b-dropdown-list option-repeat="d in verifyFieldValueOptions" value="{{d.value}}">{{d.text}}</option>
-                    </select>
-				</td>
-            </tr> -->
-            
-            <tr>
-                <td class="colTableLeftColumn">SQL Generating Custom List of Values:</td>
-                <td>
-                <textarea b2b-reset b2b-dragon-input b2b-reset-textarea ng-model="fieldSqlContent.value" style="height:80px">
-                </textarea>                
-                </td>
-                <td>
-                <p><button ng-click="formFieldVerifySQL(fieldSqlContent.value)" class="btn btn-alt btn-small">Verify</button></p>
-                </td>
-            </tr>
+</div>
+<div class="b2b-modal-body">
+	<div ng-show="dataProcessing" class="span loader-container">
+		<i class="icon-primary-spinner" role="img"
+			aria-label="Please wait while we load your content"></i>
+	</div>
+	<div id="columnEditTable" ng-hide="dataProcessing">
+		<table class="striped">
+			<tbody>
+				<tr>
+					<td class="colTableLeftColumn">Field Name:</td>
+					<td><input type="text" name="displayName"
+						ng-model="formFieldEditData.fieldName" class="colTableInput"></td>
+				</tr>
 
-<!--             <tr>
-                <td class="colTableLeftColumn">Drill-down Link:</td>
-				<td>
-					<select name="drillDown" b2b-dropdown ng-model="selectedDrillDownLink.value" placeholder-text="Select">
-						<option b2b-dropdown-list option-repeat="d in drillDownOptions" value="{{d.value}}">{{d.text}}</option>
-                    </select>
-				</td>
-            </tr>                         -->
+				<tr>
+					<td class="colTableLeftColumn">Field Type:</td>
+					<td><select name="fieldType" b2b-dropdown
+						ng-model="formFieldEditData.fieldType" placeholder-text="Select">
+							<option b2b-dropdown-list option-repeat="d in fieldTypeOptions"
+								value="{{d.value}}">{{d.text}}</option>
+					</select></td>
+				</tr>
+				<tr>
+					<td class="colTableLeftColumn">Visible:</td>
+					<td>
+						<select name="visible" b2b-dropdown	ng-model="formFieldEditData.visible">
+							<option b2b-dropdown-list option-repeat="d in ynOptions" value="{{d.value}}">{{d.text}}</option>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td class="colTableLeftColumn">Is used in Group By Clause?</td>
+					<td>
+						<label for="checkboxGrp" class="checkbox"> 
+						<input	id="checkboxGrp" type="checkbox" ng-model="formFieldEditData.groupFormField" /><i class="skin"></i><span></span>
+						</label>	
+					</td>
+				</tr>
+			 	<tr>
+					<td class="colTableLeftColumn">SQL as Default Value:</td>
+					<td>
+						<label for="cehckboxSql" class="checkbox"> <input
+							id="cehckboxSql" type="checkbox"
+							ng-model="sqlAsDefaultValue.value" /><i class="skin"></i><span></span>
+						</label>
+					</td>
+				</tr> 
+				<tr ng-show="sqlAsDefaultValue.value">
+					<td class="colTableLeftColumn">Default SQL:</td>
+					<td>
+						<textarea b2b-reset b2b-dragon-input b2b-reset-textarea
+							ng-model="formFieldEditData.fieldDefaultSQL" style="height: 80px">
+                		</textarea>
+                	</td>
+					<td>
+						<p>
+							<button ng-click="formFieldVerifySQL(formFieldEditData.fieldDefaultSQL)"
+								class="btn btn-alt btn-small">Verify</button>
+						</p>
+					</td>
+				</tr>
+				<tr ng-hide="formFieldEditData.fieldDefaultSQL">
+					<td class="colTableLeftColumn">Default Value:</td>
+					<td><input type="text" name="defaultValue"
+						ng-model="formFieldEditData.defaultValue" class="colTableInput"></td>
+				</tr>
 
 
-        </tbody>
-      </table>
-      </div>				
-					<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
-		<div class="cta-button-group in">
-					<button class="btn btn-alt btn-small" type="button"  ng-click="save()">Save</button>
-			<button class="btn btn-alt btn-small" type="button"
-				ng-click="cancel()">Cancel</button>
-		</div>
-		
+				<tr>
+					<td class="colTableLeftColumn">Verify Field Value As:</td>
+					<td><select name="visible" b2b-dropdown
+						ng-model="formFieldEditData.validationType" placeholder-text="Select">
+							<option b2b-dropdown-list option-repeat="d in verifyFieldValueOptions"
+								value="{{d.value}}">{{d.text}}</option>
+					</select></td>
+				</tr>
+				<tr>
+					<td class="colTableLeftColumn">SQL Generating Custom List of
+						Values:</td>
+					<td><textarea b2b-reset b2b-dragon-input b2b-reset-textarea
+							ng-model="formFieldEditData.fieldSQL" style="height: 80px">
+                </textarea></td>
+					<td>
+						<p>
+							<button ng-click="formFieldVerifySQL(formFieldEditData.fieldSQL)"
+								class="btn btn-alt btn-small">Verify</button>
+						</p>
+					</td>
+				</tr>
+				<tr>
+					<td class="colTableLeftColumn">Provide Predefined List of Values:	Do not use Predefined list - Generate list from database :</td>
+					<td>
+                		<input type="text" name="defaultValue" 	ng-model="predefinedValues.value" class="colTableInput">
+                	</td>
+					<td>
+						<p>
+							<button ng-click="addPredefinedValueList();"	class="btn btn-alt btn-small">Add to List</button>
+						</p>
+					</td>
+				</tr>
+				<tr>
+					<td class="colTableLeftColumn"></td>
+					<td>
+                		<div ng-repeat = "rowData in formFieldEditData.predefinedValueList">
+                			<span>{{rowData.id}}</span>
+                			<a ng-click="removePredefinedValueList(rowData.id)" class="icon-misc-trash"></a>
+                		</div>
+                	</td>
+				</tr>
+			</tbody>
+		</table>
 	</div>
-		</form>
-		<br />
+</div>
+<div class="b2b-modal-footer">
+	<div class="cta-button-group in">
+		<button class="btn btn-alt btn-small" type="button" ng-click="save()" ng-show="type=='edit'">Save</button>
+		<button class="btn btn-alt btn-small" type="button" ng-click="add()" ng-show="type=='add'">Add</button>
+		<button class="btn btn-alt btn-small" type="button" ng-click="cancel()">Cancel</button>
 	</div>
 </div>
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-test-run-sql.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-test-run-sql.html
index a7955cad..e3fda72b 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-test-run-sql.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-test-run-sql.html
@@ -1,62 +1,57 @@
-<style>
+<!-- <style>
 .colTableLeftColumn {
 	width: 45%;
 	text-align: right;
-	vertical-align:middle;
+	vertical-align: middle;
 }
 
 .colTableInput {
-	width:220px;
+	width: 220px;
 }
 
-#columnEditTable .selectWrap{
-	width:220px;
+#columnEditTable .selectWrap {
+	width: 220px;
 }
 </style>
-
-<div style="height: 700px;">
-    <div class="b2b-modal-header ng-scope in">
-        <h2 id="myModalLabel" modal-title="">SQL Test Run - {{isError?'Failed':'Executed'}}</h2>
-			<div class="corner-button in">
-			<button type="button" class="close" aria-label="Close"
-				ng-click="$dismiss('cancel')"></button>
-		</div>
+ -->
+<div class="b2b-modal-header">
+	<h2 id="myModalLabel" modal-title="">SQL Test Run -
+		{{isError?'Failed':'Executed'}}</h2>
+	<div class="corner-button in">
+		<button type="button" class="close" aria-label="Close"
+			ng-click="$dismiss('cancel')"></button>
 	</div>
-	<div class="b2b-modal-body ng-scope ng-isolate-scope in"  style="margin-bottom: -50px;">
-		<form name="workflowForm" class="css-form" novalidate>
-<!-- 			<div class="form-row input-emphasized-field">
-				<label class="span12 input-emphasized" for="textinputID-2a">The selected report will be removed. Do you want to continue</label>
-			</div> -->
-	<div>
-	
-	<div ng-show="isError">
-	<h2>Error Message:</h2><br>
-	<p>{{errormessage}}</p>
-	<h2>Stack Trace:</h2><br>
-	<p>{{stacktrace}}</p>
+</div>
+<div class="b2b-modal-body">
+		<div>
 
-	</div>
-    <table class="striped">
-         <thead>
-            <tr>
-                <th ng-repeat="colName in queryData.reportDataColumns">{{colName}}</th>
-            </tr>
-        </thead>
-        <tbody>
-            <tr ng-repeat="rowData in queryData.reportDataRows">
-                <td ng-repeat="keyName in queryData.reportDataColumns">{{rowData[keyName]}}</td>
-            </tr>
+			<div ng-show="isError">
+				<h2>Error Message:</h2>
+				<br>
+				<p>{{errormessage}}</p>
+				<h2>Stack Trace:</h2>
+				<br>
+				<p>{{stacktrace}}</p>
 
-        </tbody>
-      </table>
-      </div>				
-					<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
-		<div class="cta-button-group in">
-			<button class="btn btn-alt btn-small" type="button"
-				ng-click="close()">Close</button>
+			</div>
+			<table class="striped">
+				<thead>
+					<tr>
+						<th ng-repeat="colName in queryData.reportDataColumns">{{colName}}</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr ng-repeat="rowData in queryData.reportDataRows">
+						<td ng-repeat="keyName in queryData.reportDataColumns">{{rowData[keyName]}}</td>
+					</tr>
+
+				</tbody>
+			</table>
 		</div>
+
+</div>
+<div class="b2b-modal-footer ng-scope ng-isolate-scope in">
+	<div class="cta-button-group in">
+		<button class="btn btn-alt btn-small" type="button" ng-click="close()">Close</button>
 	</div>
-		</form>
-		<br />
-	</div>
-</div>
\ No newline at end of file
+</div>
-- 
cgit 1.2.3-korg