diff options
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List')
4 files changed, 57 insertions, 9 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/chart-wizard/chart-wizard.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/chart-wizard/chart-wizard.component.html index 4440b9e5..c4bc61e1 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/chart-wizard/chart-wizard.component.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/chart-wizard/chart-wizard.component.html @@ -57,10 +57,11 @@ <mat-option value="PieChart">Pie Chart</mat-option> <mat-option value="AnnotationChart">Annotation Chart</mat-option> <mat-option value="FlexTimeChart">Flexible Time Chart</mat-option> + <mat-option value="StackedCoulmnChart" (onSelectionChange)="setStackedCoulmnChartOptions()">Stacked Coulmn Chart</mat-option> </mat-select> </mat-form-field> <br/> - <mat-form-field> + <mat-form-field *ngIf="chartJson.chartType !=='StackedCoulmnChart'"> <mat-label class="lable">Domain Axis</mat-label> <mat-select [(ngModel)]="chartJson.domainAxisJSON.value" aria-label="domain axis"> <mat-option *ngFor="let d of chartJson.chartColumnJSONList" @@ -68,7 +69,7 @@ </mat-select> </mat-form-field> <br/> - <mat-form-field> + <mat-form-field *ngIf="chartJson.chartType !=='StackedCoulmnChart'"> <mat-label class="lable">Category</mat-label> <mat-select [(ngModel)]="chartJson.categoryAxis" aria-label="category axis"> <mat-option>None</mat-option> @@ -78,7 +79,7 @@ </mat-form-field> </div> - <div id="RangeTable"> + <div id="RangeTable" *ngIf="chartJson.chartType !=='StackedCoulmnChart'"> <table> <thead> <tr> @@ -141,7 +142,7 @@ <br/> <div class="form-group"> <mat-accordion> - <mat-expansion-panel> + <mat-expansion-panel *ngIf="chartJson.chartType !=='StackedCoulmnChart'"> <mat-expansion-panel-header> <mat-panel-title> Additional Options @@ -197,7 +198,7 @@ </mat-expansion-panel> <br/> - <mat-expansion-panel> + <mat-expansion-panel *ngIf="chartJson.chartType !=='StackedCoulmnChart'"> <mat-expansion-panel-header> <mat-panel-title> Common Options @@ -302,7 +303,7 @@ Set Bar chart Options </mat-panel-description> </mat-expansion-panel-header> - <div> + <div *ngIf="chartJson.chartType !=='StackedCoulmnChart'"> <table> <thead> <tr> @@ -437,6 +438,40 @@ </table> </div> </mat-expansion-panel> + <mat-expansion-panel *ngIf="chartJson.chartType =='StackedCoulmnChart'"> + <mat-expansion-panel-header> + <mat-panel-description> + Set Stacked Column Chart Option + </mat-panel-description> + </mat-expansion-panel-header> + <div class="field-group"> + <mat-form-field> + <mat-label class="lable">Set Column For X Axis</mat-label> + <mat-select [(ngModel)]="chartJson.domainAxisJSON.value" aria-label="domain axis"> + <mat-option *ngFor="let d of chartJson.chartColumnJSONList" + value="{{d.value}}">{{d.title}}</mat-option> + </mat-select> + </mat-form-field> + <br/> + <mat-form-field> + <mat-label class="lable">Set Column For Y Axis</mat-label> + <mat-select [(ngModel)]="chartJson.categoryAxis" aria-label="category axis"> + <mat-option>None</mat-option> + <mat-option *ngFor="let d of chartJson.chartColumnJSONList" + value="{{d.value}}">{{d.title}}</mat-option> + </mat-select> + </mat-form-field> + <br/> + <mat-form-field> + <mat-label class="lable">Set Column For Count</mat-label> + <mat-select [(ngModel)]="chartJson.primaryAxisLabel" aria-label="count"> + <mat-option>None</mat-option> + <mat-option *ngFor="let d of chartJson.chartColumnJSONList" + value="{{d.value}}">{{d.title}}</mat-option> + </mat-select> + </mat-form-field> + </div> + </mat-expansion-panel> </mat-accordion> </div> <br/> diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/chart-wizard/chart-wizard.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/chart-wizard/chart-wizard.component.ts index 2d9a52c0..294efcb7 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/chart-wizard/chart-wizard.component.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/chart-wizard/chart-wizard.component.ts @@ -174,5 +174,18 @@ export class ChartWizardComponent implements OnInit { }; } + setStackedCoulmnChartOptions() { + console.log("Seeting up Stacked Column Charts"); + this.chartJson.stackedCoulmnChartOptions = this.chartJson.stackedCoulmnChartOptions || { + lineChartRenderer: null, + showXAxisLabel: null, + addXAxisTicker: null, + nonTimeAxis: null, + multiSeries: null + }; + console.log("StackedCoulmnChart chartJson:: ",this.chartJson); + } + + } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/sql/sql.component.css b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/sql/sql.component.css index bf51ea3a..95ef60d0 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/sql/sql.component.css +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/sql/sql.component.css @@ -64,11 +64,11 @@ input { border-radius: 6px; color: #5a5a5a; display: inline-block; - font-size: 1.6rem; + /*font-size: 1.6rem;*/ margin: 0px; /* padding: 0 15px 0 15px; */ vertical-align: middle; - line-height: normal; + /* line-height: normal; */ } .btns { diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts index 88d1c84f..2ae8f07f 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/report-list.service.ts @@ -15,6 +15,6 @@ export class ReportListService { return this._http.get(environment.baseUrl + "raptor.htm?action=report.delete&c_master=" + reportId); } getAllReports():Observable<any>{ - return this._http.get(environment.baseUrl + "raptor.htm?action=report.search.execute&r_page=0"); + return this._http.get(environment.baseUrl + "raptor.htm?action=report.search.execute&r_page=0&show_all=true"); } } |