Skip to content

Commit e3a8aec

Browse files
kevwhitt-heekevwhitt-hee
committed
TD-5263 Fixes html tag in print preview for ungrouped competencies
1 parent 53f1ba0 commit e3a8aec

File tree

1 file changed

+69
-70
lines changed

1 file changed

+69
-70
lines changed

‎DigitalLearningSolutions.Web/Views/Frameworks/Developer/FrameworkPrintLayout.cshtml‎

Lines changed: 69 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -28,41 +28,41 @@
2828
<h1>
2929
@Model.DetailFramework.FrameworkName
3030
</h1>
31-
@if (!String.IsNullOrEmpty(Model.DetailFramework.Description))
32-
{
33-
<div class="nhsuk-card">
34-
<div class="nhsuk-card__content">
35-
<h2 class="nhsuk-card__heading">
36-
Framework description
31+
@if (!String.IsNullOrEmpty(Model.DetailFramework.Description))
32+
{
33+
<div class="nhsuk-card">
34+
<div class="nhsuk-card__content">
35+
<h2 class="nhsuk-card__heading">
36+
Framework description
3737

38-
</h2>
39-
<p class="nhsuk-card__description">
40-
@(Html.Raw(Model.DetailFramework.Description))
41-
</p>
42-
</div>
38+
</h2>
39+
<p class="nhsuk-card__description">
40+
@(Html.Raw(Model.DetailFramework.Description))
41+
</p>
4342
</div>
44-
}
45-
<h2>Framework @Model.VocabPlural().ToLower()</h2>
43+
</div>
44+
}
45+
<h2>Framework @Model.VocabPlural().ToLower()</h2>
4646

47-
@if (Model.FrameworkCompetencyGroups != null)
47+
@if (Model.FrameworkCompetencyGroups != null)
48+
{
49+
if (Model.FrameworkCompetencyGroups.Any())
4850
{
49-
if (Model.FrameworkCompetencyGroups.Any())
51+
@foreach (var frameworkCompetencyGroup in Model.FrameworkCompetencyGroups)
5052
{
51-
@foreach (var frameworkCompetencyGroup in Model.FrameworkCompetencyGroups)
53+
groupNum++;
54+
<h3>@frameworkCompetencyGroup.Name</h3>
55+
if (frameworkCompetencyGroup.Description != null)
5256
{
53-
groupNum++;
54-
<h3>@frameworkCompetencyGroup.Name</h3>
55-
if (frameworkCompetencyGroup.Description != null)
56-
{
57-
<p class="nhsuk-lede-text">
58-
@frameworkCompetencyGroup.Description
59-
</p>
60-
}
61-
62-
int compNum = 0;
63-
if (frameworkCompetencyGroup.FrameworkCompetencies[0] != null)
64-
{
65-
<table class="nhsuk-table">
57+
<p class="nhsuk-lede-text">
58+
@frameworkCompetencyGroup.Description
59+
</p>
60+
}
61+
62+
int compNum = 0;
63+
if (frameworkCompetencyGroup.FrameworkCompetencies[0] != null)
64+
{
65+
<table class="nhsuk-table">
6666
<thead role="rowgroup" class="nhsuk-table__head">
6767
<tr role="row">
6868
<th role="columnheader" class="" scope="col">
@@ -74,54 +74,53 @@
7474
</tr>
7575
</thead>
7676
<tbody class="nhsuk-table__body">
77-
@foreach (var frameworkCompetency in frameworkCompetencyGroup.FrameworkCompetencies)
78-
{
79-
compNum++;
77+
@foreach (var frameworkCompetency in frameworkCompetencyGroup.FrameworkCompetencies)
78+
{
79+
compNum++;
8080
<tr role="row" class="nhsuk-table__row">
81-
<td>
82-
<strong>@frameworkCompetency.Name</strong>
83-
84-
<partial name="_CompetencyFlags" model="Model.CompetencyFlags.Where(c => c.CompetencyId == frameworkCompetency.CompetencyID)" />
85-
@if (frameworkCompetency.Description != null)
86-
{
87-
<p class="nhsuk-lede-text--small">
88-
@Html.Raw(frameworkCompetency.Description)
89-
</p>
90-
}
91-
</td>
92-
<td>
81+
<td>
82+
<strong>@frameworkCompetency.Name</strong>
9383

94-
</td>
95-
</tr>
96-
}
97-
</tbody>
98-
</table>
99-
}
84+
<partial name="_CompetencyFlags" model="Model.CompetencyFlags.Where(c => c.CompetencyId == frameworkCompetency.CompetencyID)" />
85+
@if (frameworkCompetency.Description != null)
86+
{
87+
<p class="nhsuk-lede-text--small">
88+
@Html.Raw(frameworkCompetency.Description)
89+
</p>
90+
}
91+
</td>
92+
<td>
93+
</td>
94+
</tr>
95+
}
96+
</tbody>
97+
</table>
10098
}
10199
}
102100
}
103-
@if (Model.FrameworkCompetencies != null)
101+
}
102+
@if (Model.FrameworkCompetencies != null)
103+
{
104+
if (Model.FrameworkCompetencies.Any())
104105
{
105-
if (Model.FrameworkCompetencies.Any())
106+
groupNum++;
107+
int compNum = 0;
108+
<h2>Ungrouped competencies</h2>
109+
foreach (var frameworkCompetency in Model.FrameworkCompetencies)
106110
{
107-
groupNum++;
108-
int compNum = 0;
109-
<h2>Ungrouped competencies</h2>
110-
foreach (var frameworkCompetency in Model.FrameworkCompetencies)
111-
{
112-
compNum++;
113-
<div class="nhsuk-u-margin-left-8">
114-
<h3>@frameworkCompetency.Name</h3>
115-
<partial name="_CompetencyFlags" model="Model.CompetencyFlags.Where(c => c.CompetencyId == frameworkCompetency.CompetencyID)" />
116-
@if (frameworkCompetency.Description != null)
117-
{
118-
<p class="nhsuk-lede-text--small">
119-
@frameworkCompetency.Description
120-
</p>
121-
}
122-
</div>
123-
}
111+
compNum++;
112+
<div class="nhsuk-u-margin-left-8">
113+
<h3>@frameworkCompetency.Name</h3>
114+
<partial name="_CompetencyFlags" model="Model.CompetencyFlags.Where(c => c.CompetencyId == frameworkCompetency.CompetencyID)" />
115+
@if (frameworkCompetency.Description != null)
116+
{
117+
<p class="nhsuk-lede-text--small">
118+
@Html.Raw(frameworkCompetency.Description)
119+
</p>
120+
}
121+
</div>
124122
}
125123
}
126-
</div>
124+
}
125+
</div>
127126
</div>

0 commit comments

Comments
 (0)