From 4fdf9dfe03f70d8da70bdefa1b79c178af4c8c69 Mon Sep 17 00:00:00 2001
From: Randy Woods <randy1@radiorandy.com>
Date: Thu, 5 Dec 2024 16:19:26 -0700
Subject: [PATCH] More CMMC cleanup, i18n

---
 .../Maturity/CmmcBusiness.cs                  |  4 ++++
 .../CSETWebCore.Model/Maturity/CmmcScores.cs  |  3 +++
 .../cmmc2-domain-results.component.html       |  7 +++----
 .../cmmc2-domain-results.component.ts         |  3 ---
 .../cmmc2-level-results.component.html        |  6 +++---
 .../cmmc2-level-results.component.ts          |  3 +--
 .../cmmc2-level1-score.component.html         |  8 ++++----
 .../cmmc2-level1-score.component.ts           |  5 +++--
 .../cmmc2-level2-score.component.html         | 10 +++++-----
 .../cmmc2-level3-score.component.html         | 10 +++++-----
 .../cmmc2-level3-score.component.ts           |  7 ++++---
 .../cmmc2-results.component.html              |  6 +++---
 .../cmmc2-scores/cmmc2-scores.component.html  | 19 +++++++++++++------
 .../level-scorecard.component.html            |  6 +++---
 .../acet-layout-main.component.scss           |  4 ++++
 .../cf-layout-main.component.scss             |  4 ++++
 .../cie-layout-main.component.scss            |  4 ++++
 .../iod-layout/iod-layout.component.scss      |  4 ++++
 .../layout-main/layout-main.component.scss    |  4 ++++
 .../renew-layout-main.component.scss          |  4 ++++
 .../rra-layout-main.component.scss            |  4 ++++
 CSETWebNg/src/app/layout/styles-base.scss     |  4 ++++
 CSETWebNg/src/app/layout/styles-rra.scss      |  4 ++++
 .../tsa-layout-main.component.scss            |  4 ++++
 CSETWebNg/src/app/reports/reports.scss        |  7 +++++--
 CSETWebNg/src/app/services/chart.service.ts   |  4 ++--
 CSETWebNg/src/assets/i18n/en.json             | 19 ++++++++++++-------
 .../src/assets/navigation/workflow-omni.xml   |  4 ++--
 CSETWebNg/src/sass/styles.scss                |  4 ++++
 29 files changed, 119 insertions(+), 56 deletions(-)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CmmcBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CmmcBusiness.cs
index b5b4ca161b..53233ef7de 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CmmcBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CmmcBusiness.cs
@@ -37,6 +37,7 @@ public class CmmcBusiness
 
         private readonly int _level1Max = 15;
         private readonly int _level2Max = 110;
+        private readonly int _level3Max = 24;
 
 
         /// <summary>
@@ -72,18 +73,21 @@ public CmmcScores GetCmmcScores(int assessmentId)
 
             // Level 1
             response.Level1Score = GetScoreForLevel(assessmentId, 1);
+            response.Level1MaxScore = _level1Max;
 
 
 
             // Level 2
             var sprs = GetSPRSScore(assessmentId);
             response.Level2Score = sprs.LevelScore;
+            response.Level2MaxScore = _level2Max;
             response.Level2Active = (response.Level1Score == _level1Max);
 
 
 
             // Level 3
             response.Level3Score = GetScoreForLevel(assessmentId, 3);
