From c081bd0a7db3f434e76c03a9ca0334539ee84470 Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Thu, 11 May 2017 09:38:56 -0400
Subject: [PORTAL-7] Features and repairs from 1707

This merges latest changes made to Raptor and other features.

Change-Id: I3a58f88e988ddadf52e1c0c782cdccd2b2ecf5e9
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 .../DS2-view-models/ds2-reports/all-reports.html   |   1 +
 .../ds2-reports/modal/report-wizard-col-edit.html  |  10 +-
 .../modal/report-wizard-drilldown-edit.html        | 150 +++++
 .../ds2-reports/report-chart-wizard.html           | 719 +++++++++++++++++++++
 .../DS2-view-models/ds2-reports/report-run.html    |  29 +-
 .../ds2-reports/wz_steps/report-step.html          |  10 +-
 6 files changed, 900 insertions(+), 19 deletions(-)
 create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-drilldown-edit.html
 create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-chart-wizard.html

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

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html
index c90f95b4..bbfddca6 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html
@@ -61,6 +61,7 @@
 	<script src="./app/fusion/scripts/DS2-controllers/ds2-reports/report-run-controller.js"></script>
 	<script src="./app/fusion/scripts/DS2-controllers/ds2-reports/report-step-controller.js"></script>
 	<script src="./app/fusion/scripts/DS2-controllers/ds2-reports/report-import-controller.js"></script>
+	<script src="./app/fusion/scripts/DS2-controllers/ds2-reports/report-chart-controller.js"></script>
 	<script src="./app/fusion/scripts/DS2-view-models/ds2-reports/directive/dynamicform.js"></script>
 	<script src="./app/fusion/scripts/DS2-controllers/ds2-reports/report-router.js"></script>
 		
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 ad081991..097d1795 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
@@ -99,14 +99,14 @@
 				</td>
             </tr>                        
 
-<!--             <tr>
-                <td class="colTableLeftColumn">Drill-down Link:</td>
+             <tr>
+                <td class="colTableLeftColumn" style="width:350px;">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 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>                         -->
+            </tr>                         
 
 
         </tbody>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-drilldown-edit.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-drilldown-edit.html
