Skip to content

TD-6941-Replaced text 'competency assessment' with 'self-assessment' #3514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rshrirohit merged 1 commit into from
Mar 23, 2026
Merged

TD-6941-Replaced text 'competency assessment' with 'self-assessment' #3514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DigitalLearningSolutions.Web/Models/Enums/CompetencyAssessmentsTab.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class CompetencyAssessmentsTab : BaseTabEnumeration
nameof(MyCompetencyAssessments),
"CompetencyAssessments",
"ViewCompetencyAssessments",
"My Competency Assessments",
"My Self-assessments",
new Dictionary<string, string> { { "tabName", "Mine" } }
);

Expand All @@ -18,7 +18,7 @@ public class CompetencyAssessmentsTab : BaseTabEnumeration
nameof(AllCompetencyAssessments),
"CompetencyAssessments",
"ViewCompetencyAssessments",
"All Competency Assessments",
"All Self-assessments",
new Dictionary<string, string> { { "tabName", "All" } }
);

Expand Down
2 changes: 1 addition & 1 deletion ...gSolutions.Web/ViewModels/CompetencyAssessments/BaseCompetencyAssessmentsPageViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ private int OffsetFromPageNumber(int pageNumber) =>
public static class CompetencyAssessmentSortByOptionTexts
{
public const string
CompetencyAssessmentName = "Competency Assessment",
CompetencyAssessmentName = "Self-assessment",
CompetencyAssessmentOwner = "Owner",
CompetencyAssessmentCreatedDate = "Created Date",
CompetencyAssessmentPublishStatus = "Publish Status",
Expand Down
6 changes: 3 additions & 3 deletions DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
<div class="nhsuk-width-container">
<ol class="nhsuk-breadcrumb__list">
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
<li class="nhsuk-breadcrumb__item">Select Framework Sources</li>
</ol>
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage competency assessment</a></p>
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage self-assessment</a></p>
</div>
</nav>
}
Expand Down
8 changes: 4 additions & 4 deletions ...alLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
<div class="nhsuk-width-container">
<ol class="nhsuk-breadcrumb__list">
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
<li class="nhsuk-breadcrumb__item">Select @Model.VocabularyPlural.ToLower() to assess</li>
</ol>
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage competency assessment</a></p>
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage self-assessment</a></p>
</div>
</nav>
}
Expand All @@ -32,7 +32,7 @@
<fieldset class="nhsuk-fieldset">
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
<h2 class="nhsuk-fieldset__heading">
Select the framework source you would like to use to add @Model.VocabularyPlural.ToLower() to this competency assessment.
Select the framework source you would like to use to add @Model.VocabularyPlural.ToLower() to this self-assessment.
</h2>
</legend>
<div class="nhsuk-radios">
Expand Down
26 changes: 13 additions & 13 deletions DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentFeatures.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
@model CompetencyAssessmentFeaturesViewModel
@{
ViewData["Title"] = "Competency assessment features ";
ViewData["Title"] = "Self-assessment features ";
ViewData["Application"] = "Framework Service";
ViewData["HeaderPathName"] = "Framework Service";
}

@section NavMenuItems {
<partial name="Shared/_NavMenuItems" />
}
@section NavBreadcrumbs {
@section NavBreadcrumbs {
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
<div class="nhsuk-width-container">
<ol class="nhsuk-breadcrumb__list">
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="CompetencyAssessmentName" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
<li class="nhsuk-breadcrumb__item">Competency assessment features</li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">self-assessments</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="CompetencyAssessmentName" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
<li class="nhsuk-breadcrumb__item">Self-assessment features</li>
</ol>
</div>
</nav>
}
}

<h1>Create a new competency assessment</h1>
<h2> Which features of the framework do you want to copy into the competency assessment?</h2>
<h1>Create a new self-assessment</h1>
<h2> Which features of the framework do you want to copy into the self-assessment?</h2>
<p class="nhsuk-body-m">The framework itself will be used as the source for this self-assessment. </p>
<p class="nhsuk-body-m">Select any additional features you want to copy into the competency assessment. You can edit all features later if needed.</p>
<form method="post">
<p class="nhsuk-body-m">Select any additional features you want to copy into the self-assessment. You can edit all features later if needed.</p>
<form method="post">
@if (!ViewData.ModelState.IsValid)
{
<partial name="_ErrorSummary" />
}

