Skip to content

TD-5263 Fix framework view for print fails #3182

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
merged 5 commits into from
Mar 19, 2025
Merged

TD-5263 Fix framework view for print fails #3182

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3a8aec
TD-5263 Fixes html tag in print preview for ungrouped competencies
kevwhitt-hee Mar 14, 2025
8b198f4
TD-5263 Hides View for Print button for empty frameworks
kevwhitt-hee Mar 14, 2025
f2e620f
TD-5263 Checks that framework competency group is not empty before re…
kevwhitt-hee Mar 14, 2025
d63d3aa
Trims description before checking for null/empty to decide whether to…
kevwhitt-hee Mar 14, 2025
978ff9f
Merge branch 'DLS-Release-v1.2.0' into Develop/Fixes/TD-5263-FixViewF…
kevwhitt-hee Mar 17, 2025
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
134 changes: 68 additions & 66 deletions DigitalLearningSolutions.Web/Views/Frameworks/Developer/FrameworkPrintLayout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,29 @@
<h1>
@Model.DetailFramework.FrameworkName
</h1>
@if (!String.IsNullOrEmpty(Model.DetailFramework.Description))
{
<div class="nhsuk-card">
<div class="nhsuk-card__content">
<h2 class="nhsuk-card__heading">
Framework description
@if (!String.IsNullOrEmpty(Model.DetailFramework.Description.Trim()))
{
<div class="nhsuk-card">
<div class="nhsuk-card__content">
<h2 class="nhsuk-card__heading">
Framework description

</h2>
<p class="nhsuk-card__description">
@(Html.Raw(Model.DetailFramework.Description))
</p>
</div>
</h2>
<p class="nhsuk-card__description">
@(Html.Raw(Model.DetailFramework.Description))
</p>
</div>
}
<h2>Framework @Model.VocabPlural().ToLower()</h2>
</div>
}
<h2>Framework @Model.VocabPlural().ToLower()</h2>

@if (Model.FrameworkCompetencyGroups != null)
@if (Model.FrameworkCompetencyGroups != null)
{
if (Model.FrameworkCompetencyGroups.Any())
{
if (Model.FrameworkCompetencyGroups.Any())
@foreach (var frameworkCompetencyGroup in Model.FrameworkCompetencyGroups)
{
@foreach (var frameworkCompetencyGroup in Model.FrameworkCompetencyGroups)
if (frameworkCompetencyGroup.FrameworkCompetencies.Count() > 0)
{
groupNum++;
<h3>@frameworkCompetencyGroup.Name</h3>
Expand All @@ -58,70 +60,70 @@
@frameworkCompetencyGroup.Description
</p>
}

int compNum = 0;
if (frameworkCompetencyGroup.FrameworkCompetencies[0] != null)
{
<table class="nhsuk-table">
<thead role="rowgroup" class="nhsuk-table__head">
<tr role="row">
<th role="columnheader" class="" scope="col">
@Model.VocabSingular()
</th>
<th role="columnheader" class="status-tag" scope="col">
Date and Signature
</th>
</tr>
</thead>
<tbody class="nhsuk-table__body">
@foreach (var frameworkCompetency in frameworkCompetencyGroup.FrameworkCompetencies)
{
compNum++;
<tr role="row" class="nhsuk-table__row">
<td>
<strong>@frameworkCompetency.Name</strong>

<partial name="_CompetencyFlags" model="Model.CompetencyFlags.Where(c => c.CompetencyId == frameworkCompetency.CompetencyID)" />
@if (frameworkCompetency.Description != null)
<table class="nhsuk-table">
<thead role="rowgroup" class="nhsuk-table__head">
<tr role="row">
<th role="columnheader" class="" scope="col">
@Model.VocabSingular()
</th>
<th role="columnheader" class="status-tag" scope="col">
Date and Signature
</th>
</tr>
</thead>
<tbody class="nhsuk-table__body">
@foreach (var frameworkCompetency in frameworkCompetencyGroup.FrameworkCompetencies)
{
<p class="nhsuk-lede-text--small">
@Html.Raw(frameworkCompetency.Description)
</p>
}
</td>
<td>
compNum++;
<tr role="row" class="nhsuk-table__row">
<td>
<strong>@frameworkCompetency.Name</strong>

</td>
<partial name="_CompetencyFlags" model="Model.CompetencyFlags.Where(c => c.CompetencyId == frameworkCompetency.CompetencyID)" />
@if (frameworkCompetency.Description != null)
{
<p class="nhsuk-lede-text--small">
@Html.Raw(frameworkCompetency.Description)
</p>
}
</td>
<td>
</td>
</tr>
}
}
</tbody>
</table>
}
}
}
}
@if (Model.FrameworkCompetencies != null)
}
@if (Model.FrameworkCompetencies != null)
{
if (Model.FrameworkCompetencies.Any())
{
if (Model.FrameworkCompetencies.Any())
groupNum++;
int compNum = 0;
<h2>Ungrouped competencies</h2>
foreach (var frameworkCompetency in Model.FrameworkCompetencies)
{
groupNum++;
int compNum = 0;
<h2>Ungrouped competencies</h2>
foreach (var frameworkCompetency in Model.FrameworkCompetencies)
{
compNum++;
<div class="nhsuk-u-margin-left-8">
<h3>@frameworkCompetency.Name</h3>
<partial name="_CompetencyFlags" model="Model.CompetencyFlags.Where(c => c.CompetencyId == frameworkCompetency.CompetencyID)" />
@if (frameworkCompetency.Description != null)
{
<p class="nhsuk-lede-text--small">
@frameworkCompetency.Description
</p>
}
</div>
}
compNum++;
<div class="nhsuk-u-margin-left-8">
<h3>@frameworkCompetency.Name</h3>
<partial name="_CompetencyFlags" model="Model.CompetencyFlags.Where(c => c.CompetencyId == frameworkCompetency.CompetencyID)" />
@if (frameworkCompetency.Description != null)
{
<p class="nhsuk-lede-text--small">
@Html.Raw(frameworkCompetency.Description)
</p>
}
</div>
}
}
</div>
}
</div>
</div>
5 changes: 4 additions & 1 deletion DigitalLearningSolutions.Web/Views/Frameworks/Developer/_Structure.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
<a class="nhsuk-button" asp-action="AddEditFrameworkCompetencyGroup" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">Add @Model.VocabSingular().ToLower() group</a>
<a class="nhsuk-button nhsuk-button--secondary" asp-action="AddEditFrameworkCompetency" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">Add ungrouped @Model.VocabSingular().ToLower()</a>
<a class="nhsuk-button nhsuk-button--secondary" asp-action="ImportCompetencies" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-isNotBlank="@(Model.FrameworkCompetencies.Any()|Model.FrameworkCompetencyGroups.Any())" asp-route-tabname="@(ViewContext.RouteData.Values["tabname"])">Bulk upload/update @Model.VocabPlural().ToLower()</a>
<a class="nhsuk-button nhsuk-button--secondary" asp-action="PrintLayout" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">View for print</a>
@if ((Model.FrameworkCompetencies?.Any() ?? false) || (Model.FrameworkCompetencyGroups?.Any(group => group.FrameworkCompetencies.Any()) ?? false) )
{
<a class="nhsuk-button nhsuk-button--secondary" asp-action="PrintLayout" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">View for print</a>
}
</div>
</div>
}
Expand Down
Loading