new file mode 100644
index 00000000..ec2134bf
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-drilldown-edit.html
@@ -0,0 +1,150 @@
+<style>
+#columnEditTable table tbody td {
+    border: none;
+}
+
+#columnEditTable table tbody tr {
+    border: none;
+}
+
+.colTableLeftColumn {
+	width: 45%;
+	vertical-align:center;
+}
+
+.colTableInput {
+	width:220px;
+}
+
+#columnEditTable .selectWrap{
+	width:220px;
+}
+
+</style>
+
+<div style="height: 700px;">
+    <div class="b2b-modal-header ng-scope in">
+        <h2 id="myModalLabel" modal-title="">Drill-down Parameters Configuration</h2>
+			<div class="corner-button in">
+			<button type="button" class="close" aria-label="Close"
+				ng-click="$dismiss('cancel')"></button>
+		</div>
+	</div>
+	<div class="b2b-modal-body ng-scope ng-isolate-scope in"  style="margin-bottom: -50px;">
+		<form name="workflowForm" class="css-form" novalidate>
+			
+	<div id="columnEditTable">
+    <table class="striped">
+        <tbody>
+ 
+        <fieldset role="radiogroup" radio-group-accessibility>
+            <tr ng-show="childReportFF.length>0">	
+            	<td colspan="2">
+            		<h2>User</h2>
+            	</td>       
+			</tr>            
+			
+            <tr ng-show="childReportFF.length>0">	
+                <td>
+                	<div class="form-row" role="radio" style="margin-top:0px;">
+			            <label for="optionsRadios1111" class="radio">
+			                <input type="radio" ng-model="selectedvalueradioGroup.name" id="optionsRadios1111" name="optionsRadio11" value="noValue" required>
+			                <i class="skin"></i>
+			                <span>No Value</span>
+			            </label>
+			        </div>                
+                </td>
+				<td style="margin-top:10px;">
+					<p>Accept Default</p>
+				</td>
+            </tr>
+            
+            <tr ng-show="childReportFF.length>0">	
+                <td>
+                	<div class="form-row" role="radio" style="margin-top:0px;">
+			            <label for="optionsRadios2222" class="radio">
+			                <input type="radio" ng-model="selectedvalueradioGroup.name" id="optionsRadios2222" name="optionsRadio11" value="fixedValue">
+			                <i class="skin"></i>
+			                <span>Fixed Value</span>
+			            </label>
+			        </div>             
+                </td>
+                <td><input type="text" name="defaultValue" ng-model="fixedValue.value" class="colTableInput"></td>                
+            </tr>
+            
+                                    
+            <tr ng-show="childReportFF.length>0">	
+                <td>
+                	<div class="form-row" role="radio" style="margin-top:0px;">
+			            <label for="optionsRadios333333" class="radio">
+			                <input type="radio" ng-model="selectedvalueradioGroup.name" id="optionsRadios333333" name="optionsRadio11" value="reportCol">
+			                <i class="skin"></i>
+			                <span>Value of Column</span>
+			        </div>
+                </td>
+				<td>
+					<select name="childReportColumn" b2b-dropdown ng-model="selectedChildReportColumn.value" placeholder-text="Select">
+						<option b2b-dropdown-list option-repeat="d in childReportCol" value="{{d.id}}">{{d.name}}</option>
+                    </select>
+				</td>
+                
+            </tr>
+            
+            <tr ng-show="childReportFF.length>0">	
+                <td>
+                	<div class="form-row" role="radio" style="margin-top:0px;">
+                		<label for="optionsRadios444444" class="radio">
+                			<input type="radio" ng-model="selectedvalueradioGroup.name" id="optionsRadios444444" name="optionsRadio11" value="reportFF">
+                			<i class="skin"></i>
+                		<span>Value of Form Field</span>
+        			</div>
+                </td>
+				<td>
+					<select name="childReportFormField" b2b-dropdown ng-model="selectedChildReportFormField.value" placeholder-text="Select">
+						<option b2b-dropdown-list option-repeat="d in childReportFF" value="{{d.id}}">{{d.name}}</option>
+                    </select>
+				</td>
+            </tr> 
+
+            <tr ng-show="childReportFF.length>0">	
+                <td>
+                	<div class="form-row" role="radio" style="margin-top:0px;">
+			            <label for="optionsRadios5555" class="radio">
+			                <input type="radio" ng-model="selectedvalueradioGroup.name" id="optionsRadios5555" name="optionsRadio11" value="valueSet" required>
+			                <i class="skin"></i>
+			                <span>Value Set</span>
+			            </label>
+			        </div>                
+                </td>
+				<td style="margin-top:10px;">
+					<p>Pass the value of the selected column if not empty, otherwise pass the value of the selected form field</p>
+				</td>
+            </tr>
+                       
+             </fieldset>
+
+			<tr>
+				<td colspan="2">
+					<h2>Parameter values not to be passed to the drill-down report</h2>       
+				</td>
+			</tr>            
+
+            <tr>
+                <td class="colTableLeftColumn">Suppress Values</td>
+                <td><input type="text" name="suppressValue" ng-model="suppressValues.value" 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="complete()">Complete</button>
+		</div>
+		
+	</div>
+		</form>
+		<br />
+	</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/report-chart-wizard.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-chart-wizard.html
new file mode 100644
index 00000000..16676d24
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-chart-wizard.html
@@ -0,0 +1,719 @@
+<style>
+table tbody td {
+    border: none;
+}
+
+table tbody tr {
+    border: none;
+}
+
+table{
+    border: none;
+    margin-bottom:0px;
+}
+
+#RangeTable{
+	margin-top: 5px;
+	border: 1px solid black;
+}
+</style>
+
+<div id="page-content">
+<h1 class="heading-page">Report Chart Configuration</h1>
+<!-- <div style="color:#2ca02c" ng-show="successSubmit">Your configurations have been successfully submitted</div> -->
+
+
+
+<div>
+<table>
+	<thead>
+	    <tr>
+	        <th width="30%">Chart Type</th>
+	        <th>Animate</th>
+	    </tr>
+	</thead>
+	
+    <tbody>
+        <tr>
+            <td>
+				<select name="chartType" b2b-dropdown ng-model="reportRunJson.chartTypeJSON.value" placeholder-text="Select">
+					<option b2b-dropdown-list option-repeat="d in chartTypeOptions" value="{{d.value}}">{{d.text}}</option>
+	            </select>
+            </td>
+            <td>
+                <label for="animateCheckbox" class="checkbox">
+                    <input id="animateCheckbox" type="checkbox" ng-model="reportRunJson.animation" /><i class="skin"></i><span></span>
+                </label>            
+			</td>
+        </tr>
+    </tbody>
+</table>
+
+<table>	
+	<thead>
+	    <tr>
+	        <th width="50px">Width (px)</th>
+	        <th>Height (px)</th>
+	    </tr>
+	</thead>
+    <tbody>
+        <tr>
+            <td>
+            <input type="text" name="displayName" ng-model="reportRunJson.width" style="width:100px;">
+            </td>
+            <td>
+            <input type="text" name="displayName" ng-model="reportRunJson.height" style="width:100px;">
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+<table>	
+	<thead>
+	    <tr>
+	        <th width="50px">Title</th>
+	    </tr>
+	</thead>
+    <tbody>
+        <tr>
+    		<fieldset role="radiogroup" radio-group-accessibility>
+            <td>
+            <label for="optionsRadiosShowTitleTrue" class="radio">
+                <input type="radio" ng-model="reportRunJson.showTitle" id="optionsRadiosShowTitleTrue" name="optionsRadiosShowTitleTrue" value="true">
+                <i class="skin"></i>
+                <span>Show</span>
+            </label>            
+            </td>
+            <td>
+            <label for="optionsRadiosShowTitleFalse" class="radio">
+                <input type="radio" ng-model="reportRunJson.showTitle" id="optionsRadiosShowTitleFalse" name="optionsRadiosShowTitleFalse" value="false">
+                <i class="skin"></i>
+                <span>Hide</span>
+            </label>            
+            </td>
+            </fieldset>
+        </tr>
+        
+    </tbody>
+</table>
+
+<table>	
+	<thead>
+	    <tr>
+	        <th width="30%">Domain Axis</th>
+	        <th  width="30%">Category</th>
+	        <th  width="40%"></th>
+	    </tr>
+	</thead>
+    <tbody>
+        <tr>
+            <td>
+				<select name="chartType" b2b-dropdown ng-model="reportRunJson.domainAxisJSON" placeholder-text="Select">
+					<option b2b-dropdown-list option-repeat="d in reportRunJson.chartColumnJSONList" value="{{d.value}}">{{d.title}}</option>
+	            </select>
+            </td>
+            <td>
+				<select name="chartType" b2b-dropdown ng-model="reportRunJson.categoryAxisJSON" placeholder-text="Select">
+					<option b2b-dropdown-list option-repeat="d in reportRunJson.chartColumnJSONList" value="{{d.value}}">{{d.title}}</option>
+	            </select>
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+
+	<div id="RangeTable">
+
+<table ng-repeat="rangeReport in reportRunJson.rangeAxisList">
+	<thead>
+	    <tr>
+	        <th width="25%">Range Axis</th>
+	        <th  width="10%">Y Axis</th>
+	        <th  width="20%">Chart Title</th>
+	        <th  width="22%">Color</th>
+	        <th  width="18%">Line Type</th>
+	        <th></th>	        
+	    </tr>
+	</thead>
+    <tbody>
+        <tr>
+            <td>
+				<select name="chartType" b2b-dropdown ng-model="rangeReport.rangeAxisLabelJSON.value" placeholder-text="Select">
+					<option b2b-dropdown-list option-repeat="d in reportRunJson.chartColumnJSONList" value="{{d.value}}">{{d.title}}</option>
+	            </select>
+            </td>
+            <td>
+            	<input type="text" name="displayName" ng-model="rangeReport.rangeYAxis" style="width:100px;">
+            </td>            <td>
+            	<input type="text" name="displayName" ng-model="rangeReport.rangeChartGroup" style="width:150px;">
+            </td>
+            <td>
+				<select name="chartType" b2b-dropdown ng-model="rangeReport.rangeColorJSON" placeholder-text="Select">
+					<option b2b-dropdown-list option-repeat="d in rangeColors" value="{{d.value}}">{{d.title}}</option>
+	            </select>
+            </td>
+            <td>
+				<select name="chartType" b2b-dropdown ng-model="rangeReport.rangeLineTypeJSON" placeholder-text="Select">
+					<option b2b-dropdown-list option-repeat="d in lineTypes" value="{{d.value}}">{{d.title}}</option>
+	            </select>
+            </td>
+            <td>
+            	<button ng-show="$index==0" type="submit" style="width: 90px; height:35px;margin-left:5px;" class="btn btn-secondary btn-small" ng-click="addRangeAxisRow()">Add</button>
+            	<button ng-hide="$index==0" type="submit" style="width: 90px; height:35px;margin-left:5px;" class="btn btn-secondary btn-small" ng-click="removeRangeAxisRow($index)">Remove</button>
+            </td>
+        </tr>
+      
+    </tbody>
+</table>
+</div>
+
+</div>
+             
+<div ng-show=false style="min-height:500px" data-ng-init="init()">
+	<div class="fn-ebz-container" >
+		<label class="fn-ebz-text-label">Chart Type</label><BR>
+		<div class="form-field" att-select="chartTypes" ng-model="reportRunJson.chartTypeJSON" placeholder="Select an Option" show-input-filter="true" ng-change="actionClicked()"></div>
+	</div>
+	
+	
+	<div class="fn-ebz-container" style="position:relative; top: -8px;">
+		<label class="fn-ebz-text-label">Animate</label><BR>
+			<div><input type="checkbox" ng-model="reportRunJson.animation" att-checkbox data-ng-value="true"></div>
+	</div>
+	<BR>
+	
+	<div class="fn-ebz-container" >
+		<label class="fn-ebz-text-label">Width (Px)</label><BR>
+		<input type="text"  name="chartWidth"  maxlength=4  only-digits ng-model="reportRunJson.width" style="width:80px"/>
+	</div> 
+	
+	<div class="fn-ebz-container" >
+		<label class="fn-ebz-text-label">Height (Px)</label><BR>
+		<input type="text" name="chartHeight" maxlength=4  only-digits ng-model="reportRunJson.height" style="width:80px"/>
+	</div>
+	<BR>
+	
+	<div class="fn-ebz-container">
+		<label class="fn-ebz-text-label">Title</label><BR>
+		<span><input  name="tle" type="radio" ng-model="reportRunJson.showTitle"  data-ng-value="true"/>Show</span>
+		<span><input name="tle" type="radio" ng-model="reportRunJson.showTitle" data-ng-value="false"/>Hide</span>
+	</div>
+	<BR>
+	
+
+	<div class="fn-ebz-container" >
+		<label class="fn-ebz-text-label">Domain Axis</label><BR>
+		<div class="form-field" att-select="reportRunJson.chartColumnJSONList" ng-model="reportRunJson.domainAxisJSON" placeholder="Select an Option" show-input-filter="true"></div>
+	</div>  
+	
+	<div class="fn-ebz-container" >
+		<label class="fn-ebz-text-label">Category</label><BR>
+		<div class="form-field" att-select="reportRunJson.chartColumnJSONList" ng-model="reportRunJson.categoryAxisJSON" placeholder="Select an Option" show-input-filter="true"></div>
+	</div>
+	<BR>
+
+<div style="border:2px;border-style:solid;border-color:#808080;margin-bottom:9px">	
+<div ng-repeat="rangeReport in reportRunJson.rangeAxisList">	
+	<div style="margin-left:5px">
+	<div class="fn-ebz-container">
+		<label class="fn-ebz-text-label">Range Axis</label><BR>
+		<div class="form-field" att-select="reportRunJson.chartColumnJSONList" 
+			ng-model="rangeReport.rangeAxisLabelJSON" placeholder="Select an Option" show-input-filter="true"></div>
+	</div>
+	
+	
+	<div class="fn-ebz-container" >
+		<label class="fn-ebz-text-label">Y Axis</label><BR>
+		<input id="yaxs" type="text" name="yAxis" maxlength=50 ng-model=rangeReport.rangeYAxis style="width:100px"/>
+	</div>
+	
+	<div class="fn-ebz-container" >
+		<label class="fn-ebz-text-label">Chart Title</label><BR>
+		<input type="text" name="chartTitle"  maxlength=50 ng-model="rangeReport.rangeChartGroup" style="width:200px"/>
+	</div>
+	
+	<div class="fn-ebz-container" >
+		<label class="fn-ebz-text-label">Color</label><BR>
+		<div class="form-field" att-select="rangeColors" ng-model="rangeReport.rangeColorJSON" placeholder="Select an Option" show-input-filter="true"></div>
+	</div>
+	
+	<div class="fn-ebz-container" >
+		<label class="fn-ebz-text-label">Line Type</label><BR>
+		<div class="form-field" att-select="lineTypes" ng-model="rangeReport.rangeLineTypeJSON" placeholder="Select an Option" show-input-filter="true"></div>
+	</div>
+	
+	<div class="fn-ebz-container" ng-show="reportRunJson.chartTypeJSON.value=='FlexTimeChart' || 
+			reportRunJson.chartTypeJSON.value=='AnnotationChart'" style="position:relative; top: -8px;">
+		<label class="fn-ebz-text-label">Area</label><BR>
+		<input type="checkbox" ng-model="rangeReport.showAsArea" att-checkbox data-ng-value="true">
+	</div>
+	
+	<div class="fn-ebz-container" style="position:relative; top: 25px;">
+	<a href="javascript:void(0)" ng-show="{{$index==0}}" style="float: right;" att-button btn-type="secondary" size="small" att-accessibility-click="13,32" 
+			ng-click="addRangeAxisRow(rangeReport);" >Add</a>
+	<a href="javascript:void(0)" ng-show="{{$index>0}}" style="float: right;" att-button btn-type="secondary" size="small" att-accessibility-click="13,32" ng-click="removeRangeAxisRow($index);" >
+			Remove</a>
+	  </div>
+	  </div>
+	 </div>
+	</div>
+	<BR>
+	
+<accordion close-others="true" css="att-accordion--no-box">
+	<accordion-group id="additionalOptions" heading="Additional Options"  child-length="10">
+	<div class="fn-ebz-container">
+		<label class="fn-ebz-text-label">Primary Axis Label</label><BR>
+		<input type="text" name="prAxis" maxlength=50 ng-model="reportRunJson.primaryAxisLabel" style="width:210px"/>
+	</div>
+	<div class="fn-ebz-container" >
+		<label class="fn-ebz-text-label">Secondary Axis Label</label><BR>
+		<input type="text" name="secAxis" maxlength=75 ng-model="reportRunJson.secondaryAxisLabel"  style="width:210px"/>
+	</div>
+	<BR>
+	<div class="fn-ebz-container" >
+		<label class="fn-ebz-text-label">Range Axis Minimum Range</label><BR>
+		<input type="text" name="rAxisMinRange" only-digits ng-model="reportRunJson.minRange" style="width:210px"/>
+	</div>
+	<div class="fn-ebz-container">
+		<label class="fn-ebz-text-label">Maximum Range</label><BR>
+		<input type="text" name="rAxisMaxRange" only-digits ng-model="reportRunJson.maxRange"  ng-maxLength="35" style="width:210px"/>
+	</div><BR>
+	</accordion-group>
+</accordion>
+	
+	
+	
+
+<div ng-show="reportRunJson.chartTypeJSON.value=='BarChart3D'">
+  
+  	<accordion close-others="true" css="att-accordion--no-box">
+	<accordion-group id="accBar" heading="Bar Chart Options"  child-length="10">
+  				
+	
+	<div style="border:2px;border-style:solid;border-color:#808080;margin-bottom:9px">
+		<div class="fn-ebz-container" style="position:relative;margin:10px;" >
+			<label class="fn-ebz-text-label">Orientation</label><BR>
+			<span><input  name="orient" type="radio" ng-model="reportRunJson.barChartOptions.verticalOrientation"  data-ng-value="true"/>Vertical</span>
+			<span><input name="orient" type="radio" ng-model="reportRunJson.barChartOptions.verticalOrientation" data-ng-value="false"/>Horizontal</span>
+		</div>
+	
+	<div class="fn-ebz-container" style="position:relative;margin:10px;">
+		<label class="fn-ebz-text-label">Stacked</label><BR>
+		<span><input  name="stack" type="radio" ng-model="reportRunJson.barChartOptions.stackedChart"  data-ng-value="true"/>Yes</span>
+		<span><input name="stack" type="radio" ng-model="reportRunJson.barChartOptions.stackedChart" data-ng-value="false"/>No</span>
+	</div>
+	
+	<div class="fn-ebz-container" style="position:relative;margin:10px;">
+		<label class="fn-ebz-text-label">Show Controls</label><BR>
+		<span><input  name="shwcontrol" type="radio" ng-model="reportRunJson.barChartOptions.displayBarControls"  data-ng-value="true"/>Yes</span>
+		<span><input name="shwcontrol" type="radio" ng-model="reportRunJson.barChartOptions.displayBarControls" data-ng-value="false"/>No</span>
+	</div>
+	
+	<div class="fn-ebz-container" style="position:relative;margin:10px;">
+		<label class="fn-ebz-text-label">XAxis Date Type</label><BR>
+		<span><input  name="xAxisDtype" type="radio" ng-model="reportRunJson.barChartOptions.xAxisDateType"  data-ng-value="true"/>Yes</span>
+		<span><input name="xAxisDtype" type="radio" ng-model="reportRunJson.barChartOptions.xAxisDateType" data-ng-value="false"/>No</span>
+	</div>
+	
+	<div class="fn-ebz-container" style="position:relative;margin:10px;">
+		<label class="fn-ebz-text-label">Display less XAxis tickers</label><BR>
+		<span><input  name="xTicker" type="radio" ng-model="reportRunJson.barChartOptions.minimizeXAxisTickers"  data-ng-value="true"/>Yes</span>
+		<span><input name="xTicker" type="radio" ng-model="reportRunJson.barChartOptions.minimizeXAxisTickers" data-ng-value="false"/>No</span>
+	</div><BR>
+	
+	<div class="fn-ebz-container" style="position:relative;margin:10px;">
+		<label class="fn-ebz-text-label">Is Time Axis?</label><BR>
+		<span><input  name="timeAxis" type="radio" ng-model="reportRunJson.barChartOptions.timeAxis"  data-ng-value="true"/>Yes</span>
+		<span><input name="timeAxis" type="radio" ng-model="reportRunJson.barChartOptions.timeAxis" data-ng-value="false"/>No</span>
+	</div>
+	
+	<div class="fn-ebz-container" style="position:relative;margin:10px;">
+		<label class="fn-ebz-text-label">Log Scale (Y Axis)</label><BR>
+		<span><input type="checkbox" ng-model="reportRunJson.barChartOptions.yAxisLogScale" att-checkbox data-ng-value="true"></span>
+		
+	</div>
+ </div>
+
+  </accordion-group>
+</accordion>
+</div>
+	
+	<div ng-show="reportRunJson.chartTypeJSON.value=='TimeSeriesChart'">
+	<!-- <div class="fn-ebz-text-label"><b>Time Series Chart Options</b></div><BR> -->
+	 <accordion close-others="true" css="att-accordion--no-box">
+		<accordion-group id="accTimeChart"  heading="Time Series Chart Options"  child-length="10">
+		
+		<div style="border:2px;border-style:solid;border-color:#808080;margin-bottom:9px">
+			<div style="margin-left:5px">
+			<div class="fn-ebz-container">
+				<label class="fn-ebz-text-label">Render as</label><BR>
+				<span><input  name="renderAs" type="radio" ng-model="reportRunJson.timeSeriesChartOptions.lineChartRenderer"  value="line"/>Line</span>
+				<span><input name="orient" type="radio" ng-model="reportRunJson.timeSeriesChartOptions.lineChartRenderer" value="area"/>Area</span>
+			</div>
+	
+		<div class="fn-ebz-container" style="position:relative;margin:10px;">
+			<label class="fn-ebz-text-label">X Axis Label</label><BR>
+			<span><input type="checkbox" ng-model="reportRunJson.timeSeriesChartOptions.showXAxisLabel" att-checkbox data-ng-value="true"></span>
+		</div><BR>
+		
+		<div class="fn-ebz-container" style="position:relative;bottom:10px;">
+			<label class="fn-ebz-text-label">X Axis <br>Tickers</label><BR>
+			<span style="position:relative;top:10px;"><input type="checkbox" ng-model="reportRunJson.timeSeriesChartOptions.addXAxisTicker" att-checkbox data-ng-value="true"></span>
+		</div>
+		
+		<div class="fn-ebz-container" style="position:relative;margin:20px;">
+			<label class="fn-ebz-text-label">Is Time Axis?</label><BR>
+			<span><input  name="timeAxisChart" type="radio" ng-model="reportRunJson.timeSeriesChartOptions.nonTimeAxis"  data-ng-value="true"/>Yes</span>
+			<span><input name="timeAxisChart" type="radio" ng-model="reportRunJson.timeSeriesChartOptions.nonTimeAxis" data-ng-value="false"/>No</span>
+		</div>
+		
+		<div class="fn-ebz-container" style="position:relative;margin:10px;">
+			<label class="fn-ebz-text-label">Multi Series?</label><BR>
+			<span><input  name="mSeries" type="radio" ng-model="reportRunJson.timeSeriesChartOptions.multiSeries"  data-ng-value="true"/>Yes</span>
+			<span><input name="mSeries" type="radio" ng-model="reportRunJson.timeSeriesChartOptions.multiSeries" data-ng-value="false"/>No</span>
+		</div>
+		 </div>
+		</div>
+	
+	 </accordion-group>
+	</accordion>
+	
+	</div>
+	
+	<div ng-show="reportRunJson.chartTypeJSON.value=='FlexTimeChart'">
+		
+		
+		<accordion close-others="true" css="att-accordion--no-box">
+		<accordion-group id="accFlexTimeChart"  heading="Flex Time Series Chart Options"  child-length="10">
+		
+		<!-- <div class="fn-ebz-text-label"><b>Flex Time Series Chart Options</b></div><BR>  -->
+		<div style="border:2px;border-style:solid;border-color:#808080;margin-bottom:9px">
+			<div style="margin-left:5px">
+		<div class="fn-ebz-container">
+			<label class="fn-ebz-text-label">Zoom-In Window</label><BR>
+			<span><input type="text" name="zWindow" only-digits maxlength=3 ng-model="reportRunJson.flexTimeSeriesChartOptions.zoomIn"></span>
+		</div>
+		
+		<div class="fn-ebz-container" style="position:relative;margin:10px;">
+			<label class="fn-ebz-text-label">Time Axis Type</label><BR>
+			<span><input  name="timeAxisType" type="radio" ng-model="reportRunJson.flexTimeSeriesChartOptions.timeAxisType"  value="weekly"/>Weekly</span>
+			<span><input name="timeAxisType" type="radio" ng-model="reportRunJson.flexTimeSeriesChartOptions.timeAxisType" value="daily"/>Daily</span>
+			<span><input name="timeAxisType" type="radio" ng-model="reportRunJson.flexTimeSeriesChartOptions.timeAxisType" value="hourly"/>Hourly</span>
+			<span><input name="timeAxisType" type="radio" ng-model="reportRunJson.flexTimeSeriesChartOptions.timeAxisType" value="30min"/>30 Min</span>
+		</div>
+	  </div>
+	 </div>
+		</accordion-group>
+	</accordion>
+	
+	</div>	
+	
+	
+	
+	
+	
+	
+	 
+	<!-- <div class="fn-ebz-text-label"><b>Common Options</b></div><BR>  -->
+	
+	<accordion close-others="true" css="att-accordion--no-box">
+	<accordion-group id="accCommonOptions"  heading="Common Options"  child-length="10">
+	
+	<div style="border:2px;border-style:solid;border-color:#808080;margin-bottom:9px">
+	<div style="margin-left:5px">
+	<div class="fn-ebz-container">
+		<label class="fn-ebz-text-label">Legend Angle</label><BR>
+		<span><input name="langle" type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" value="up45"/>up 45&deg;</span>
+		<span><input name="langle" type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" value="up90"/>up 90&deg;</span>
+ 	    <span><input name="langle" type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" value="down45"/>down 45&deg;</span>
+ 	    <span><input name="langle" type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" value="down90"/>down 90&deg;</span>
+ 	    <span><input name="langle" type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" value="standard"/>Standard</span>
+	</div>
+	
+	<div class="fn-ebz-container" style="position:relative;margin:15px;">
+		<label class="fn-ebz-text-label">Legend Position</label><BR>
+		<span><input  name="lgPosition" type="radio" ng-model="reportRunJson.commonChartOptions.legendPosition"  value="top"/>Top</span>
+		<span><input name="lgPosition" type="radio" ng-model="reportRunJson.commonChartOptions.legendPosition" value="bottom"/>Bottom</span>
+	</div><BR>
+	
+	<div class="fn-ebz-container">
+		<label class="fn-ebz-text-label">Legend</label><BR>
+		<span><input name="lgd" type="radio" ng-model="reportRunJson.commonChartOptions.hideLegend" data-ng-value="false"/>Yes</span>
+		<span><input name="lgd" type="radio" ng-model="reportRunJson.commonChartOptions.hideLegend" data-ng-value="true"/>No</span>
+	</div>
+	
+	<div class="fn-ebz-container" style="position:relative;margin:10px;">
+		<label class="fn-ebz-text-label">Animation</label><BR>
+		<span><input name="anmtate"  type="radio" ng-model="reportRunJson.commonChartOptions.animateAnimatedChart" data-ng-value="true" />Yes</span>
+		<span><input name="anmtate"  type="radio" ng-model="reportRunJson.commonChartOptions.animateAnimatedChart" data-ng-value="false"/>No</span>
+	</div><BR>
+	
+	<div class="fn-ebz-container">
+		<label class="fn-ebz-text-label">Top Margin</label><BR>
+		<input type="text" name="reportRunJson.commonChartOptions.topMargin" only-digits maxlength=3 ng-model="reportRunJson.commonChartOptions.topMargin" style="width:210px"/>
+	</div>
+	<div class="fn-ebz-container">
+		<label class="fn-ebz-text-label">Bottom Margin</label><BR>
+		<input type="text" name="reportRunJson.commonChartOptions.bottomMargin" only-digits maxlength=3 ng-model="reportRunJson.commonChartOptions.bottomMargin"  style="width:210px"/>
+	</div>
+	<div class="fn-ebz-container">
+		<label class="fn-ebz-text-label">Left Margin</label><BR>
+		<input type="text" name="reportRunJson.commonChartOptions.leftMargin" only-digits maxlength=3 ng-model="reportRunJson.commonChartOptions.leftMargin" style="width:210px"/>
+	</div>
+	<div class="fn-ebz-container">
+		<label class="fn-ebz-text-label">Right Margin</label><BR>
+		<input type="text" name="reportRunJson.commonChartOptions.rightMargin" only-digits maxlength=3 ng-model="reportRunJson.commonChartOptions.rightMargin" style="width:210px">
+	  </div><BR>
+	 </div>
+	</div>
+ </accordion-group>
+</accordion>
+	<br/><br/>
+	<a href="javascript:void(0)" att-button btn-type="primary" att-accessibility-click="13,32" ng-click="saveChartData();">Save</a>
+	<a href="report#/report_run/c_master={{reportRunJson.reportID}}&refresh=Y" att-button btn-type="primary" att-accessibility-click="13,32">Run</a>
+</div>
+
+<div>
+    <b2b-expanders class="mpc-expanders" is-open="additionalOptionOpen">            
+        <b2b-expander-heading>
+            <div class="row">    
+                <div class="span6">
+                    <div class="heading-medium b2b-blue" ng-class=" { 'b2b-toggle-header-active': !additionalOptionOpen, 'b2b-toggle-header-inactive': additionalOptionOpen } ">Additional Options</div>
+                    <p class="p-small">
+                    </p>                    
+                </div>
+                <div style="position: absolute;right: 250px;" class="span1">
+                	<i class="pull-right b2b-toggle-header-icon" b2b-expander-toggle b2b-accessibility-click="13,32" expand-icon="icon-primary-collapsed" collapse-icon="icon-primary-expanded" tabindex="0" aria-posinset="1" aria-setsize="2"></i>
+                </div>  
+            </div>    
+        </b2b-expander-heading>               
+        <b2b-expander-body>                   
+            <div>
+<!-- 	<div style="border:2px;border-style:solid;border-color:#808080;margin-bottom:9px"> -->
+<!-- 	<div style="margin-left:0px">
+	
+	<div class="fn-ebz-container">
+		<label class="fn-ebz-text-label">Primary Axis Label</label><BR>
+		<input type="text" name="prAxis" maxlength=50 ng-model="reportRunJson.primaryAxisLabel" style="width:210px"/>
+	</div>
+	<div class="fn-ebz-container" >
+		<label class="fn-ebz-text-label">Secondary Axis Label</label><BR>
+		<input type="text" name="secAxis" maxlength=75 ng-model="reportRunJson.secondaryAxisLabel"  style="width:210px"/>
+	</div>
+	<BR>
+	<div class="fn-ebz-container" >
+		<label class="fn-ebz-text-label">Range Axis Minimum Range</label><BR>
+		<input type="text" name="rAxisMinRange" only-digits ng-model="reportRunJson.minRange" style="width:210px"/>
+	</div>
+	<div class="fn-ebz-container">
+		<label class="fn-ebz-text-label">Maximum Range</label><BR>
+		<input type="text" name="rAxisMaxRange" only-digits ng-model="reportRunJson.maxRange"  ng-maxLength="35" style="width:210px"/>
+	</div><BR>		
+	
+	 </div> -->
+	 
+<div id="RangeTable">
+<table>
+	<thead>
+	    <tr>
+	        <th width="30%">Primary Axis Label</th>
+	        <th  width="30%">Secondary Axis Label</th>
+	        <th></th>	        
+	    </tr>
+	</thead>
+    <tbody>
+        <tr>
+            <td>
+            	<input type="text" name="primaryAxisLabel" ng-model="reportRunJson.primaryAxisLabel" style="width:200px;">
+            </td>
+            <td>
+            	<input type="text" name="secondaryAxisLabel" ng-model="reportRunJson.secondaryAxisLabel" style="width:200px;">
+            </td>
+        </tr>
+    </tbody>
+</table>
+<table>
+	<thead>
+	    <tr>
+	        <th width="30%">Range Axis Minimum Range</th>
+	        <th  width="30%">Maximum Range</th>
+	        <th></th>
+	    </tr>
+	</thead>
+    <tbody>
+        <tr>
+            <td>
+            	<input type="text" name="minRange" ng-model="reportRunJson.minRange" style="width:200px;">
+            </td>
+            <td>
+            	<input type="text" name="maxRange" ng-model="reportRunJson.maxRange" style="width:200px;">
+            </td>
+        </tr>
+    </tbody>
+</table>
+</div>            	
+            </div>
+        </b2b-expander-body>     
+    </b2b-expanders>
+
+    <b2b-expanders class="mpc-expanders" is-open="commonOptionOpen">            
+        <b2b-expander-heading>
+            <div class="row">    
+                <div class="span6">
+                    <div class="heading-medium b2b-blue" ng-class=" { 'b2b-toggle-header-active': !commonOptionOpen, 'b2b-toggle-header-inactive': commonOptionOpen } ">Common Options</div>
+                    <p class="p-small">
+                    </p>                    
+                </div>
+                <div style="position: absolute;right: 250px;" class="span1">
+                	<i class="pull-right b2b-toggle-header-icon" b2b-expander-toggle b2b-accessibility-click="13,32" expand-icon="icon-primary-collapsed" collapse-icon="icon-primary-expanded" tabindex="0" aria-posinset="1" aria-setsize="2"></i>
+                </div>  
+            </div>    
+        </b2b-expander-heading>               
+        <b2b-expander-body>                   
+            <div >
+                <div>
+					<div style="border:2px;border-style:solid;border-color:#808080;margin-bottom:9px">
+						<div style="margin-left:0px">
+							<table>	
+							<thead>
+							    <tr>
+							        <th>Legend Angle</th>
+							        <th>Legend Position</th>
+							    </tr>
+							</thead>
+						    <tbody>
+						        <tr>
+						    		<fieldset role="radiogroup" radio-group-accessibility>
+						            <td>
+						            <label for="optionsRadios1" class="radio">
+						                <input type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" id="optionsRadios1" name="optionsRadio1" value="up45">
+						                <i class="skin"></i>
+						                <span>up 45&deg;</span>
+						            </label>            
+						            <label for="optionsRadios2" class="radio">
+						                <input type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" id="optionsRadios2" name="optionsRadio2" value="up90">
+						                <i class="skin"></i>
+						                <span>up 90&deg;</span>
+						            </label>            
+						            <label for="optionsRadios3" class="radio">
+						                <input type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" id="optionsRadios3" name="optionsRadio3" value="down45">
+						                <i class="skin"></i>
+						                <span>down 45&deg;</span>
+						            </label>            
+						            <label for="optionsRadios4444" class="radio">
+						                <input type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" id="optionsRadios4444" name="optionsRadio44" value="down90">
+						                <i class="skin"></i>
+						                <span>down 90&deg;</span>
+						            </label>            
+						            <label for="optionsRadios5555" class="radio">
+						                <input type="radio" ng-model="reportRunJson.commonChartOptions.legendLabelAngle" id="optionsRadios5555" name="optionsRadio55" value="Standard">
+						                <i class="skin"></i>
+						                <span>Standard</span>
+						            </label>            
+						            </td>    
+						            </fieldset>
+						            
+						            <fieldset role="radiogroup" radio-group-accessibility>
+						            <td>
+						            <label for="optionsRadiosTop" class="radio">
+						                <input type="radio" ng-model="reportRunJson.commonChartOptions.legendPosition" id="optionsRadiosTop" name="optionsRadioTop" value="Top">
+						                <i class="skin"></i>
+						                <span>Top</span>
+						            </label>            
+						            <label for="optionsRadiosBottom" class="radio">
+						                <input type="radio" ng-model="reportRunJson.commonChartOptions.legendPosition" id="optionsRadiosBottom" name="optionsRadioBottom" value="Bottom">
+						                <i class="skin"></i>
+						                <span>Bottom</span>
+						            </label>            
+						            </td>                    
+						            </fieldset>
+						        </tr>
+						    </tbody>
+						</table>
+
+
+						<table>	
+						<thead>
+						    <tr>
+						        <th width="20%">Legend</th>
+						        <th width="20%">Animation</th>
+						        <th></th>
+						    </tr>
+						</thead>
+					    <tbody>
+					        <tr>
+					    		<fieldset role="radiogroup" radio-group-accessibility>
+					            <td>
+					            <label for="optionsRadiosHideLegendFalse" class="radio">
+					                <input type="radio" ng-model="reportRunJson.commonChartOptions.hideLegend" id="optionsRadiosHideLegendFalse" name="optionsRadiosHideLegendFalse" value="false">
+					                <i class="skin"></i>
+					                <span>Yes</span>
+					            </label>            
+					            <label for="optionsRadiosHideLegendTrue" class="radio">
+					                <input type="radio" ng-model="reportRunJson.commonChartOptions.hideLegend" id="optionsRadiosHideLegendTrue" name="optionsRadiosHideLegendTrue" value="true">
+					                <i class="skin"></i>
+					                <span>No</span>
+					            </label>            
+					            </td>    
+					            </fieldset>
+					            
+					            <fieldset role="radiogroup" radio-group-accessibility>
+					            <td>
+					            <label for="optionsRadiosAnimateChartTrue" class="radio">
+					                <input type="radio" ng-model="reportRunJson.commonChartOptions.animateAnimatedChart" id="optionsRadiosAnimateChartTrue" name="optionsRadiosAnimateChartTrue" value="true">
+					                <i class="skin"></i>
+					                <span>Yes</span>
+					            </label>            
+					            <label for="optionsRadiosAnimateChartFalse" class="radio">
+					                <input type="radio" ng-model="reportRunJson.commonChartOptions.animateAnimatedChart" id="optionsRadiosAnimateChartFalse" name="optionsRadiosAnimateChartFalse" value="false">
+					                <i class="skin"></i>
+					                <span>No</span>
+					            </label>            
+					            </td>                    
+					            </fieldset>
+					            <td>
+					            </td>
+					        </tr>
+					    </tbody>
+					</table>
+
+					<table>
+						<thead>
+						    <tr>
+						        <th width="25%">Top Margin</th>
+						        <th width="25%">Bottom Margin</th>
+						        <th width="25%">Left Margin</th>
+						        <th width="25%">Right Margin</th>
+						    </tr>
+						</thead>
+					    <tbody>
+					        <tr>
+					            <td>
+					            	<input type="text" name="topMargin" ng-model="reportRunJson.commonChartOptions.topMargin" style="width:200px;">
+					            </td>
+					            <td>
+					            	<input type="text" name="bottomMargin" ng-model="reportRunJson.commonChartOptions.bottomMargin" style="width:200px;">
+					            </td>
+					            <td>
+					            	<input type="text" name="leftMargin" ng-model="reportRunJson.commonChartOptions.leftMargin" style="width:200px;">
+					            </td>
+					            <td>
+					            	<input type="text" name="rightMargin" ng-model="reportRunJson.commonChartOptions.rightMargin" style="width:200px;">
+					            </td>
+					        </tr>
+					    </tbody>
+					</table>
+				</div>                	
+            </div>
+           </div>
+        </b2b-expander-body>     
+    </b2b-expanders>
+
+</div>
+</div>
+	<div>
+	<button type="submit" style="width: 90px; height:35px;margin-top:20px; margin-left:5px;" class="btn btn-alt btn-small" ng-click="saveChartData();">Save</button>	
+	<a href="report#/report_run/c_master={{reportRunJson.reportID}}&refresh=Y">
+	<button type="submit" style="width: 90px; height:35px;margin-top:20px; margin-left:5px;" class="btn btn-alt btn-small">Run</button>
+	</a>
+	</div>    
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html
index 82b7e878..70b24925 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/report-run.html
@@ -55,23 +55,28 @@ body {
 }
 </style>
 