<nhs-form-group>
<vc:single-checkbox asp-for="@nameof(Model.DescriptionStatus)" label="Description" hint-text="The framework description will be copied into the competency assessment description."></vc:single-checkbox>
<vc:single-checkbox asp-for="@nameof(Model.DescriptionStatus)" label="Description" hint-text="The framework description will be copied into the self-assessment description."></vc:single-checkbox>
</nhs-form-group>
<nhs-form-group>
<vc:single-checkbox asp-for="@nameof(Model.ProviderandCategoryStatus)" label="Provider and category" hint-text="The framework branding (provider and category) will be copied."></vc:single-checkbox>
Expand Down Expand Up @@ -61,4 +61,4 @@
Cancel
</a>
</div>
</form>
</form>
10 changes: 5 additions & 5 deletions DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentOptions.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
@model OptionsLabelsViewModel
@{
ViewData["Title"] = "Competency Assessment options and labels";
ViewData["Application"] = "Competency Assessment Service";
ViewData["Title"] = "Self-assessment options and labels";
ViewData["Application"] = "Self-assessment Service";

var steps = new[]
{
Expand Down Expand Up @@ -39,8 +39,8 @@
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
<div class="nhsuk-width-container">
<ol class="nhsuk-breadcrumb__list">
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Manage Competency Assessment</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Manage self-assessment</a></li>
@foreach (var item in steps)
{
@if (Model.UserRole < 2)
Expand Down Expand Up @@ -69,7 +69,7 @@
</li>
}
</ol>
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Back to manage competency assessment</a></p>
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Back to manage self-assessment</a></p>
</div>
</nav>
}
Expand Down
12 changes: 6 additions & 6 deletions ...arningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentPreviewConfirm.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
@inject IConfiguration Configuration

@{
ViewData["Title"] = "Competency Assessment - Preview";
ViewData["Application"] = "Competency Assessment Service";
ViewData["HeaderPathName"] = "Competency Assessment Service";
ViewData["Title"] = "Self-assessment - Preview";
ViewData["Application"] = "Self-assessment Service";
ViewData["HeaderPathName"] = "Self-assessment Service";
}

@section NavMenuItems {
Expand All @@ -16,11 +16,11 @@
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
<div class="nhsuk-width-container">
<ol class="nhsuk-breadcrumb__list">
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Manage Competency Assessment</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Manage self-assessment</a></li>
<li class="nhsuk-breadcrumb__item">Confirm Preview</li>
</ol>
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Back to manage competency assessment</a></p>
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Back to manage self-assessment</a></p>
</div>
</nav>
}
Expand Down
102 changes: 51 additions & 51 deletions DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentSummary.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
@model CompetencyAssessmentFeaturesViewModel
@{
ViewData["Title"] = "Competency assessment features summary";
ViewData["Title"] = "Self-assessment features summary";
ViewData["Application"] = "Framework Service";
ViewData["HeaderPathName"] = "Framework Service";
}
Expand All @@ -13,69 +13,69 @@
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
<div class="nhsuk-width-container">
<ol class="nhsuk-breadcrumb__list">
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="CompetencyAssessmentFeatures" asp-route-competencyAssessmentId="@Model.ID" asp-route-frameworkId="@Model.FrameworkId">Competency Assessment Features</a></li>
<li class="nhsuk-breadcrumb__item">Competency assessment features summary</li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="CompetencyAssessmentFeatures" asp-route-competencyAssessmentId="@Model.ID" asp-route-frameworkId="@Model.FrameworkId">Self-assessment features</a></li>
<li class="nhsuk-breadcrumb__item">Self-assessment features summary</li>
</ol>
</div>
</nav>
}


<h1> Check your answer before creating competency assessment</h1>
<form method="post">
<h1> Check your answer before creating self-assessment</h1>
<form method="post">
@if (!ViewData.ModelState.IsValid)
{
<partial name="_ErrorSummary" />
}
<div class="nhsuk-u-reading-width">
<dl class="nhsuk-summary-list nhsuk-summary-list--no-border">
<div class="nhsuk-u-reading-width">
<dl class="nhsuk-summary-list nhsuk-summary-list--no-border">

<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Assessment name
</dt>
<dd class="nhsuk-summary-list__value">
@Model.CompetencyAssessmentName
</dd>
<dd class="nhsuk-summary-list__actions">
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Assessment name
</dt>
<dd class="nhsuk-summary-list__value">
@Model.CompetencyAssessmentName
</dd>
<dd class="nhsuk-summary-list__actions">
<a asp-action="CompetencyAssessmentName" asp-route-actionName="Edit" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]"
asp-route-frameworkId="@ViewContext.RouteData.Values["frameworkId"]">
Change<span class="nhsuk-u-visually-hidden"> assessment name</span>
</a>
</dd>
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Features to copy from framework
</dt>
<dd class="nhsuk-summary-list__value">
@if (Model.SelectedFeatures.Any())
{
<ul class="nhsuk-list nhsuk-list--bullet">
@foreach (var feature in Model.SelectedFeatures)
{
<li>@feature</li>
}
</ul>
}
else
{
<span>No features selected</span>
}
</dd>
<dd class="nhsuk-summary-list__actions">
<a asp-action="CompetencyAssessmentFeatures" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]"
asp-route-frameworkId="@ViewContext.RouteData.Values["frameworkId"]">
Change<span class="nhsuk-u-visually-hidden"> features</span>
</a>
</dd>
</div>
</dl>
asp-route-frameworkId="@ViewContext.RouteData.Values["frameworkId"]">
Change<span class="nhsuk-u-visually-hidden"> assessment name</span>
</a>
</dd>
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Features to copy from framework
</dt>
<dd class="nhsuk-summary-list__value">
@if (Model.SelectedFeatures.Any())
{
<ul class="nhsuk-list nhsuk-list--bullet">
@foreach (var feature in Model.SelectedFeatures)
{
<li>@feature</li>
}
</ul>
}
else
{
<span>No features selected</span>
}
</dd>
<dd class="nhsuk-summary-list__actions">
<a asp-action="CompetencyAssessmentFeatures" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]"
asp-route-frameworkId="@ViewContext.RouteData.Values["frameworkId"]">
Change<span class="nhsuk-u-visually-hidden"> features</span>
</a>
</dd>
</div>
</dl>
<input name="ID" type="hidden" asp-for="ID" />
<input name="CompetencyAssessmentName" type="hidden" asp-for="CompetencyAssessmentName" />
<input name="userRole" type="hidden" asp-for="UserRole" />
<input name="FrameID" type="hidden" asp-for="FrameworkId" />
</div>
<button type="submit" class="nhsuk-button">Confirm and create assessment</button>
</form>
</div>
<button type="submit" class="nhsuk-button">Confirm and create assessment</button>
</form>
Loading
Loading