Merge pull request #804 from utmstack/bugfix/v10.5.5/issue-in-report-creation

Bugfix/v10.5.5/issue in report creation

Author: c3s4rfred

backend/src/main/java/com/park/utmstack/service/compliance/UtmComplianceReportScheduleService.java

@@ -160,8 +160,7 @@ public void scheduleComplianceReport() {
                     // Set the next execution time (Base time seed)
                     current.setLastExecutionTime(next);
                     utmComplianceReportScheduleRepository.save(current);
-                    complianceMailService.sendComplianceByMail(Constants.FRONT_BASE_URL + current.getUrlWithParams(),
-                        user.get().getEmail());
+                    complianceMailService.sendComplianceByMail(current.getUrlWithParams(), user.get().getEmail());
                 }
 
             } catch (Exception e) {

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

@@ -27,7 +27,7 @@ <h3 class="">{{dashboardName}}</h3>
       <h5 class="mt-5 ">Generated on {{date | date:'short':'UTC'}}</h5>
     </div>
 
-
+    <div *ngIf="!preparingPrint" class="report-loading"></div>
     <!--    <img class="img-front-page" src="/assets/img/report/A4_compliance.png">-->
     <img [src]="sanitizer.bypassSecurityTrustUrl(cover)"
          *ngIf="cover;else loadImage"
@@ -40,8 +40,6 @@ <h5 class="mt-5 ">Generated on {{date | date:'short':'UTC'}}</h5>
 </div>
 
 <div [ngClass]="printFormat?'vis-container-print':'mt-4'" class="w-100">
-    <span *ngIf="preparingPrint" class="text-primary">
-    <i class="spinner icon-spinner2"></i> Loading content, please wait</span>
   <div *ngIf="dashboardDescription != ''" class="report-desc-container w-100 d-flex justify-content-center align-items-center flex-column">
     <div class="report-description dashboard-info-container d-flex align-items-start w-100">
       <p class="font-size-lg mb-3">{{dashboardDescription}}</p>
@@ -70,7 +68,6 @@ <h5 class="mt-5 ">Generated on {{date | date:'short':'UTC'}}</h5>
     </div>
   </div>
 
-
   <app-render-visualization-print (visualizationLoaded)="onVisualizationLoaded()"
                                   [visualizationRender]="visualizationRender"></app-render-visualization-print>
 </div>

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

@@ -5,11 +5,11 @@ <h5 class="card-title label-header mb-0 text-uppercase label-header">Overview</h
       <app-elastic-filter-time [invertContent]="true"
                                [isEmitter]="true"
                                container="body"></app-elastic-filter-time>
-      <button (click)="exportToPdf()"
+      <!--<button (click)="exportToPdf()"
               [disabled]="pdfExport" class="btn utm-button utm-button-primary ml-2">
         <i [ngClass]="pdfExport?'icon-download10':'icon-file-pdf'" class="mr-1"></i>
         {{pdfExport ? 'Generating...' : 'Save to PDF'}}
-      </button>
+      </button>-->
     </div>
   </div>
   <app-utm-report-header *ngIf="pdfExport" [reportName]="'UTMSTACK Overview'"></app-utm-report-header>