Skip to content

Commit

Permalink
Merge pull request #4300 from cisagov/feature/cset-2933
Browse files Browse the repository at this point in the history
feature: cset-2933 fix RRA report charts
  • Loading branch information
randywoods authored Dec 17, 2024
2 parents f478580 + 298f804 commit 9f4e19f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down Expand Up @@ -114,7 +114,7 @@ export class RraAnswerComplianceComponent implements OnInit {

@HostListener('window:beforeprint')
beforePrint() {
this.view = [1300, 600];
this.view = [700, 350];
}

@HostListener('window:afterprint')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export class RraAnswerCountsComponent implements OnInit {

@HostListener('window:beforeprint')
beforePrint() {
this.view = [800, 300];
this.view = [600, 350];
}

@HostListener('window:afterprint')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export class RraAnswerDistributionComponent implements OnInit {

@HostListener('window:beforeprint')
beforePrint() {
this.view = [800, 300];
this.view = [600, 350];
}

@HostListener('window:afterprint')
Expand Down
18 changes: 9 additions & 9 deletions CSETWebNg/src/app/reports/rra/rra-report/rra-report.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<number>(25)
Expand All @@ -109,7 +109,7 @@ export class RraReportComponent implements OnInit {
this.createAnswerDistribByGoal(r);

this.createChart1(r);


this.createTopRankedGoals(r);

Expand Down Expand Up @@ -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())
}
}


Expand All @@ -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())
}
}
}
Expand Down Expand Up @@ -265,7 +265,7 @@ export class RraReportComponent implements OnInit {

@HostListener('window:beforeprint')
beforePrint() {
this.view = [1300, 600];
this.view = [600, 350];
}

@HostListener('window:afterprint')
Expand Down

0 comments on commit 9f4e19f

Please sign in to comment.