+            response.Level3MaxScore = _level3Max;
             response.Level3Active = (response.Level2Score == _level2Max);
 
 
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/CmmcScores.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/CmmcScores.cs
index 722b8ae0c4..4f4c0820d1 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/CmmcScores.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Maturity/CmmcScores.cs
@@ -9,10 +9,12 @@ namespace CSETWebCore.Model.Maturity
     public class CmmcScores
     {
         public int Level1Score { get; set; }
+        public int Level1MaxScore { get; set; }
 
 
 
         public int Level2Score { get; set; }
+        public int Level2MaxScore { get; set; }
 
         /// <summary>
         /// Level 3 is only active if Level 1 is 100% compliant
@@ -22,6 +24,7 @@ public class CmmcScores
 
 
         public int Level3Score { get; set; }
+        public int Level3MaxScore { get; set; }
 
         /// <summary>
         /// Level 3 is only active if Level 2 is 100% compliant
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-domain-results/cmmc2-domain-results.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-domain-results/cmmc2-domain-results.component.html
index b9ae70fdce..e1e91bf196 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-domain-results/cmmc2-domain-results.component.html
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-domain-results/cmmc2-domain-results.component.html
@@ -20,13 +20,12 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
   SOFTWARE. 
 -------------------------->
-<div class="white-panel oy-auto h-0 d-flex flex-column flex-11a">
-  <h3>Performance by Domain</h3>
+<div class="white-panel oy-auto h-0 d-flex flex-column flex-11a" *transloco="let t">
+  <h3>{{t('titles.performance by domain')}}</h3>
 
   <div>
     <p>
-      The following chart shows the percentage of practices met for each
-      domain at target level {{targetLevel}}.
+      {{ t('cmmc.scoring.perf by domain desc', {targetLevel: targetLevel}) }}
     </p>
 
     <div *ngIf="loading">
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-domain-results/cmmc2-domain-results.component.ts b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-domain-results/cmmc2-domain-results.component.ts
index c501cb13f5..713c130aae 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-domain-results/cmmc2-domain-results.component.ts
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-domain-results/cmmc2-domain-results.component.ts
@@ -23,7 +23,6 @@
 ////////////////////////////////
 import { AfterContentInit, Component, OnInit } from '@angular/core';
 import { NavigationService } from '../../../../services/navigation/navigation.service';
-import { Title } from '@angular/platform-browser';
 import { MaturityService } from '../../../../services/maturity.service';
 import { CmmcStyleService } from '../../../../services/cmmc-style.service';
 import { ChartService } from '../../../../services/chart.service';
@@ -48,7 +47,6 @@ export class Cmmc2DomainResultsComponent implements OnInit, AfterContentInit {
   constructor(
     public navSvc: NavigationService,
     public maturitySvc: MaturityService,
-    private titleService: Title,
     public cmmcStyleSvc: CmmcStyleService,
     public chartSvc: ChartService
   ) { }
@@ -63,7 +61,6 @@ export class Cmmc2DomainResultsComponent implements OnInit, AfterContentInit {
         this.targetLevel = r.toString();
       }
     });
