From 298f804331b39878587f5341cf00dd6e545ef31a Mon Sep 17 00:00:00 2001 From: Mostafa Abdo Date: Mon, 16 Dec 2024 17:35:40 -0800 Subject: [PATCH] feature: cset-2933 fix rra report charts --- .../rra-answer-compliance.component.ts | 6 +++--- .../rra-answer-counts.component.ts | 2 +- .../rra-answer-distribution.component.ts | 2 +- .../rra/rra-report/rra-report.component.ts | 18 +++++++++--------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CSETWebNg/src/app/assessment/results/mat-rra/rra-answer-compliance/rra-answer-compliance.component.ts b/CSETWebNg/src/app/assessment/results/mat-rra/rra-answer-compliance/rra-answer-compliance.component.ts index c96fbfc9e6..ffcde6151b 100644 --- a/CSETWebNg/src/app/assessment/results/mat-rra/rra-answer-compliance/rra-answer-compliance.component.ts +++ b/CSETWebNg/src/app/assessment/results/mat-rra/rra-answer-compliance/rra-answer-compliance.component.ts @@ -40,9 +40,9 @@ export class RraAnswerComplianceComponent implements OnInit { animation: boolean = false; constructor( - public rraDataSvc: RraDataService, + public rraDataSvc: RraDataService, public tSvc: TranslocoService - ) { } + ) { } ngOnInit(): void { this.rraDataSvc.getRRADetail().subscribe((r: any) => { @@ -114,7 +114,7 @@ export class RraAnswerComplianceComponent implements OnInit { @HostListener('window:beforeprint') beforePrint() { - this.view = [1300, 600]; + this.view = [700, 350]; } @HostListener('window:afterprint') diff --git a/CSETWebNg/src/app/assessment/results/mat-rra/rra-answer-counts/rra-answer-counts.component.ts b/CSETWebNg/src/app/assessment/results/mat-rra/rra-answer-counts/rra-answer-counts.component.ts index 44087a44bb..f151901f28 100644 --- a/CSETWebNg/src/app/assessment/results/mat-rra/rra-answer-counts/rra-answer-counts.component.ts +++ b/CSETWebNg/src/app/assessment/results/mat-rra/rra-answer-counts/rra-answer-counts.component.ts @@ -104,7 +104,7 @@ export class RraAnswerCountsComponent implements OnInit { @HostListener('window:beforeprint') beforePrint() { - this.view = [800, 300]; + this.view = [600, 350]; } @HostListener('window:afterprint') diff --git a/CSETWebNg/src/app/assessment/results/mat-rra/rra-answer-distribution/rra-answer-distribution.component.ts b/CSETWebNg/src/app/assessment/results/mat-rra/rra-answer-distribution/rra-answer-distribution.component.ts index d313194213..a3194a89e8 100644 --- a/CSETWebNg/src/app/assessment/results/mat-rra/rra-answer-distribution/rra-answer-distribution.component.ts +++ b/CSETWebNg/src/app/assessment/results/mat-rra/rra-answer-distribution/rra-answer-distribution.component.ts @@ -86,7 +86,7 @@ export class RraAnswerDistributionComponent implements OnInit { @HostListener('window:beforeprint') beforePrint() { - this.view = [800, 300]; + this.view = [600, 350]; } @HostListener('window:afterprint') diff --git a/CSETWebNg/src/app/reports/rra/rra-report/rra-report.component.ts b/CSETWebNg/src/app/reports/rra/rra-report/rra-report.component.ts index 159f55f5d8..dd5413c0f8 100644 --- a/CSETWebNg/src/app/reports/rra/rra-report/rra-report.component.ts +++ b/CSETWebNg/src/app/reports/rra/rra-report/rra-report.component.ts @@ -90,7 +90,7 @@ export class RraReportComponent implements OnInit { private titleService: Title, public cmmcStyleSvc: CmmcStyleService, public rraDataSvc: RraDataService, - public configSvc: ConfigService, + public configSvc: ConfigService, public tSvc: TranslocoService ) { this.columnWidthEmitter = new BehaviorSubject(25) @@ -109,7 +109,7 @@ export class RraReportComponent implements OnInit { this.createAnswerDistribByGoal(r); this.createChart1(r); - + this.createTopRankedGoals(r); @@ -177,9 +177,9 @@ export class RraReportComponent implements OnInit { }); this.complianceGraph1 = levelList; - for (let i of this.complianceGraph1){ - i.name = this.tSvc.translate('level.'+ i.name.toLowerCase()) - } + for (let i of this.complianceGraph1) { + i.name = this.tSvc.translate('level.' + i.name.toLowerCase()) + } } @@ -206,9 +206,9 @@ export class RraReportComponent implements OnInit { }); this.answerDistribByGoal = goalList; - for (let i of this.answerDistribByGoal){ - for (let j of i.series){ - j.name = this.tSvc.translate('answer-options.button-labels.'+ j.name.toLowerCase()) + for (let i of this.answerDistribByGoal) { + for (let j of i.series) { + j.name = this.tSvc.translate('answer-options.button-labels.' + j.name.toLowerCase()) } } } @@ -265,7 +265,7 @@ export class RraReportComponent implements OnInit { @HostListener('window:beforeprint') beforePrint() { - this.view = [1300, 600]; + this.view = [600, 350]; } @HostListener('window:afterprint')