Merged in task/dspace-cris-2024_02_x/DSC-2820 (pull request DSpace#4785)

DSC-2820 fixed the views wording in the downloads tab of the statistics

Approved-by: Andrea Barbasso

Author: Mattia Vianelli

src/app/statistics-page/cris-statistics-page/statistics-chart/statistics-chart-bar/statistics-chart-bar.component.ts

@@ -8,7 +8,10 @@ import {
   Inject,
   PLATFORM_ID,
 } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import {
   Observable,
   of,
@@ -61,8 +64,9 @@ export class StatisticsChartBarComponent extends StatisticsChartDataComponent {
     @Inject(PLATFORM_ID) protected platformId: any,
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
     @Inject(DOCUMENT) protected document: any,
+    protected translateService: TranslateService,
   ) {
-    super(report, categoryType, platformId, _window, document);
+    super(report, categoryType, platformId, _window, document, translateService);
   }
 
   /**

src/app/statistics-page/cris-statistics-page/statistics-chart/statistics-chart-data/statistics-chart-data.component.ts

@@ -10,6 +10,7 @@ import {
   PLATFORM_ID,
   ViewChild,
 } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
 import {
   BehaviorSubject,
   Observable,
@@ -76,6 +77,7 @@ export abstract class StatisticsChartDataComponent implements OnInit {
     @Inject(PLATFORM_ID) protected platformId: any,
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
     @Inject(DOCUMENT) protected document: any,
+    protected translateService: TranslateService,
   ) {
 
     /* IMPORTANT
@@ -102,7 +104,7 @@ export abstract class StatisticsChartDataComponent implements OnInit {
   downloadPng() {
     this.isLoading.next(false);
     const node = this.chartRef.nativeElement;
-    this.exportService.exportAsImage(node, ExportImageType.png, this.report.reportType, this.isLoading);
+    this.exportService.exportAsImage(node, ExportImageType.png, this.getReportName(), this.isLoading);
   }
 
   /**
@@ -111,15 +113,15 @@ export abstract class StatisticsChartDataComponent implements OnInit {
   downloadJpeg() {
     this.isSecondLoading.next(false);
     const node = this.chartRef.nativeElement;
-    this.exportService.exportAsImage(node, ExportImageType.jpeg, this.report.reportType, this.isSecondLoading);
+    this.exportService.exportAsImage(node, ExportImageType.jpeg, this.getReportName(), this.isSecondLoading);
   }
 
   /**
    * Export the table information in excel mode.
    */
   exportExcel() {
     this.isLoading.next(true);
-    this.exportService.exportAsFile('xlsx', 'dataTable', this.report.reportType, true).subscribe(() => {
+    this.exportService.exportAsFile('xlsx', 'dataTable', this.getReportName(), true).subscribe(() => {
       this.isLoading.next(false);
     });
   }
@@ -129,11 +131,15 @@ export abstract class StatisticsChartDataComponent implements OnInit {
    */
   exportCsv() {
     this.isSecondLoading.next(true);
-    this.exportService.exportAsFile('csv', 'dataTable', this.report.reportType, true).subscribe(() => {
+    this.exportService.exportAsFile('csv', 'dataTable', this.getReportName(), true).subscribe(() => {
       this.isSecondLoading.next(false);
     });
   }
 
+  protected getReportName(): string {
+    return this.translateService.instant('statistics.table.' + this.categoryType + '.title.' + this.report.reportType);
+  }
+
   /**
    * Parse information as needed by charts can be overriden
    */

src/app/statistics-page/cris-statistics-page/statistics-chart/statistics-chart-line/statistics-chart-line.component.spec.ts

@@ -103,7 +103,7 @@ describe('StatisticsChartLineComponent', () => {
 
   const expectedResult = [
     {
-      'name': 'TotalVisitsPerMonth',
+      'name': 'statistics.table.mainReports.title.TotalVisitsPerMonth',
       'series': [
         {
           'name': 'September 2020',

src/app/statistics-page/cris-statistics-page/statistics-chart/statistics-chart-line/statistics-chart-line.component.ts

@@ -8,7 +8,10 @@ import {
   Inject,
   PLATFORM_ID,
 } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import {
   Observable,
   of,
@@ -60,8 +63,9 @@ export class StatisticsChartLineComponent extends StatisticsChartDataComponent {
     @Inject(PLATFORM_ID) protected platformId: any,
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
     @Inject(DOCUMENT) protected document: any,
+    protected translateService: TranslateService,
   ) {
-    super(report, categoryType, platformId, _window, document);
+    super(report, categoryType, platformId, _window, document, translateService);
   }
 
   /**
@@ -87,7 +91,7 @@ export class StatisticsChartLineComponent extends StatisticsChartDataComponent {
     return of(
       [
         {
-          name: this.report.reportType,
+          name: this.getReportName(),
           series: series,
         },
       ],

src/app/statistics-page/cris-statistics-page/statistics-chart/statistics-chart-pie/statistics-chart-pie.component.ts

@@ -8,7 +8,10 @@ import {
   Inject,
   PLATFORM_ID,
 } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import {
   Observable,
   of,
@@ -61,8 +64,9 @@ export class StatisticsChartPieComponent extends StatisticsChartDataComponent {
     @Inject(PLATFORM_ID) protected platformId: any,
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
     @Inject(DOCUMENT) protected document: any,
+    protected translateService: TranslateService,
   ) {
-    super(report, categoryType, platformId, _window, document);
+    super(report, categoryType, platformId, _window, document, translateService);
   }
 
   /**

src/app/statistics-page/cris-statistics-page/statistics-chart/statistics-table/statistics-table.component.ts

@@ -12,7 +12,10 @@ import {
   OnInit,
   PLATFORM_ID,
 } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 
 import {
   NativeWindowRef,
@@ -75,8 +78,9 @@ export class StatisticsTableComponent extends StatisticsChartDataComponent imple
     @Inject(PLATFORM_ID) protected platformId: any,
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
     @Inject(DOCUMENT) protected document: any,
+    protected translateService: TranslateService,
   ) {
-    super(report, categoryType, platformId, _window, document);
+    super(report, categoryType, platformId, _window, document, translateService);
   }
 
   /**