Skip to content

Commit 36d1cd8

Browse files
committed
Fixes link visually hidden text and summary item display logic
1 parent 19b0115 commit 36d1cd8

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public IActionResult EditRoleProfileLinks(EditRoleProfileLinksViewModel model, s
247247
var isUpdated = competencyAssessmentService.UpdateCompetencyRoleProfileLinks(model.ID, adminId, model.ProfessionalGroupId, model.SubGroupId, model.RoleId);
248248
if (model.ActionName == "EditGroup")
249249
{
250-
if(model.ProfessionalGroupId == null)
250+
if (model.ProfessionalGroupId == null)
251251
{
252252
return RedirectToAction("EditRoleProfileLinks", new { actionName = "Summary", competencyAssessmentId });
253253
}
@@ -269,7 +269,7 @@ public IActionResult EditRoleProfileLinks(EditRoleProfileLinksViewModel model, s
269269
}
270270
else if (model.ActionName == "EditRole")
271271
{
272-
return RedirectToAction("EditRoleProfileLinks", new { actionName = "Summary", competencyAssessmentId });
272+
return RedirectToAction("EditRoleProfileLinks", new { actionName = "Summary", competencyAssessmentId });
273273
}
274274
else
275275
{

DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}
77
<link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
88
@section NavMenuItems {
9-
<partial name="~/Views/Frameworks/Shared/_NavMenuItems.cshtml" />
9+
<partial name="~/Views/Frameworks/Shared/_NavMenuItems.cshtml" />
1010
}
1111

1212
@section NavBreadcrumbs {
@@ -23,9 +23,9 @@
2323
}
2424

2525
<h1>Edit @Model.CompetencyAssessmentName national NHS role profile links</h1>
26-
@if (Model.TaskStatus != null | Model.ProfessionalGroupId != null)
26+
@if (Model.TaskStatus != null | Model.ActionName != "EditGroup")
2727
{
28-
<dl class="nhsuk-summary-list nhsuk-summary-list--no-border">
28+
<dl class="nhsuk-summary-list">
2929

3030
<div class="nhsuk-summary-list__row">
3131
<dt class="nhsuk-summary-list__key">
@@ -36,7 +36,7 @@
3636
</dd>
3737
<dd class="nhsuk-summary-list__actions">
3838
<a asp-action="EditRoleProfileLinks" asp-route-actionName="EditGroup" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
39-
Change<span class="nhsuk-u-visually-hidden"> assessment name</span>
39+
Change<span class="nhsuk-u-visually-hidden"> professional group link</span>
4040
</a>
4141
</dd>
4242
</div>
@@ -51,12 +51,12 @@
5151
</dd>
5252
<dd class="nhsuk-summary-list__actions">
5353
<a asp-action="EditRoleProfileLinks" asp-route-actionName="EditSubGroup" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
54-
Change<span class="nhsuk-u-visually-hidden"> assessment name</span>
54+
Change<span class="nhsuk-u-visually-hidden"> sub group link</span>
5555
</a>
5656
</dd>
5757
</div>
5858
}
59-
@if (Model.SubGroupId != null && Model.ActionName != "EditRole")
59+
@if (Model.SubGroupId != null && Model.ActionName == "Summary")
6060
{
6161
<div class="nhsuk-summary-list__row">
6262
<dt class="nhsuk-summary-list__key">
@@ -67,7 +67,7 @@
6767
</dd>
6868
<dd class="nhsuk-summary-list__actions">
6969
<a asp-action="EditRoleProfileLinks" asp-route-actionName="EditRole" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
70-
Change<span class="nhsuk-u-visually-hidden"> assessment name</span>
70+
Change<span class="nhsuk-u-visually-hidden"> role profile link</span>
7171
</a>
7272
</dd>
7373
</div>
@@ -244,7 +244,7 @@ else if (Model.ActionName == "Summary")
244244
<button class="nhsuk-button" type="submit">
245245
Save
246246
</button>
247-
</form>
247+
</form>
248248
}
249249
<div class="nhsuk-back-link">
250250
<a class="nhsuk-back-link__link" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">

0 commit comments

Comments
 (0)