[PORTAL-15] RAPTOR reporting fixes

Also repairs a bug in the user-management overlay screen.

Ticket number all caps this time.

Restore epsdk-app-os pom -SNAPSHOT suffix

Change-Id: I7ef620c4ebc52259bcf474908bc4810dfd7e41e7
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

1 files changed, 14 insertions, 11 deletions

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
index 3fae62f1..8558729e 100644
--- 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
@@ -138,29 +138,32 @@ table{
     <tbody>
         <tr>
             <td>
-				<select name="chartType" b2b-dropdown ng-model="rangeReport.rangeAxisLabelJSON.value" placeholder-text="Select">
+				<select name="chartType" b2b-dropdown ng-model="rangeReport.rangeAxisLabelJSON.value" placeholder-text="Select" ng-disabled="rangeReport.removed=='true'">
 					<option b2b-dropdown-list option-repeat="d in reportRunJson.chartColumnJSONList" value="{{d.value}}">{{d.title}}</option>
-	            </select>
+				</select>
             </td>
             <td>
-            	<input type="text" name="displayName" ng-model="rangeReport.rangeYAxis" style="width:100px;">
+            	<input type="text" name="displayName" ng-model="rangeReport.rangeYAxis" ng-disabled="rangeReport.removed=='true'" style="width:100px;">
             </td>
             <td>
-            	<input type="text" name="displayName" ng-model="rangeReport.rangeChartGroup" style="width:150px;">
+            	<input type="text" name="displayName" ng-model="rangeReport.rangeChartGroup" ng-disabled="rangeReport.removed=='true'" style="width:150px;">
             </td>
             <td>
-				<select name="chartType" b2b-dropdown ng-model="rangeReport.rangeColor">
+				<select name="chartType" b2b-dropdown ng-model="rangeReport.rangeColor" ng-disabled="rangeReport.removed=='true'">
 					<option b2b-dropdown-list option-repeat="d in rangeColors" value="{{d.value}}">{{d.title}}</option>
-	            </select>
+				</select>
             </td>
             <td>
-				<select name="lineType" b2b-dropdown ng-model="rangeReport.rangeLineType">
-					<option b2b-dropdown-list option-repeat="d in lineTypes" value="{{d.value}}">{{d.title}}</option>
-	            </select>
+				<select name="lineType" b2b-dropdown ng-model="rangeReport.rangeLineType" ng-disabled="rangeReport.removed=='true'">
+					<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>
+            	<span ng-hide="$index==0">
+            		<button ng-if="rangeReport.removed!='true'" type="submit" style="width: 90px; height:35px;margin-left:5px;" class="btn btn-secondary btn-small" ng-click="removeRangeAxisRow($index)">Remove</button>
+            		<button ng-if="rangeReport.removed=='true'" type="submit" style="width: 90px; height:35px;margin-left:5px;" class="btn btn-secondary btn-small" disabled="disabled">Removed</button>
+            	</span>
             </td>
         </tr>
       
@@ -891,4 +894,4 @@ table{
 	<button type="submit" style="width: 90px; height:35px;margin-top:20px; margin-left:5px;" class="btn btn-alt btn-small">Run</button>
 	</a>
 	</div>    
-</div>
\ No newline at end of file
+</div>