= 3">
+
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-scorecard/cmmc2-scorecard.component.scss b/CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/cmmc2-scorecard/cmmc2-scorecard-page.component.scss
similarity index 100%
rename from CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-scorecard/cmmc2-scorecard.component.scss
rename to CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/cmmc2-scorecard/cmmc2-scorecard-page.component.scss
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/cmmc2-scorecard/cmmc2-scorecard-page.component.ts b/CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/cmmc2-scorecard/cmmc2-scorecard-page.component.ts
new file mode 100644
index 0000000000..2c5388258b
--- /dev/null
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/cmmc2-scorecard/cmmc2-scorecard-page.component.ts
@@ -0,0 +1,40 @@
+import { Component, OnInit } from '@angular/core';
+import { AssessmentService } from '../../../../../services/assessment.service';
+import { MaturityService } from '../../../../../services/maturity.service';
+
+@Component({
+ selector: 'app-cmmc2-scorecard-page',
+ templateUrl: './cmmc2-scorecard-page.component.html',
+ styleUrl: './cmmc2-scorecard-page.component.scss'
+})
+export class Cmmc2ScorecardPageComponent implements OnInit {
+
+ scorecards: any[];
+
+ targetLevel: number;
+
+ /**
+ *
+ */
+ constructor(
+ public maturitySvc: MaturityService
+ ) {}
+
+ /**
+ *
+ */
+ ngOnInit(): void {
+ this.maturitySvc.getCmmcScorecards().subscribe((x: any) => {
+ this.targetLevel = x.targetLevel;
+ this.scorecards = x.levelScorecards;
+ });
+ }
+
+ scorecardForLevel(l: number) {
+ if (!!this.scorecards) {
+ const sc = this.scorecards.find(x => x.level == l);
+ return sc;
+ }
+ return null;
+ }
+}
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/level-scorecard/level-scorecard.component.html
similarity index 94%
rename from CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.html
rename to CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/level-scorecard/level-scorecard.component.html
index 33ec10b610..f574316ac7 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.html
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/level-scorecard/level-scorecard.component.html
@@ -45,7 +45,7 @@
{{q.title}} |
|
- {{t('answer-options.labels.' + q.answerText.toLowerCase() +
+ | {{t('answer-options.labels.' + q.answerText.toLowerCase() +
'-cmmc')}} |
{{q.score == 0 ? '' : q.score}} |
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.scss b/CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/level-scorecard/level-scorecard.component.scss
similarity index 100%
rename from CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.scss
rename to CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/level-scorecard/level-scorecard.component.scss
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.ts b/CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/level-scorecard/level-scorecard.component.ts
similarity index 65%
rename from CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.ts
rename to CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/level-scorecard/level-scorecard.component.ts
index ec3c9d7d3d..0c38aecc67 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.ts
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/level-scorecard/level-scorecard.component.ts
@@ -1,10 +1,10 @@
import { Component, Input } from '@angular/core';
-import { LayoutService } from '../../../../services/layout.service';
+import { LayoutService } from '../../../../../services/layout.service';
@Component({
selector: 'app-level-scorecard',
templateUrl: './level-scorecard.component.html',
- styleUrl: './level-scorecard.component.scss'
+ styleUrls: ['../../../../../reports/reports.scss','./level-scorecard.component.scss']
})
export class LevelScorecardComponent {
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/sprs-score/sprs-score.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/sprs-score/sprs-score.component.html
similarity index 100%
rename from CSETWebNg/src/app/assessment/results/mat-cmmc2/sprs-score/sprs-score.component.html
rename to CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/sprs-score/sprs-score.component.html
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/sprs-score/sprs-score.component.ts b/CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/sprs-score/sprs-score.component.ts
similarity index 89%
rename from CSETWebNg/src/app/assessment/results/mat-cmmc2/sprs-score/sprs-score.component.ts
rename to CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/sprs-score/sprs-score.component.ts
index a57a820d27..8dc9246d08 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/sprs-score/sprs-score.component.ts
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/scorecard/sprs-score/sprs-score.component.ts
@@ -23,9 +23,9 @@
////////////////////////////////
import { Component, OnInit } from '@angular/core';
import { Title } from '@angular/platform-browser';
-import { LayoutService } from '../../../../services/layout.service';
-import { MaturityService } from '../../../../services/maturity.service';
-import { NavigationService } from '../../../../services/navigation/navigation.service';
+import { LayoutService } from '../../../../../services/layout.service';
+import { MaturityService } from '../../../../../services/maturity.service';
+import { NavigationService } from '../../../../../services/navigation/navigation.service';
@Component({
selector: 'app-sprs-score',
diff --git a/CSETWebNg/src/app/assessment/results/reports/report-list/report-list.json b/CSETWebNg/src/app/assessment/results/reports/report-list/report-list.json
index be97836f76..2b35416476 100644
--- a/CSETWebNg/src/app/assessment/results/reports/report-list/report-list.json
+++ b/CSETWebNg/src/app/assessment/results/reports/report-list/report-list.json
@@ -59,7 +59,7 @@
"linkUrl": "executivecmmc2"
},
{
- "linkUrl": "cmmc2Scorecard"
+ "linkUrl": "cmmc2ScorecardReport"
},
{
"linkUrl": "cmmc2CommentsMarked"
diff --git a/CSETWebNg/src/app/reports/cmmc2/cmmc2-scorecard-report/cmmc2-scorecard-report.component.html b/CSETWebNg/src/app/reports/cmmc2/cmmc2-scorecard-report/cmmc2-scorecard-report.component.html
new file mode 100644
index 0000000000..2d6eb37f1d
--- /dev/null
+++ b/CSETWebNg/src/app/reports/cmmc2/cmmc2-scorecard-report/cmmc2-scorecard-report.component.html
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{t('cmmc.scoring.scorecard description')}}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CSETWebNg/src/app/reports/cmmc2/cmmc2-scorecard-report/cmmc2-scorecard-report.component.scss b/CSETWebNg/src/app/reports/cmmc2/cmmc2-scorecard-report/cmmc2-scorecard-report.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/CSETWebNg/src/app/reports/cmmc2/cmmc2-scorecard-report/cmmc2-scorecard-report.component.ts b/CSETWebNg/src/app/reports/cmmc2/cmmc2-scorecard-report/cmmc2-scorecard-report.component.ts
new file mode 100644
index 0000000000..6a134c2647
--- /dev/null
+++ b/CSETWebNg/src/app/reports/cmmc2/cmmc2-scorecard-report/cmmc2-scorecard-report.component.ts
@@ -0,0 +1,59 @@
+import { Component, Input } from '@angular/core';
+import { AssessmentService } from '../../../services/assessment.service';
+import { MaturityService } from '../../../services/maturity.service';
+
+@Component({
+ selector: 'app-cmmc2-scorecard-report',
+ templateUrl: './cmmc2-scorecard-report.component.html',
+ styleUrls: ['../../../reports/reports.scss']
+})
+export class Cmmc2ScorecardReportComponent {
+
+ assessmentDate: string;
+ assessorName: string;
+ facilityName: string;
+
+ @Input()
+ scorecards: any[];
+
+ targetLevel: number;
+
+/**
+ *
+ */
+ constructor(
+ public assessSvc: AssessmentService,
+ public maturitySvc: MaturityService
+ ) { }
+
+ /**
+ *
+ */
+ ngOnInit(): void {
+ this.maturitySvc.getCmmcReportData().subscribe((r: any) => {
+ const info = r.reportData.information;
+ this.assessmentDate = info.assessment_Date;
+ this.assessorName = info.assessor_Name;
+ this.facilityName = info.facility_Name;
+ });
+
+ this.maturitySvc.getCmmcScorecards().subscribe((x: any) => {
+ this.targetLevel = x.targetLevel;
+ this.scorecards = x.levelScorecards;
+ });
+ }
+
+ /**
+ *
+ */
+ scorecardForLevel(l: number) {
+ return this.scorecards?.find(x => x.level == l);
+ }
+
+ /**
+ *
+ */
+ printReport() {
+ window.print();
+ }
+}
diff --git a/CSETWebNg/src/app/reports/cmmc2/executive-cmmc2/executive-cmmc2.component.html b/CSETWebNg/src/app/reports/cmmc2/executive-cmmc2/executive-cmmc2.component.html
index eb3871b641..10055f15a6 100644
--- a/CSETWebNg/src/app/reports/cmmc2/executive-cmmc2/executive-cmmc2.component.html
+++ b/CSETWebNg/src/app/reports/cmmc2/executive-cmmc2/executive-cmmc2.component.html
@@ -20,7 +20,7 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-------------------------->
-
+
@@ -60,7 +60,37 @@
+
+
+
+
+ {{t('cmmc.scoring.score charts description 1')}}
+
+
+ {{t('cmmc.scoring.score charts description 2')}}
+
+
+ {{t('cmmc.scoring.score charts description 3')}}
+
+
+
+
+
+
= 2">
+
+
+
= 3">
+
+
+
+
+
@@ -70,7 +100,7 @@
The figure shows the organization's progress throughout the CMMC based on the individual target level and
overall cybersecurity assessment.
-