-
   }
 
   ngAfterContentInit(): void {
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level-results/cmmc2-level-results.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level-results/cmmc2-level-results.component.html
index b603f896e3..04491efdcc 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level-results/cmmc2-level-results.component.html
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level-results/cmmc2-level-results.component.html
@@ -20,8 +20,8 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
   SOFTWARE. 
 -------------------------->
-<div class="white-panel oy-auto h-0 d-flex flex-column flex-11a">
-    <h3>Performance by Level</h3>
+<div class="white-panel oy-auto h-0 d-flex flex-column flex-11a" *transloco="let t">
+    <h3>{{t('titles.performance by level')}}</h3>
 
     <div *ngIf="loading">
         <div class="spinner-container" style="margin-left: auto; margin-right: auto;">
@@ -31,7 +31,7 @@ <h3>Performance by Level</h3>
 
     <div>
         <p>
-            This page shows the answer distribution by level.
+            {{t('cmmc.scoring.perf by level desc')}}
         </p>
         <div class="d-flex mb-4" [class.flex-row]="!layoutSvc.hp" [class.flex-column]="layoutSvc.hp"
             *ngFor="let l of response">
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level-results/cmmc2-level-results.component.ts b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level-results/cmmc2-level-results.component.ts
index 42b18b39df..16d3457bc3 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level-results/cmmc2-level-results.component.ts
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level-results/cmmc2-level-results.component.ts
@@ -73,7 +73,6 @@ export class Cmmc2LevelResultsComponent implements OnInit, AfterContentInit {
   refreshChart() {
     this.maturitySvc.getComplianceByLevel().subscribe((r: any) => {
       this.response = r;
-      //this.response.reverse();
 
       r.forEach(level => {
         let g = level.answerDistribution.find(a => a.value == 'Y');
@@ -93,7 +92,7 @@ export class Cmmc2LevelResultsComponent implements OnInit, AfterContentInit {
         });
 
         setTimeout(() => {
-          level.chart = this.chartSvc.buildDoughnutChart('level' + level.levelValue, x);
+          level.chart = this.chartSvc.buildDoughnutChart('level' + level.levelValue, x, 'CMMC2F');
         }, 10);
       });
 
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.html
index 2ac1586165..02c3d0a8a0 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.html
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.html
@@ -23,23 +23,23 @@
 <div class="mb-5" *transloco="let t">
   <h5>{{t('level.level 1')}}</h5>
 
-  <svg viewBox="0 0 800 130" [attr.width]="width" height="130" xmlns="http://www.w3.org/2000/svg"
+  <svg viewBox="0 0 800 120" [attr.width]="width" height="120" xmlns="http://www.w3.org/2000/svg"
     style="background: #f0f0f0;" [class.disabled-svg]="!active">
 
     <!-- Define scale values -->
-    <g class="grid" transform="translate(30, 40)">
+    <g class="grid" transform="translate(30, 30)">
       <line x1="0" [attr.x2]="n(maxScore)" y1="60" y2="60" stroke="#aaa" />
       <text [attr.x]="n(0)" y="80" font-size="10" text-anchor="middle">0</text>
       <text [attr.x]="n(maxScore)" y="80" font-size="10" text-anchor="middle">{{maxScore}}</text>
     </g>
 
     <!-- Draw bar -->
-    <g class="bars" transform="translate(30, 30)">
+    <g class="bars" transform="translate(30, 20)">
       <rect x="0" y="50" [attr.width]="n(score)" height="20" fill="#921285" [matTooltip]="score"></rect>
     </g>
 
     <!-- Axis line for current score -->
-    <g transform="translate(30, 0)">
+    <g transform="translate(30, -10)">
       <line [attr.x1]="n(score)" [attr.x2]="n(score)" y1="55" y2="100" stroke="#aaa"></line>
       <text [attr.x]="n(score)" y="50" font-size="10" text-anchor="middle">Score: {{score}}</text>
     </g>
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.ts b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.ts
index 5c9d0b6229..8775747466 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.ts
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.ts
@@ -32,11 +32,12 @@ export class Cmmc2Level1ScoreComponent {
 
   width = 700;
 
-  maxScore: number = 15;
-
   
   @Input()
   score: number;
+
+  @Input()
+  maxScore: number;
   
   @Input()
   active = true;
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level2-score/cmmc2-level2-score.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level2-score/cmmc2-level2-score.component.html
index 67a57bbc8b..4f6bd3b282 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level2-score/cmmc2-level2-score.component.html
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level2-score/cmmc2-level2-score.component.html
@@ -24,10 +24,10 @@
   <h5>{{t('level.level 2')}}</h5>
 
   <p *ngIf="!active">
-    {{t('cmmc.scoring.level2 inactive description')}}
+    {{t('cmmc.scoring.inactive description')}}
   </p>
 
-  <svg viewBox="0 0 800 130" [attr.width]="width" height="130" xmlns="http://www.w3.org/2000/svg"
+  <svg viewBox="0 0 800 120" [attr.width]="width" height="120" xmlns="http://www.w3.org/2000/svg"
     style="background: #f0f0f0;" [class.disabled-svg]="!active">
     <!-- Define gradient -->
     <defs>
@@ -39,7 +39,7 @@ <h5>{{t('level.level 2')}}</h5>
     </defs>
 
     <!-- Define scale values -->
-    <g class="grid" transform="translate(30, 40)">
+    <g class="grid" transform="translate(30, 30)">
       <text [attr.x]="n(-203)" y="70" font-size="10" text-anchor="middle">-203</text>
       <text [attr.x]="n(-100)" y="70" font-size="10" text-anchor="middle">-100</text>
       <text [attr.x]="n(0)" y="70" font-size="10" text-anchor="middle">0</text>
@@ -48,7 +48,7 @@ <h5>{{t('level.level 2')}}</h5>
     </g>
 
     <!-- Draw bar -->
-    <g class="bars" transform="translate(30, 30)">
+    <g class="bars" transform="translate(30, 20)">
       <rect x="0" y="40" [attr.width]="width" height="20" fill="url(#barGradient)" [matTooltip]="'SPRS: ' + score" *ngIf="active">
       </rect>
       <rect x="0" y="40" [attr.width]="width" height="20" fill="white" stroke="#aaa" [matTooltip]="'SPRS: ' + score" *ngIf="!active">
@@ -56,7 +56,7 @@ <h5>{{t('level.level 2')}}</h5>
     </g>
 
     <!-- Axis line for current score -->
-    <g transform="translate(30, 0)">
+    <g transform="translate(30, -10)">
       <line [attr.x1]="n(score)" [attr.x2]="n(score)" y1="45" y2="90" stroke="#aaa"></line>
       <text [attr.x]="n(score)" y="40" font-size="10" text-anchor="middle">Score: {{score}}</text>
     </g>
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.html
index 4697757913..5be30ab389 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.html
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.html
@@ -24,27 +24,27 @@
   <h5>{{t('level.level 3')}}</h5>
 
   <p *ngIf="!active">
-    {{t('cmmc.scoring.level2 inactive description')}}
+    {{t('cmmc.scoring.inactive description')}}
   </p>
 
-  <svg viewBox="0 0 800 130" [attr.width]="width" height="130" xmlns="http://www.w3.org/2000/svg"
+  <svg viewBox="0 0 800 120" [attr.width]="width" height="120" xmlns="http://www.w3.org/2000/svg"
     style="background: #f0f0f0;" [class.disabled-svg]="!active">
 
     <!-- Define scale values -->
-    <g class="grid" transform="translate(30, 40)">
+    <g class="grid" transform="translate(30, 30)">
       <line x1="0" [attr.x2]="n(maxScore)" y1="60" y2="60" stroke="#aaa" />
       <text [attr.x]="n(0)" y="80" font-size="10" text-anchor="middle">0</text>
       <text [attr.x]="n(maxScore)" y="80" font-size="10" text-anchor="middle">{{maxScore}}</text>
     </g>
 
     <!-- Draw bar -->
-    <g class="bars" transform="translate(30, 30)">
+    <g class="bars" transform="translate(30, 20)">
       <rect x="0" y="50" [attr.width]="n(score)" height="20" fill="#034b61" [matTooltip]="score" *ngIf="active"></rect>
       <rect x="0" y="50" [attr.width]="n(score)" height="20" fill="white" stroke="#aaa" [matTooltip]="score" *ngIf="!active"></rect>
     </g>
 
     <!-- Axis line for current score -->
-    <g transform="translate(30, 0)">
+    <g transform="translate(30, -10)">
       <line [attr.x1]="n(score)" [attr.x2]="n(score)" y1="55" y2="100" stroke="#aaa"></line>
       <text [attr.x]="n(score)" y="50" font-size="10" text-anchor="middle">Score: {{score}}</text>
     </g>
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.ts b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.ts
index 9067d2879e..12750f4503 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.ts
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.ts
@@ -31,11 +31,12 @@ import { Component, Input } from '@angular/core';
 export class Cmmc2Level3ScoreComponent {
 
   width = 700;
-
-  maxScore: number = 35;
-
+  
   @Input()
   score: number;
+  
+  @Input()
+  maxScore: number;
 
   @Input()
   active = true;
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-results/cmmc2-results.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-results/cmmc2-results.component.html
index b86ba3a50e..f454d3813b 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-results/cmmc2-results.component.html
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-results/cmmc2-results.component.html
@@ -20,8 +20,8 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
   SOFTWARE. 
 -------------------------->
-<div class="white-panel oy-auto h-0 d-flex flex-column flex-11a">
-    <h3>Performance by Level</h3>
+<div class="white-panel oy-auto h-0 d-flex flex-column flex-11a" *transloco="let t">
+    <h3>{{t('titles.performance by level')}}</h3>
 
     <div *ngIf="loading">
         <div class="spinner-container" style="margin-left: auto; margin-right: auto;">
@@ -31,7 +31,7 @@ <h3>Performance by Level</h3>
 
     <div>
         <p>
-            This page shows the answer distribution by level.
+            {{t('cmmc.scoring.perf by level desc')}}
         </p>
         <div class="d-flex flex-row" *ngFor="let l of response">
             <!-- pie charts for compliance at each level -->
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-scores/cmmc2-scores.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-scores/cmmc2-scores.component.html
index fb16695273..8d589df027 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-scores/cmmc2-scores.component.html
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-scores/cmmc2-scores.component.html
@@ -30,19 +30,26 @@ <h3>{{t('titles.cmmc scoring')}}</h3>
      </div>
 
      <p>
-          {{t('cmmc.scoring.score charts description')}}
+          {{t('cmmc.scoring.score charts description 1')}}
+     </p>
+     <p>
+          {{t('cmmc.scoring.score charts description 2')}}
+     </p>
+     <p>
+          {{t('cmmc.scoring.score charts description 3')}}
      </p>
 
      <div *ngIf="!loading">
 
-          <app-cmmc2-level1-score [score]="scores?.level1Score"></app-cmmc2-level1-score>
+          <app-cmmc2-level1-score [score]="scores?.level1Score"
+               [maxScore]="scores?.level1MaxScore"></app-cmmc2-level1-score>
 
-          <app-cmmc2-level2-score [score]="scores?.level2Score" [active]="scores?.level2Active"
-               *ngIf="assessSvc.assessment.maturityModel.maturityTargetLevel >= 2">
+          <app-cmmc2-level2-score [score]="scores?.level2Score" [maxScore]="scores?.level2MaxScore"
+               [active]="scores?.level2Active" *ngIf="assessSvc.assessment.maturityModel.maturityTargetLevel >= 2">
           </app-cmmc2-level2-score>
 
-          <app-cmmc2-level3-score [score]="scores?.level3Score" [active]="scores?.level3Active"
-               *ngIf="assessSvc.assessment.maturityModel.maturityTargetLevel >= 3">
+          <app-cmmc2-level3-score [score]="scores?.level3Score" [maxScore]="scores?.level3MaxScore"
+               [active]="scores?.level3Active" *ngIf="assessSvc.assessment.maturityModel.maturityTargetLevel >= 3">
           </app-cmmc2-level3-score>
 
      </div>
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.html
index cb07cd3047..83d357f6c4 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.html
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.html
@@ -20,12 +20,12 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
   SOFTWARE. 
 -------------------------->
-<table class="table table-td-p2" [class.fs-smaller]="layoutSvc.hp" *transloco="let t">
+<table class="table table-td-p2 table-td-small" [class.fs-smaller]="layoutSvc.hp" *transloco="let t">
      <tr>
           <th>{{t('cmmc.scoring.practice')}}</th>
           <th></th>
           <th>
-               {{ layoutSvc.hp ? t('cmmc.scoring.response-abbr') : t('cmmc.scoring.response-long') }}
+               {{ layoutSvc.hp ? t('cmmc.scoring.answer-abbr') : t('cmmc.scoring.answer-long') }}
           </th>
           <th>
                {{ layoutSvc.hp ? t('cmmc.scoring.deduct-abbr') : t('cmmc.scoring.deduct-long') }}
@@ -34,7 +34,7 @@
 
      <ng-template ngFor let-d [ngForOf]="response?.domains">
           <tr>
-               <td colspan="4" class="h5">
+               <td colspan="4" class="h5" style="font-size: .9em;">
                     <div style="border-top: 1px solid #555; border-bottom: 1px solid #555;">
                          {{d.domainName}}
                     </div>
diff --git a/CSETWebNg/src/app/layout/acet-layout-main/acet-layout-main.component.scss b/CSETWebNg/src/app/layout/acet-layout-main/acet-layout-main.component.scss
index 60e6398b5e..03ed3f9a08 100644
--- a/CSETWebNg/src/app/layout/acet-layout-main/acet-layout-main.component.scss
+++ b/CSETWebNg/src/app/layout/acet-layout-main/acet-layout-main.component.scss
@@ -623,6 +623,10 @@ table.assessment-summary th {
   padding: .5rem !important;
 }
 
+.table.table-td-small th, .table.table-td-small td {
+  font-size: .875em;
+}
+
 // force transparent
 .table>:not(caption)>*>* {
   background-color: transparent !important;
diff --git a/CSETWebNg/src/app/layout/cf-layout-main/cf-layout-main.component.scss b/CSETWebNg/src/app/layout/cf-layout-main/cf-layout-main.component.scss
index b505e253b4..81b49dfe4d 100644
--- a/CSETWebNg/src/app/layout/cf-layout-main/cf-layout-main.component.scss
+++ b/CSETWebNg/src/app/layout/cf-layout-main/cf-layout-main.component.scss
@@ -636,6 +636,10 @@ table.assessment-summary th {
   padding: .5rem !important;
 }
 
+.table.table-td-small th, .table.table-td-small td {
+  font-size: .875em;
+}
+
 // force transparent
 .table>:not(caption)>*>* {
   background-color: transparent !important;
diff --git a/CSETWebNg/src/app/layout/cie-layout-main/cie-layout-main.component.scss b/CSETWebNg/src/app/layout/cie-layout-main/cie-layout-main.component.scss
index f044762682..b11f65cacb 100644
--- a/CSETWebNg/src/app/layout/cie-layout-main/cie-layout-main.component.scss
+++ b/CSETWebNg/src/app/layout/cie-layout-main/cie-layout-main.component.scss
@@ -633,6 +633,10 @@ table.assessment-summary th {
   padding: .5rem !important;
 }
 
+.table.table-td-small th, .table.table-td-small td {
+  font-size: .875em;
+}
+
 // force transparent
 .table>:not(caption)>*>* {
   background-color: transparent !important;
diff --git a/CSETWebNg/src/app/layout/iod-layout/iod-layout.component.scss b/CSETWebNg/src/app/layout/iod-layout/iod-layout.component.scss
index e1f081ae1c..0d33c2f126 100644
--- a/CSETWebNg/src/app/layout/iod-layout/iod-layout.component.scss
+++ b/CSETWebNg/src/app/layout/iod-layout/iod-layout.component.scss
@@ -629,6 +629,10 @@ table.assessment-summary th {
   padding: .5rem !important;
 }
 
+.table.table-td-small th, .table.table-td-small td {
+  font-size: .875em;
+}
+
 // force transparent
 .table>:not(caption)>*>* {
   background-color: transparent !important;
diff --git a/CSETWebNg/src/app/layout/layout-main/layout-main.component.scss b/CSETWebNg/src/app/layout/layout-main/layout-main.component.scss
index 17f4327fac..bde5a02f77 100644
--- a/CSETWebNg/src/app/layout/layout-main/layout-main.component.scss
+++ b/CSETWebNg/src/app/layout/layout-main/layout-main.component.scss
@@ -629,6 +629,10 @@ table.assessment-summary th {
   padding: .5rem !important;
 }
 
+.table.table-td-small th, .table.table-td-small td {
+  font-size: .875em;
+}
+
 // force transparent
 .table>:not(caption)>*>* {
   background-color: transparent !important;
diff --git a/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.scss b/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.scss
index ed40cc9979..ddc806bc43 100644
--- a/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.scss
+++ b/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.scss
@@ -649,6 +649,10 @@ table.assessment-summary th {
   padding: .5rem !important;
 }
 
+.table.table-td-small th, .table.table-td-small td {
+  font-size: .875em;
+}
+
 // force transparent
 .table>:not(caption)>*>* {
   background-color: transparent !important;
diff --git a/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.scss b/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.scss
index a61e15d970..96688ffe28 100644
--- a/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.scss
+++ b/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.scss
@@ -531,6 +531,10 @@ table.assessment-summary th {
   padding: .5rem !important;
 }
 
+.table.table-td-small th, .table.table-td-small td {
+  font-size: .875em;
+}
+
 // force transparent
 .table>:not(caption)>*>* {
   background-color: transparent !important;
diff --git a/CSETWebNg/src/app/layout/styles-base.scss b/CSETWebNg/src/app/layout/styles-base.scss
index d3be9c3e55..74d8c6c29d 100644
--- a/CSETWebNg/src/app/layout/styles-base.scss
+++ b/CSETWebNg/src/app/layout/styles-base.scss
@@ -525,6 +525,10 @@ table.assessment-summary th {
   padding: .5rem !important;
 }
 
+.table.table-td-small th, .table.table-td-small td {
+  font-size: .875em;
+}
+
 // force transparent
 .table>:not(caption)>*>* {
   background-color: transparent !important;
diff --git a/CSETWebNg/src/app/layout/styles-rra.scss b/CSETWebNg/src/app/layout/styles-rra.scss
index 9eeb626776..c9dc143a91 100644
--- a/CSETWebNg/src/app/layout/styles-rra.scss
+++ b/CSETWebNg/src/app/layout/styles-rra.scss
@@ -90,6 +90,10 @@ table.assessment-summary th {
     padding: .5rem !important;
 }
 
+.table.table-td-small th, .table.table-td-small td {
+    font-size: .875em;
+  }
+
 // force transparent
 .table>:not(caption)>*>* {
     background-color: transparent !important;
diff --git a/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.scss b/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.scss
index 4c70e12c31..fad3edf3ce 100644
--- a/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.scss
+++ b/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.scss
@@ -637,6 +637,10 @@ table.assessment-summary th {
   padding: .5rem !important;
 }
 
+.table.table-td-small th, .table.table-td-small td {
+  font-size: .875em;
+}
+
 // force transparent
 .table>:not(caption)>*>* {
   background-color: transparent !important;
diff --git a/CSETWebNg/src/app/reports/reports.scss b/CSETWebNg/src/app/reports/reports.scss
index 3b96bd6c79..640ab58d91 100644
--- a/CSETWebNg/src/app/reports/reports.scss
+++ b/CSETWebNg/src/app/reports/reports.scss
@@ -529,11 +529,14 @@ table.assessment-summary th {
   padding: .5rem;
 }
 
-.table.table-td-p2 th,
-.table.table-td-p2 td {
+.table.table-td-p2 th, .table.table-td-p2 td {
   padding: .5rem !important;
 }
 
+.table.table-td-small th, .table.table-td-small td {
+  font-size: .875em;
+}
+
 // force transparent
 .table>:not(caption)>*>* {
   background-color: transparent !important;
diff --git a/CSETWebNg/src/app/services/chart.service.ts b/CSETWebNg/src/app/services/chart.service.ts
index 2f3a2b2a4a..b989a13ae1 100644
--- a/CSETWebNg/src/app/services/chart.service.ts
+++ b/CSETWebNg/src/app/services/chart.service.ts
@@ -187,7 +187,7 @@ export class ChartService {
    * @param canvasId
    * @param x
    */
-  buildDoughnutChart(canvasId: string, x: any) {
+  buildDoughnutChart(canvasId: string, x: any, modelName?: string) {
     let tempChart = Chart.getChart(canvasId);
     if (tempChart) {
       tempChart.destroy();
@@ -198,7 +198,7 @@ export class ChartService {
     let segmentLabels = [];
     x.labels.forEach(element => {
       segmentColors.push(this.segmentColor(element));
-      segmentLabels.push(this.questionsSvc.answerDisplayLabel('', element));
+      segmentLabels.push(this.questionsSvc.answerDisplayLabel(modelName ?? '', element));
     });
 
 
diff --git a/CSETWebNg/src/assets/i18n/en.json b/CSETWebNg/src/assets/i18n/en.json
index f90730733e..befe74445f 100644
--- a/CSETWebNg/src/assets/i18n/en.json
+++ b/CSETWebNg/src/assets/i18n/en.json
@@ -296,6 +296,8 @@
     "analytics": "Analytics",
     "assessment complete": "Assessment Complete",
     "performance summary": "Performance Summary",
+    "performance by domain": "Performance by Domain",
+    "performance by level": "Performance by Level",
     "security practice checklist": "Security Practice Checklist",
     "goal performance": "Goal Performance",
     "assessment tiers": "Assessment Tiers",
@@ -623,15 +625,18 @@
       "l3 b": "Level 3 only applies to systems that have already achieved a Final Level 2 (C3PAO) CMMC Status."
     },
     "scoring": {
-      "score charts description": "To progress through the levels, you must be fully compliant at the current level before moving on to the next. This means achieving all required criteria at Level 1 before you can receive credit for Level 2, and so forth. Please note that we only display scoring charts for the levels relevant to your current assessment. For example, if your target is Level 1, you will see a single bar chart reflecting your compliance status for that specific level. This approach ensures clarity and focus on the immediate requirements.",
-      "level2 inactive description": "This chart shows your progress, but it is disabled because the previous level is not yet fully compliant.",
-      "level3 inactive description": "This chart shows your progress, but it is disabled because the previous level is not yet fully compliant.",
-      "scorecard description": "Each level's questions are listed here with their answers and, if not met, the number of points deducted from a perfect score.",
+      "score charts description 1": "The following chart(s) illustrate the organization's progress in meeting the cybersecurity standards evaluated in the CMMC assessment. This page provides data based on the level selected on the CMMC Target Level Selection page (e.g., if the user selects a target level of 2, charts for both Level 1 and Level 2 will display). This approach ensures clarity and focus on the immediate requirements.",
+      "score charts description 2": "Scoring within the CMMC program is cumulative, meaning organizations must achieve compliance in all previous levels before advancing to the next one. For instance, an organization must complete the requirements for Level 1 and Level 2 before progressing to Level 3.",
+      "score charts description 3": "For further guidance, refer to the CMMC Tutorial within the Prepare section. A link to CMMC documentation is also available in the Additional Resources section.",
+      "inactive description": "The following chart displays the organization’s current progress within the level, independent of the CMMC program's cumulative scoring requirements, and without consideration for the progress made in previous levels. Please note that the level is not considered achieved, as the organization has not met the compliance requirements for the preceding level(s).",
+      "scorecard description": "The table below lists all practices and their corresponding responses, organized by level and then by the individual domain. Additionally, if a requirement is not met, the points deducted from the total score are shown in the Deduction column.",
       "practice": "Practice",
-      "response-long": "Response",
-      "response-abbr": "Resp",
+      "answer-long": "Answer",
+      "answer-abbr": "Ans",
       "deduct-long": "Deduction",
-      "deduct-abbr": "Deduct"
+      "deduct-abbr": "Deduct",
+      "perf by domain desc": "The following chart shows the percentage of practices Met or N/A for each domain at target level {{targetLevel}}.",
+      "perf by level desc": "The following chart(s) displays the percentage distribution of each response type by level."
     }
   },
   "filter-menu": {
diff --git a/CSETWebNg/src/assets/navigation/workflow-omni.xml b/CSETWebNg/src/assets/navigation/workflow-omni.xml
index 805f5e2cf8..59f5be6b9f 100644
--- a/CSETWebNg/src/assets/navigation/workflow-omni.xml
+++ b/CSETWebNg/src/assets/navigation/workflow-omni.xml
@@ -345,8 +345,8 @@
         <!-- Results - CMMC2 -->
         <node d="cmmc scoring" id="cmmc2-scores" path="assessment/{:id}/results/cmmc2-scores" visible="MATURITY:19" />
         <node d="cmmc scorecard" id="cmmc2-scorecard" path="assessment/{:id}/results/cmmc2-scorecard" visible="MATURITY:19" />
-        <node displaytext="Performance by Level" id="cmmc2-level-results" path="assessment/{:id}/results/cmmc2-level-results" visible="MATURITY-ANY(6,19)" />
-        <node displaytext="Performance by Domain" id="cmmc2-domain-results" path="assessment/{:id}/results/cmmc2-domain-results" visible="MATURITY-ANY(6,19)" />
+        <node d="performance by level" id="cmmc2-level-results" path="assessment/{:id}/results/cmmc2-level-results" visible="MATURITY-ANY(6,19)" />
+        <node d="performance by domain" id="cmmc2-domain-results" path="assessment/{:id}/results/cmmc2-domain-results" visible="MATURITY-ANY(6,19)" />
 
 
 
diff --git a/CSETWebNg/src/sass/styles.scss b/CSETWebNg/src/sass/styles.scss
index fca941b4e6..8abeca375d 100644
--- a/CSETWebNg/src/sass/styles.scss
+++ b/CSETWebNg/src/sass/styles.scss
@@ -352,6 +352,10 @@ table.assessment-summary th {
   padding: .5rem !important;
 }
 
+.table.table-td-small th, .table.table-td-small td {
+  font-size: .875em;
+}
+
 // force transparent
 .table>:not(caption)>*>* {
   background-color: transparent !important;