TD-4427 renaming the NumberOfAssignOptionalCompetencies to NumberOfSelfAssessedOptionalCompetencies

Author: sherif-olaboye

DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs

@@ -468,7 +468,7 @@ public IActionResult SelfAssessmentOverview(int selfAssessmentId, string vocabul
                 CompetencyGroups = competencies.GroupBy(competency => competency.CompetencyGroup),
                 PreviousCompetencyNumber = Math.Max(competencies.Count(), 1),
                 NumberOfOptionalCompetencies = optionalCompetencies.Count(),
-                NumberOfAssignOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment ) ,
+                NumberOfSelfAssessedOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment ) ,
                 SupervisorSignOffs = supervisorSignOffs,
                 SearchViewModel = searchViewModel
             };

DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentOverviewViewModel.cs

@@ -13,7 +13,7 @@ public class SelfAssessmentOverviewViewModel
         public IEnumerable<SupervisorSignOff>? SupervisorSignOffs { get; set; }
         public int PreviousCompetencyNumber { get; set; }
         public int NumberOfOptionalCompetencies { get; set; }
-        public int NumberOfAssignOptionalCompetencies { get; set; }
+        public int NumberOfSelfAssessedOptionalCompetencies { get; set; }
 
         public bool AllQuestionsVerifiedOrNotRequired { get; set; }
         public SearchSelfAssessmentOverviewViewModel SearchViewModel { get; set; }

DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml

@@ -159,7 +159,7 @@
                 <h2>@Model.SelfAssessment.SignOffRoleName Sign-off</h2>
                 <partial name="../../Supervisor/Shared/_SupervisorSignOffSummary.cshtml" model="Model.SupervisorSignOffs"
                          view-data="@(new ViewDataDictionary(ViewData) { { "IsAllCompetencyConfirmed", competencySummaries.Sum(c => (int)c["questionsCount"]) == competencySummaries.Sum(c => (int)c["verifiedCount"]) }})" />
-                @if ((Model.AllQuestionsVerifiedOrNotRequired)  && (Model.NumberOfAssignOptionalCompetencies >= Model.SelfAssessment.MinimumOptionalCompetencies)  )
+                @if ((Model.AllQuestionsVerifiedOrNotRequired) && (Model.NumberOfSelfAssessedOptionalCompetencies >= Model.SelfAssessment.MinimumOptionalCompetencies))
                 {
                     @if (!Model.SupervisorSignOffs.Any())
                     {