This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch feature/projects in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 56b116d20896367e35888ee7ef882d7dc20f3573 Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com> AuthorDate: Thu Jun 6 17:02:35 2019 +0300 [DLAB-649]: billing data sctructure fixed --- .../src/app/reporting/reporting.component.ts | 28 +++++++++++----------- .../resources/webapp/src/assets/styles/_theme.scss | 9 ++++++- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts index aec9914..bbf7010 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts @@ -31,14 +31,14 @@ import { DICTIONARY, ReportingConfigModel } from '../../dictionary/global.dictio @Component({ selector: 'dlab-reporting', template: ` - <dlab-toolbar (rebuildReport)="rebuildBillingReport()" - (exportReport)="exportBillingReport()" - (setRangeOption)="setRangeOption($event)"> - </dlab-toolbar> - <dlab-reporting-grid (filterReport)="filterReport($event)" (resetRangePicker)="resetRangePicker()"></dlab-reporting-grid> - <footer *ngIf="data"> - Total {{ data[DICTIONARY.billing.costTotal] }} {{ data[DICTIONARY.billing.currencyCode] }} - </footer> + <div class="base-retreat"> + <dlab-toolbar (rebuildReport)="rebuildBillingReport()" + (exportReport)="exportBillingReport()" + (setRangeOption)="setRangeOption($event)"> + </dlab-toolbar> + <mat-divider></mat-divider> + <dlab-reporting-grid (filterReport)="filterReport($event)" (resetRangePicker)="resetRangePicker()"></dlab-reporting-grid> + </div> `, styles: [` @@ -88,7 +88,7 @@ export class ReportingComponent implements OnInit, OnDestroy { this.billingReportService.getGeneralBillingData(this.reportData) .subscribe(data => { this.data = data; - this.reportingGrid.reportData = this.data.lines; + this.reportingGrid.reportData = this.data; this.reportingGrid.full_report = this.data.full_report; this.reportingToolbar.reportData = this.data; @@ -176,17 +176,17 @@ export class ReportingComponent implements OnInit, OnDestroy { this.reportingToolbar.clearRangePicker(); } - clearStorage(): void { - localStorage.removeItem('report_config'); - localStorage.removeItem('report_period'); - } - setRangeOption(dateRangeOption: any): void { this.reportData.date_start = dateRangeOption.start_date; this.reportData.date_end = dateRangeOption.end_date; this.getGeneralBillingData(); } + private clearStorage(): void { + localStorage.removeItem('report_config'); + localStorage.removeItem('report_period'); + } + private getEnvironmentHealthStatus() { this.healthStatusService.getEnvironmentHealthStatus() .subscribe((result: any) => { diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index 61d3ab5..7ddacce 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -502,6 +502,13 @@ mat-horizontal-stepper { vertical-align: top; padding: 10px 5px; } + tr.mat-footer-row { + font-weight: bold; + } + + // .mat-table-sticky { + // border-top: 1px solid #e0e0e0; + // } } mat-tab-group.mat-tab-group { @@ -521,4 +528,4 @@ mat-progress-bar { .mat-progress-bar-buffer { background-color: #baf0f7; } -} \ No newline at end of file +} --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org