-<div id="page-content">
-	<!-- <h1 class="heading2">{{reportData.reportName}}  -->  
-	<h1 class="heading-page">{{reportData.reportHeading}}
-	<a ng-href="{{reportEditURL}}" ng-show="reportData.allowEdit" class="icon-edit" style="font-size:20px;"></a>
-	
-	&nbsp;&nbsp;&nbsp;<a ng-href="{{reportChartURL}}" ng-show="reportData.allowEdit && reportData.chartWizardAvailable" class="icon-bar-chart-vertical" style="font-size:20px;"></a>
-	&nbsp;&nbsp;&nbsp;<span  ng-show="reportData.allowEdit && showFormFields" ><input type="checkbox" ng-model="showFormFieldIds" ng-true-value="Hide_IDs" ng-false-value="Show_IDs" att-toggle-main></span>
-	
-	<!-- &nbsp;&nbsp;&nbsp;<a ng-href="{{reportChartURLNew}}" ng-show="reportData.allowEdit" class="icon-bar-chart-horizontal" style="font-size:20px;"></a> -->
-	</h1>
-	
+<div id="page-content">	
+	<div style="width:100%; overflow:hidden;">
+		<div style="float:left;"><h1 class="heading-page">{{reportData.reportHeading}}</h1></div>
+		<div style="float:left; margin-left: 10px; margin-right: 10px;">
+			<a style="font-size:180%;" ng-href="report#/report_wizard/{{reportData.reportID}}" class="icon-misc-pen" ng-show="reportData.allowEdit"></a>
+		</div>
+		<div style="float:left; margin-left: 5px; margin-right: 10px;">
+			<a style="font-size:180%;" ng-href="report#/report_chart/{{reportData.reportID}}" class="icon-misc-piechart" ng-show="reportData.allowEdit"></a>
+		</div>
+
+	    <div ng-show ="reportData.allowEdit && showFormFields" style="margin-top:5px;">
+	        <label for="checkbox1" class="checkbox">
+	            <input id="checkbox1" type="checkbox" ng-model="showFormFieldId.value" /><i class="skin"></i><span>show IDs</span>
+	        </label>
+	    </div>
+	</div>
 	<h3 class="heading3">{{reportData.reportSubTitle}} </h3>
 	  
 	  <div ng-show="isInProgress" style="font-size:50px;color:#2ca02c">Loading...</div>
 	  
 	  <form ng-show="showFormFields" class="row section-row" style="margin: 10px">
