Fixes caused by merge conflicts from 1.2.1

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs

@@ -588,7 +588,7 @@ public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkI
                 bool nameExists = flags.Any(x => x.FlagName.ToLower() == model.FlagName.ToLower());
                 bool idExists = flags.Any(x => x.FlagId == flagId);
 
-                if (actionname == "Edit")
+                if (actionName == "Edit")
                 {
                     if (nameExists && !idExists)
                     {

DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml

@@ -37,7 +37,7 @@
                 }
                 else
                 {
-                    <a class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-controller="RoleProfiles" asp-route-roleProfileId="@toDoItem.RoleProfileID" asp-action="ViewRoleProfile">
+                    <a class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-controller="CompetencyAssessments" asp-route-competencyAssessmentId="@toDoItem.CompetencyAssessmentID" asp-action="ViewCompetencyAssessment">
                         @(toDoItem.SignOffRequired ? "Approve " : "Review ") @toDoItem.ItemName for @toDoItem.RequestorName (requested @toDoItem.Requested.ToShortDateString())
                     </a>
                 }
@@ -78,14 +78,14 @@ else
             <div class="nhsuk-card">
                 <div class="nhsuk-card__content">
                     <p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
-                        @Model.DashboardData.RoleProfileCount Role Profiles
+                        @Model.DashboardData.CompetencyAssessmentCount Competency Assessments
                     </p>
                     <ul class="nhsuk-contents-list__list">
                         @if (Model.IsWorkforceManager | Model.IsWorkforceContributor)
                         {
-                            <li class="nhsuk-contents-list__item"><a asp-controller="RoleProfiles" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewRoleProfiles" asp-route-tabname="Mine">Manage My Role Profiles (@Model.DashboardData.MyRoleProfileCount)</a></li>
+                            <li class="nhsuk-contents-list__item"><a asp-controller="CompetencyAssessments" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Manage My Competency Assessments (@Model.DashboardData.MyCompetencyAssessmentCount)</a></li>
                         }
-                        <li class="nhsuk-contents-list__item"><a asp-controller="RoleProfiles" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewRoleProfiles" asp-route-tabname="All">View All Role Profiles</a></li>
+                        <li class="nhsuk-contents-list__item"><a asp-controller="CompetencyAssessments" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewCompetencyAssessments" asp-route-tabname="All">View All Competency Assessments</a></li>
                     </ul>
                 </div>
             </div>