Skip to content

TD-6954 Resolving issue observed during testing #3549

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
May 7, 2026
Merged

TD-6954 Resolving issue observed during testing #3549

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
16 changes: 8 additions & 8 deletions ...earningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ public IActionResult ViewSelectedCompetencies(ViewSelectedCompetenciesFormData m
return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId = model.ID });
}
[HttpGet]
[Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Optional/Manage")]
[Route("/CompetencyAssessments/{competencyAssessmentId}/{vocabularyPlural}/Optional/Manage")]
public IActionResult ManageOptionalCompetencies(int competencyAssessmentId)
{
var adminId = GetAdminID();
Expand All @@ -656,7 +656,7 @@ public IActionResult ManageOptionalCompetencies(int competencyAssessmentId)
return View(model);
}
[HttpPost]
[Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Optional/Manage")]
[Route("/CompetencyAssessments/{competencyAssessmentId}/{vocabularyPlural}/Optional/Manage")]
public IActionResult ManageOptionalCompetencies(ViewSelectedCompetenciesFormData model)
{
if (model.TaskStatus == null)
Expand All @@ -667,7 +667,7 @@ public IActionResult ManageOptionalCompetencies(ViewSelectedCompetenciesFormData
return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId = model.ID });
}
[HttpGet]
[Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Optional/Select")]
[Route("/CompetencyAssessments/{competencyAssessmentId}/{vocabularyPlural}/Optional/Select")]
public IActionResult SelectOptionalCompetencies(int competencyAssessmentId)
{
var adminId = GetAdminID();
Expand All @@ -685,7 +685,7 @@ public IActionResult SelectOptionalCompetencies(int competencyAssessmentId)
return View(model);
}
[HttpPost]
[Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Optional/Select")]
[Route("/CompetencyAssessments/{competencyAssessmentId}/{vocabularyPlural}/Optional/Select")]
public IActionResult SelectOptionalCompetencies(SelectOptionalCompetenciesFormData model)
{
if (!ModelState.IsValid)
Expand All @@ -704,7 +704,7 @@ public IActionResult SelectOptionalCompetencies(SelectOptionalCompetenciesFormDa
return RedirectToAction("ManageOptionalCompetencies", new { competencyAssessmentId = model.ID });
}
[HttpGet]
[Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Optional/SetMinimum")]
[Route("/CompetencyAssessments/{competencyAssessmentId}/{vocabularyPlural}/Optional/SetMinimum")]
public IActionResult SetMinimumOptionalCompetencies(int competencyAssessmentId)
{
var adminId = GetAdminID();
Expand All @@ -717,7 +717,7 @@ public IActionResult SetMinimumOptionalCompetencies(int competencyAssessmentId)
return View("SetMinimumOptionalCompetencies", viewModel);
}
[HttpPost]
[Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Optional/SetMinimum")]
[Route("/CompetencyAssessments/{competencyAssessmentId}/{vocabularyPlural}/Optional/SetMinimum")]
public IActionResult SetMinimumOptionalCompetencies(SetMinimumOptionalCompetenciesFormData model)
{
if (!ModelState.IsValid)
Expand All @@ -732,7 +732,7 @@ public IActionResult SetMinimumOptionalCompetencies(SetMinimumOptionalCompetenci
return RedirectToAction("ManageOptionalCompetencies", new { competencyAssessmentId = model.ID });
}
[HttpGet]
[Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Optional/LearnerPrompt")]
[Route("/CompetencyAssessments/{competencyAssessmentId}/{vocabularyPlural}/Optional/LearnerPrompt")]
public IActionResult SetOptionalCompetencyLearnerPrompt(int competencyAssessmentId)
{
var adminId = GetAdminID();
Expand All @@ -745,7 +745,7 @@ public IActionResult SetOptionalCompetencyLearnerPrompt(int competencyAssessment
return View("SetOptionalCompetencyLearnerPrompt", viewModel);
}
[HttpPost]
[Route("/CompetencyAssessments/{competencyAssessmentId}/Competencies/Optional/LearnerPrompt")]
[Route("/CompetencyAssessments/{competencyAssessmentId}/{vocabularyPlural}/Optional/LearnerPrompt")]
public IActionResult SetOptionalCompetencyLearnerPrompt(SetOptionalCompetencyLearnerPromptFormData model)
{
if (!ModelState.IsValid)
Expand Down
12 changes: 12 additions & 0 deletions ...ningSolutions.Web/ViewModels/CompetencyAssessments/SelectOptionalCompetenciesViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,17 @@ public SelectOptionalCompetenciesViewModel(CompetencyAssessmentBase competencyAs
public string VocabularySingular { get; set; }
public string VocabularyPlural { get; set; }
public IEnumerable<IGrouping<string, Competency>>? CompetencyGroups { get; set; }
public string GetGroupLabel(string? key)
{
if (string.IsNullOrWhiteSpace(key)) return "";

if (string.IsNullOrWhiteSpace(VocabularyPlural))
return key;
var keyLower = key.ToLower();
var vocab = VocabularyPlural.ToLower();
if (keyLower.Contains(vocab) || keyLower.Contains("proficiencies"))
return key;
return $"{key} {vocab}";
}
}
}
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
else
{
<div class="nhsuk-task-list__name-and-hint" aria-describedby="optional-competencies-status">
<a class="nhsuk-link nhsuk-task-list__link" asp-action="ManageOptionalCompetencies" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
<a class="nhsuk-link nhsuk-task-list__link" asp-action="ManageOptionalCompetencies" asp-route-vocabularyPlural="@Model.VocabularyPlural" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
Manage optional @Model.VocabularyPlural.ToLower()
</a>
</div>
Expand Down
8 changes: 4 additions & 4 deletions DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageOptionalCompetencies.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ol class="nhsuk-breadcrumb__list">
<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">Optional Competencies</li>
<li class="nhsuk-breadcrumb__item">Optional @Model.VocabularyPlural.ToLower()</li>
</ol>
<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>
Expand Down Expand Up @@ -62,7 +62,7 @@
@if (Model.UserRole > 1)
{
<dd class="nhsuk-summary-list__actions">
<a class="nhsuk-link" asp-route-competencyAssessmentId="@Model.ID" asp-action="SelectOptionalCompetencies">Change<span class="nhsuk-u-visually-hidden"> optional @Model.VocabularyPlural.ToLower()</span></a>
<a class="nhsuk-link" asp-route-competencyAssessmentId="@Model.ID" asp-route-vocabularyPlural="@Model.VocabularyPlural" asp-action="SelectOptionalCompetencies">Change<span class="nhsuk-u-visually-hidden"> optional @Model.VocabularyPlural.ToLower()</span></a>
</dd>
}
</div>
Expand All @@ -78,7 +78,7 @@
@if (Model.UserRole > 1)
{
<dd class="nhsuk-summary-list__actions">
<a class="nhsuk-link" asp-route-competencyAssessmentId="@Model.ID" asp-action="SetMinimumOptionalCompetencies">Change<span class="nhsuk-u-visually-hidden"> minimum optional @Model.VocabularyPlural.ToLower()</span></a>
<a class="nhsuk-link" asp-route-competencyAssessmentId="@Model.ID" asp-route-vocabularyPlural="@Model.VocabularyPlural" asp-action="SetMinimumOptionalCompetencies">Change<span class="nhsuk-u-visually-hidden"> minimum optional @Model.VocabularyPlural.ToLower()</span></a>
</dd>
}
</div>
Expand All @@ -92,7 +92,7 @@
@if (Model.UserRole > 1)
{
<dd class="nhsuk-summary-list__actions">
<a class="nhsuk-link" asp-route-competencyAssessmentId="@Model.ID" asp-action="SetOptionalCompetencyLearnerPrompt">Change<span class="nhsuk-u-visually-hidden"> learner prompt</span></a>
<a class="nhsuk-link" asp-route-competencyAssessmentId="@Model.ID" asp-route-vocabularyPlural="@Model.VocabularyPlural" asp-action="SetOptionalCompetencyLearnerPrompt">Change<span class="nhsuk-u-visually-hidden"> learner prompt</span></a>
</dd>
}
</div>
Expand Down
10 changes: 3 additions & 7 deletions DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectOptionalCompetencies.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ol class="nhsuk-breadcrumb__list">
<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">Optional Competencies</li>
<li class="nhsuk-breadcrumb__item">Optional @Model.VocabularyPlural.ToLower()</li>
</ol>
<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>
Expand All @@ -27,7 +27,7 @@
@Model.CompetencyAssessmentName
<span class="nhsuk-u-visually-hidden"> – </span>
</span>
Select optional competencies
Select optional @Model.VocabularyPlural.ToLower()
</h1>

<p>
Expand All @@ -49,15 +49,11 @@
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m">
@competencyGroup.Key
</legend>

<h2>
@competencyGroup.Key
</h2>
<div class="nhsuk-checkboxes">
<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" data-group="@competencyGroup.First().GroupId" id="competency-check-@competencyGroup.First().GroupId" name="GroupIds" checked="@competencyGroup.Any(x => x.GroupOptionalCompetencies)" type="checkbox" value="@competencyGroup.First().GroupId">
<label class="nhsuk-label nhsuk-checkboxes__label" for="competency-check-@competencyGroup.First().GroupId">
<strong>@competencyGroup.Key @Model.VocabularyPlural.ToLower() optional as a group</strong>
<strong>@Model.GetGroupLabel(competencyGroup.Key) optional as a group</strong>
</label>
</div>
@foreach (var competency in competencyGroup)
Expand Down
3 changes: 2 additions & 1 deletion ...alLearningSolutions.Web/Views/CompetencyAssessments/SetMinimumOptionalCompetencies.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ol class="nhsuk-breadcrumb__list">
<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">Optional Competencies</li>
<li class="nhsuk-breadcrumb__item">Optional @Model.VocabularyPlural.ToLower()</li>
</ol>
<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>
Expand Down Expand Up @@ -45,6 +45,7 @@
</nhs-form-group>
<input type="hidden" asp-for="ID" />
<input type="hidden" asp-for="OptionalCompetenciesCount" />
<hr class="nhsuk-section-break nhsuk-section-break--m" />
<button class="nhsuk-button" type="submit">
Save
</button>
Expand Down
2 changes: 1 addition & 1 deletion ...arningSolutions.Web/Views/CompetencyAssessments/SetOptionalCompetencyLearnerPrompt.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ol class="nhsuk-breadcrumb__list">
<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">Optional Competencies</li>
<li class="nhsuk-breadcrumb__item">Optional @Model.VocabularyPlural.ToLower()</li>
</ol>
<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>
Expand Down
Loading