Skip to content

Commit 6955e01

Browse files
committed
Merge remote-tracking branch 'origin/bugfix/v10.5.5/issue-in-report-creation' into bugfix/v10.5.5/issue-in-report-creation
2 parents a6960e7 + 20135ab commit 6955e01

3 files changed

Lines changed: 4 additions & 7 deletions

File tree

frontend/src/app/dashboard/compliance-export/compliance-export.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</div>
1919

2020

21-
<div *ngIf="preparingPrint" class="report-loading"></div>
21+
<div *ngIf="!preparingPrint" class="report-loading"></div>
2222
<div class="d-flex justify-content-center align-items-start w-100 m-0 d-print-block">
2323
<div class="compliance-front-page">
2424

frontend/src/app/dashboard/dashboard-export-pdf/dashboard-export-pdf.component.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h3 class="">{{dashboardName}}</h3>
2727
<h5 class="mt-5 ">Generated on {{date | date:'short':'UTC'}}</h5>
2828
</div>
2929

30-
30+
<div *ngIf="!preparingPrint" class="report-loading"></div>
3131
<!-- <img class="img-front-page" src="/assets/img/report/A4_compliance.png">-->
3232
<img [src]="sanitizer.bypassSecurityTrustUrl(cover)"
3333
*ngIf="cover;else loadImage"
@@ -40,8 +40,6 @@ <h5 class="mt-5 ">Generated on {{date | date:'short':'UTC'}}</h5>
4040
</div>
4141

4242
<div [ngClass]="printFormat?'vis-container-print':'mt-4'" class="w-100">
43-
<span *ngIf="preparingPrint" class="text-primary">
44-
<i class="spinner icon-spinner2"></i> Loading content, please wait</span>
4543
<div *ngIf="dashboardDescription != ''" class="report-desc-container w-100 d-flex justify-content-center align-items-center flex-column">
4644
<div class="report-description dashboard-info-container d-flex align-items-start w-100">
4745
<p class="font-size-lg mb-3">{{dashboardDescription}}</p>
@@ -70,7 +68,6 @@ <h5 class="mt-5 ">Generated on {{date | date:'short':'UTC'}}</h5>
7068
</div>
7169
</div>
7270

73-
7471
<app-render-visualization-print (visualizationLoaded)="onVisualizationLoaded()"
7572
[visualizationRender]="visualizationRender"></app-render-visualization-print>
7673
</div>

frontend/src/app/dashboard/dashboard-overview/dashboard-overview.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ <h5 class="card-title label-header mb-0 text-uppercase label-header">Overview</h
55
<app-elastic-filter-time [invertContent]="true"
66
[isEmitter]="true"
77
container="body"></app-elastic-filter-time>
8-
<button (click)="exportToPdf()"
8+
<!--<button (click)="exportToPdf()"
99
[disabled]="pdfExport" class="btn utm-button utm-button-primary ml-2">
1010
<i [ngClass]="pdfExport?'icon-download10':'icon-file-pdf'" class="mr-1"></i>
1111
{{pdfExport ? 'Generating...' : 'Save to PDF'}}
12-
</button>
12+
</button>-->
1313
</div>
1414
</div>
1515
<app-utm-report-header *ngIf="pdfExport" [reportName]="'UTMSTACK Overview'"></app-utm-report-header>

0 commit comments

Comments
 (0)