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>

1 files changed, 129 insertions, 124 deletions

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