summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component
diff options
context:
space:
mode:
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component')
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component/column-advanced-display/column-advanced-display.component.html12
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component/column-advanced-display/column-advanced-display.component.ts3
2 files changed, 14 insertions, 1 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component/column-advanced-display/column-advanced-display.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component/column-advanced-display/column-advanced-display.component.html
index 63d024b1..55df3786 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component/column-advanced-display/column-advanced-display.component.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component/column-advanced-display/column-advanced-display.component.html
@@ -6,12 +6,22 @@
<input [(ngModel)]="semaphore.semaphoreName" class="defaultFontSize" id="semaphoreName" name="displayName"
style="width: 60%" type="text" >
</div>
+<label class="defaultFontSize1">Comments: {{semaphore.comment}}</label>
<div class="field-group">
<mat-form-field>
<mat-label class="b2b-dro">Apply To:</mat-label>
<mat-select data-select-color="blue" [(ngModel)]="semaphore.semaphoreType" aria-label="reportType" placeholder="Select chart Type">
<mat-option value="CELL">Current Value Only</mat-option>
- <mat-option value="CELL">Entire Row</mat-option>
+ <mat-option value="ROW">Entire Row</mat-option>
+ </mat-select>
+ </mat-form-field>
+</div>
+<div class="field-group">
+ <mat-form-field>
+ <mat-label class="b2b-dro">Target Column:</mat-label>
+ <mat-select data-select-color="blue" [(ngModel)]="semaphore.target" aria-label="reportType" placeholder="Select chart Type">
+ <mat-option value="">None</mat-option>
+ <mat-option *ngFor="let column of columnList" [value]="column.id">{{column.name}}</mat-option>
</mat-select>
</mat-form-field>
</div>
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component/column-advanced-display/column-advanced-display.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component/column-advanced-display/column-advanced-display.component.ts
index 2b0e6c6d..7458fd1f 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component/column-advanced-display/column-advanced-display.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/columns-edit-component/column-advanced-display/column-advanced-display.component.ts
@@ -14,6 +14,8 @@ export class ColumnAdvancedDisplayComponent implements OnInit {
@Input('inputSemaphoreName') inputSemaphoreName: String;
@Input('addNew') addNew: boolean;
@Input('columnName') columnName: String;
+ @Input('columnList') columnList: any;
+
@Output() completed = new EventEmitter<any>();
semaphoreObjArr: {}[];
semaphore: Semaphore;
@@ -116,6 +118,7 @@ export class ColumnAdvancedDisplayComponent implements OnInit {
semCount = this.semaphoreArr.semaphore.length + 1;
} else { semCount = 1 ; }
this.newSemaphore['comment'] = this.columnName;
+ this.newSemaphore['target'] = '';
this.newSemaphore['semaphoreType'] = 'CELL';
this.newSemaphore['semaphoreName'] = 'Display Formatting ' + semCount;
this.newSemaphore['semaphoreId'] = 'sem' + semCount;