-	    <form-builder ng-form-fields="reportData.formFieldList" ng-show-field-id="showFormFieldIds" ng-num-form-cols="reportData.numFormCols" ng-model="formFieldSelectedValues" ng-trigger-method="triggerOtherFormFields"></form-builder>
+	    <form-builder ng-form-fields="reportData.formFieldList" ng-show-field-id="showFormFieldId.value" ng-num-form-cols="reportData.numFormCols" ng-model="formFieldSelectedValues" ng-trigger-method="triggerOtherFormFields"></form-builder>
 	    <br><br>
 	    <button type="submit" style="width: 90px; height:35px;margin-top:20px; margin-left:5px;" class="btn btn-alt btn-small" ng-click="runReport()">Run</button>
 	  </form>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/report-step.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/report-step.html
index 5767afb2..6665dcf2 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/report-step.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/report-step.html
@@ -22,7 +22,6 @@
 <h1 class="heading-page">Report Wizard</h1>
 
 
-
 <!-- <h1 id="tabs---promo">Tabs - Promo</h1>
 <button class="btn btn-secondary btn-small" ng-click="gTabs[3].disabled = !gTabs[3].disabled">{{gTabs[3].disabled?'Enable':'Disable'}}</button> - Toggle 4th (Features) Tab
 <br><br> -->
@@ -34,6 +33,13 @@
      </b2b-tab>
  </b2b-tabset>
 <br><br>
+<div ng-show="showLoader" class="span loader-container">
+	<i class="icon-primary-spinner" role="img"
+		aria-label="Please wait while we load your content"></i>
+</div>
+
+<div ng-hide="showLoader">
+
 <!-- <select ng-model="prj" 
         ng-options="item.projectName for item in allProjects track by item.id" data-ng-init="getAllProjects()" 
         ng-change="selectAction();">
@@ -92,7 +98,7 @@
 <div id="stepView">
 <!--     <step-form ng-model="jsonSrcName" renderForm="changeme"></step-form> -->
 </div>
-
+</div>
 
 <!-- <select id="dropdown1" name="dropdown1" b2b-dropdown placeholder-text="Select" ng-model="selectedReportType.value">
     <option b2b-dropdown-list option-repeat="d in reportTypes" value="{{d.value}}">{{d.text}}</option>
-- 
cgit 1.2.3-korg