Raptor backend java API Code(Analytics), UI Code(Overlay) and pages

component in os project

Issue-ID: PORTAL-902
Change-Id: Id297d9493a77e6816ed0f2a82c15b2eaa1e57a72
Signed-off-by: Sudarshan Kumar <sudarshan.kumar@att.com>

1 files changed, 39 insertions, 48 deletions

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component/edit-drill-down-link/edit-drill-down-link.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component/edit-drill-down-link/edit-drill-down-link.component.html
index fc6f9e42..563fd322 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component/edit-drill-down-link/edit-drill-down-link.component.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component/edit-drill-down-link/edit-drill-down-link.component.html
@@ -1,53 +1,44 @@
-<div *ngIf="showSpinner">
-    <div class="lds-ring"><div></div><div></div><div></div><div></div></div>
-</div>
+<span class="ecomp-spinner" *ngIf="showSpinner"></span>
 
 <div *ngIf="!showSpinner">
-  
-  <div *ngFor="let item of drillDownColsList; let i = index;">
-   
-<table>
-    <tr>
-      <th>{{item.name}}</th>
-    </tr>
-    <tr>
-      <td><input type="radio" id="test{{i*5+1}}" name="radio-group{{i}}" [(ngModel)]="noValueRadioArr[i]" value="{{i*5+1}}" Checked="true"><label for="test{{i*5+1}}"></label></td>
-      <td><label for="test{{i*5+1}}">No Value</label></td>
-      <td><label for="test{{i*5+1}}">Accept Default</label></td>
-    </tr>
-    <tr>
-      <td><input type="radio" id="test{{i*5+2}}" name="radio-group{{i}}" [(ngModel)]="noValueRadioArr[i]" value="{{i*5+2}}"  Checked="radioButtonCheckedArr[i*5+2]"><label for="test{{i*5+2}}"></label></td>
-      <td><label for="test{{i*5+2}}">Fixed Value</label></td>
-      <td><input class="defaultFontSize field-group" id="reportName" type="text"  [(ngModel)]="valueValueArr[i*5+2]" value="3"/></td>
-    </tr>
-    <tr>
-        <td><input type="radio" id="test{{i*5+3}}" name="radio-group{{i}}" [(ngModel)]="noValueRadioArr[i]" value="{{i*5+3}}" Checked="radioButtonCheckedArr[i*5+3]"><label for="test{{i*5+3}}"></label></td>
-        <td><label for="test{{i*5+3}}">Value of Column</label></td>
-        <td>
-          <select class="browser-default custom-select defaultFontSize"  required="required" placeholder="Select Value of Column" [(ngModel)]="valueValueArr[i*5+3]"  value="5">
-            <option *ngFor="let item of valueOfColumnsList" class="defaultFontSize" value="{{item.name}}">{{item.name}}</option>
-            
-          </select>
-        </td>
-    </tr>
-    <tr>
-        <td><input type="radio" id="test{{i*5+4}}" name="radio-group{{i}}" [(ngModel)]="noValueRadioArr[i]" value="{{i*5+4}}"><label for="test{{i*5+4}}" Checked="radioButtonCheckedArr[i*5+4]"></label></td>
-        <td><label for="test{{i*5+4}}">Value of form field</label></td>
-        <td>
-            <select class="browser-default custom-select defaultFontSize"  required="required" placeholder="Select Value of Form Field" [(ngModel)]="valueValueArr[i*5+4]"  value="7">
-              <option *ngFor="let item of drillDownColsList" class="defaultFontSize" value="{{item.name}}">{{item.name}}</option>
-            </select>
-          </td>
-    </tr>
-    <tr>
-        <td><input type="radio" id="test{{i*5+5}}" name="radio-group{{i}}" [(ngModel)]="noValueRadioArr[i]" value="{{i*5+5}}" Checked="radioButtonCheckedArr[i*5+5]"><label for="test{{i*5+5}}"></label></td>
-        <td><label for="test{{i*5+5}}">Value set</label></td>
-        <td><label>Pass the value of the selected column if not empty, otherwise pass the value of the selected form field.</label></td>
-    </tr>
-    
-    
-    
-  </table>
+
+  <div *ngFor="let item of drillDownModel; let i = index;">
+
+      <table>
+          <tr>
+              <th>{{item.name}}</th>
+          </tr>
+          <tr>
+              <td><input type="radio" id="novalue{{i}}"  name="radio-group{{i}}" [(ngModel)]="item.radioButtonValue" value="No Value" Checked="true"><label for="novalue{{i}}"></label></td>
+              <td><label for="novalue{{i}}" >No Value</label></td>
+              <td><label >Accept Default</label></td>
+          </tr>
+          <tr>
+              <td><input type="radio"  id="fixed{{i}}"  name="radio-group{{i}}" [(ngModel)]="item.radioButtonValue" value="fixed"><label for="fixed{{i}}"></label></td>
+              <td><label for="fixed{{i}}">Fixed Value</label></td>
+              <td><input class="defaultFontSize field-group" id="fixedValue{{i}}" type="text"  [(ngModel)]="item.fixedValueData" value="3"/></td>
+          </tr>
+          <tr>
+              <td><input type="radio" id="column{{i}}" name="radio-group{{i}}" [(ngModel)]="item.radioButtonValue" value="column"><label for="column{{i}}"></label></td>
+              <td><label for="column{{i}}">Value of Column</label></td>
+              <td>
+                  <select class="browser-default custom-select defaultFontSize"  required="required" placeholder="Select Value of Column" [(ngModel)]="item.valueOfColumnData"  value="5">
+                      <option *ngFor="let items of valueOfColumnsList" class="defaultFontSize" value="{{items.name}}">{{items.name}}</option>
+
+                  </select>
+              </td>
+          </tr>
+          <tr>
+              <td><input type="radio" id="field{{i}}"  name="radio-group{{i}}" [(ngModel)]="item.radioButtonValue" value="field"><label for="field{{i}}"></label></td>
+              <td><label for="field{{i}}">Value of form field</label></td>
+              <td>
+                  <select class="browser-default custom-select defaultFontSize"  required="required" placeholder="Select Value of Form Field" [(ngModel)]="item.valueOfFormFieldData"  value="7">
+                      <option *ngFor="let items of formFieldsListObj" class="defaultFontSize" value="{{items.name}}">{{items.name}}</option>
+                  </select>
+              </td>
+          </tr>
+
+      </table>
     <br/>
   </div>