Skip to content

Commit 31bed92

Browse files
rshrirohitrshrirohit
authored
Merge pull request #3182 from TechnologyEnhancedLearning/Develop/Fixes/TD-5263-FixViewForPrintFails
TD-5263 Fix framework view for print fails
2 parents 513009c + 978ff9f commit 31bed92

File tree

2 files changed

+73
-68
lines changed

2 files changed

+73
-68
lines changed

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

Lines changed: 68 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,29 @@
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.Trim()))
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+
if (frameworkCompetencyGroup.FrameworkCompetencies.Count() > 0)
5254
{
5355
groupNum++;
5456
<h3>@frameworkCompetencyGroup.Name</h3>
@@ -58,70 +60,70 @@
5860
@frameworkCompetencyGroup.Description
5961
</p>
6062
}
61-
63+
6264
int compNum = 0;
6365
if (frameworkCompetencyGroup.FrameworkCompetencies[0] != null)
6466
{
65-
<table class="nhsuk-table">
66-
<thead role="rowgroup" class="nhsuk-table__head">
67-
<tr role="row">
68-
<th role="columnheader" class="" scope="col">
69-
@Model.VocabSingular()
70-
</th>
71-
<th role="columnheader" class="status-tag" scope="col">
72-
Date and Signature
73-
</th>
74-
</tr>
75-
</thead>
76-
<tbody class="nhsuk-table__body">
77-
@foreach (var frameworkCompetency in frameworkCompetencyGroup.FrameworkCompetencies)
78-
{
79-
compNum++;
80-
<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)
67+
<table class="nhsuk-table">
68+
<thead role="rowgroup" class="nhsuk-table__head">
69+
<tr role="row">
70+
<th role="columnheader" class="" scope="col">
71+
@Model.VocabSingular()
72+
</th>
73+
<th role="columnheader" class="status-tag" scope="col">
74+
Date and Signature
75+
</th>
76+
</tr>
77+
</thead>
78+
<tbody class="nhsuk-table__body">
79+
@foreach (var frameworkCompetency in frameworkCompetencyGroup.FrameworkCompetencies)
8680
{
87-
<p class="nhsuk-lede-text--small">
88-
@Html.Raw(frameworkCompetency.Description)
89-
</p>
90-
}
91-
</td>
92-
<td>
81+
compNum++;
82+
<tr role="row" class="nhsuk-table__row">
83+
<td>
84+
<strong>@frameworkCompetency.Name</strong>
9385

94-
</td>
86+
<partial name="_CompetencyFlags" model="Model.CompetencyFlags.Where(c => c.CompetencyId == frameworkCompetency.CompetencyID)" />
87+
@if (frameworkCompetency.Description != null)
88+
{
89+
<p class="nhsuk-lede-text--small">
90+
@Html.Raw(frameworkCompetency.Description)
91+
</p>
92+
}
93+
</td>
94+
<td>
95+
</td>
9596
</tr>
96-
}
97+
}
9798
</tbody>
9899
</table>
99100
}
100101
}
101102
}
102103
}
103-
@if (Model.FrameworkCompetencies != null)
104+
}
105+
@if (Model.FrameworkCompetencies != null)
106+
{
107+
if (Model.FrameworkCompetencies.Any())
104108
{
105-
if (Model.FrameworkCompetencies.Any())
109+
groupNum++;
110+
int compNum = 0;
111+
<h2>Ungrouped competencies</h2>
112+
foreach (var frameworkCompetency in Model.FrameworkCompetencies)
106113
{
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-
}
114+
compNum++;
115+
<div class="nhsuk-u-margin-left-8">
116+
<h3>@frameworkCompetency.Name</h3>
117+
<partial name="_CompetencyFlags" model="Model.CompetencyFlags.Where(c => c.CompetencyId == frameworkCompetency.CompetencyID)" />
118+
@if (frameworkCompetency.Description != null)
119+
{
120+
<p class="nhsuk-lede-text--small">
121+
@Html.Raw(frameworkCompetency.Description)
122+
</p>
123+
}
124+
</div>
124125
}
125126
}
126-
</div>
127+
}
128+
</div>
127129
</div>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@
88
<div class="nhsuk-grid-column-full">
99
<a class="nhsuk-button" asp-action="AddEditFrameworkCompetencyGroup" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">Add @Model.VocabSingular().ToLower() group</a>
1010
<a class="nhsuk-button nhsuk-button--secondary" asp-action="AddEditFrameworkCompetency" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">Add ungrouped @Model.VocabSingular().ToLower()</a>
11-
<a class="nhsuk-button nhsuk-button--secondary" asp-action="ImportCompetencies" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-isNotBlank="@((Model.FrameworkCompetencies?.Any() ?? false) || (Model.FrameworkCompetencyGroups?.Any(group=> group.FrameworkCompetencies.Any()) ?? false))" asp-route-tabname="@(ViewContext.RouteData.Values["tabname"])">Bulk upload/update @Model.VocabPlural().ToLower()</a>
12-
<a class="nhsuk-button nhsuk-button--secondary" asp-action="PrintLayout" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">View for print</a>
11+
<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>
12+
@if ((Model.FrameworkCompetencies?.Any() ?? false) || (Model.FrameworkCompetencyGroups?.Any(group => group.FrameworkCompetencies.Any()) ?? false) )
13+
{
14+
<a class="nhsuk-button nhsuk-button--secondary" asp-action="PrintLayout" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">View for print</a>
15+
}
1316
</div>
1417
</div>
1518
}

0 commit comments

Comments
 (0)