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; /// @@ -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; } /// /// 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; } /// /// 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. --------------------------> -