Skip to content

Commit 1636ea0

Browse files
rshrirohitrshrirohit
committed
Merge branch 'DLS-Release-v1.2.0' into UAT
2 parents bec7e65 + 98a838c commit 1636ea0

File tree

11 files changed

+135
-161
lines changed

11 files changed

+135
-161
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
}

‎DigitalLearningSolutions.Web/Views/SuperAdmin/AdminAccounts/Index.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</div>
6666
</div>
6767
<div class="filter-container nhsuk-u-margin-top-5">
68-
<div class="nhsuk-grid-column-one-quarter">
68+
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
6969
<vc:select-list asp-for="@nameof(Model.UserStatus)"
7070
label="Account status"
7171
value="@Model.UserStatus"
@@ -75,7 +75,7 @@
7575
default-option=""
7676
select-list-options="@ViewBag.UserStatus" />
7777
</div>
78-
<div class="nhsuk-grid-column-one-quarter">
78+
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
7979
<vc:select-list asp-for="@nameof(Model.Role)"
8080
label="Role"
8181
value="@Model.Role"

‎DigitalLearningSolutions.Web/Views/SuperAdmin/Delegates/Index.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
</div>
5757
</div>
5858
<div class="filter-container nhsuk-u-margin-top-5">
59-
<div class="nhsuk-grid-column-one-quarter">
59+
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
6060
<vc:select-list asp-for="@nameof(Model.AccountStatus)"
6161
label="Account status"
6262
value="@Model.AccountStatus"
@@ -66,7 +66,7 @@
6666
default-option=""
6767
select-list-options="@ViewBag.AccountStatus" />
6868
</div>
69-
<div class="nhsuk-grid-column-one-quarter">
69+
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
7070
<vc:select-list asp-for="@nameof(Model.LHLinkStatus)"
7171
label="LH link status"
7272
value="@Model.LHLinkStatus"

‎DigitalLearningSolutions.Web/Views/SuperAdmin/Users/Index.cshtml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@
5050
</div>
5151
</div>
5252
</div>
53+
</div>
54+
<div class="nhsuk-grid-row">
5355
<div class="filter-container nhsuk-u-margin-top-5">
54-
<div class="nhsuk-grid-column-one-quarter">
56+
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
5557
<vc:select-list asp-for="@nameof(Model.UserStatus)"
5658
label="User status"
5759
value="@Model.UserStatus"
@@ -61,7 +63,7 @@
6163
default-option=""
6264
select-list-options="@ViewBag.UserStatus" />
6365
</div>
64-
<div class="nhsuk-grid-column-one-quarter">
66+
<div class="nhsuk-grid-column-one-quarter nhsuk-u-margin-right-3">
6567
<vc:select-list asp-for="@nameof(Model.EmailStatus)"
6668
label="Email status"
6769
value="@Model.EmailStatus"

‎DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/EmailDelegates/Index.cshtml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@
3838
}
3939
else
4040
{
41-
<div class="nhsuk-grid-row nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-6">
42-
<div class="nhsuk-grid-column-full">
43-
<form id="select-all-form" method="get" asp-action="Index">
44-
<label class="nhsuk-label--s nhsuk-u-margin-bottom-1">Select</label>
45-
<button type="submit" class="nhsuk-button select-all-button" id="select-all-button" name="selectAll" value="true">Select all</button>
46-
<button type="submit" class="nhsuk-button select-all-button" id="deselect-all-button" name="selectAll" value="false">Deselect all</button>
47-
</form>
48-
</div>
49-
</div>
41+
5042

5143
<partial name="SearchablePage/_SearchResultsCountWithAlert" model="Model" />
44+
<div class="nhsuk-grid-row nhsuk-u-margin-top-4">
45+
<div class="nhsuk-grid-column-full">
46+
<form id="select-all-form" method="get" asp-action="Index">
47+
<button type="submit" class="nhsuk-button select-all-button" id="select-all-button" name="selectAll" value="true">Select all</button>
48+
<button type="submit" class="nhsuk-button select-all-button" id="deselect-all-button" name="selectAll" value="false">Deselect all</button>
49+
</form>
50+
</div>
51+
</div>
5252
<form method="post">
5353
<div class="nhsuk-form-group nhsuk-u-margin-top-4">
5454
<div class="nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3">

‎DigitalLearningSolutions.Web/Views/UserFeedback/GuestFeedbackStart.cshtml‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,16 @@
1010
<link rel="stylesheet" href="@Url.Content("~/css/userFeedback/userFeedback.css")" asp-append-version="true">
1111

1212
@section NavBreadcrumbs {
13-
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
14-
<div class="nhsuk-width-container">
15-
<ol class="nhsuk-breadcrumb__list">
16-
<li class="nhsuk-breadcrumb__item">
17-
<a class="nhsuk-breadcrumb__link trigger-loader" href="@Model.SourceUrl">
18-
@if (Model.SourcePageTitle != String.Empty)
19-
{
20-
<div><partial name="_NhsChevronLeft" class="feedback-chevron" /> Go back to Welcome page</div>
21-
22-
}
23-
@if (Model.SourcePageTitle == String.Empty)
24-
{
25-
<div><partial name="_NhsChevronLeft" class="feedback-chevron" /> Go back</div>
26-
}
27-
</a>
28-
</li>
29-
</ol>
30-
<p class="nhsuk-breadcrumb__back">
31-
<a class="nhsuk-breadcrumb__link" href="@Model.SourceUrl">Go back to @Model.SourcePageTitle</a>
32-
</p>
13+
<div class="nhsuk-width-container">
14+
<div class="nhsuk-back-link">
15+
<a class="nhsuk-back-link__link" href="@Model.SourceUrl">
16+
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" height="24" width="24">
17+
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
18+
</svg>
19+
Go back
20+
</a>
3321
</div>
34-
</nav>
22+
</div>
3523
}
3624

3725
<div class="nhsuk-grid-row">

‎DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackComplete.cshtml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,16 @@
99
<link rel="stylesheet" href="@Url.Content("~/css/userFeedback/userFeedback.css")" asp-append-version="true">
1010

1111
@section NavBreadcrumbs {
12-
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
13-
<div class="nhsuk-width-container">
14-
<ol class="nhsuk-breadcrumb__list">
15-
<li class="nhsuk-breadcrumb__item">
16-
@* no link required in the Thank You For The Feedback page*@
17-
</li>
18-
</ol>
19-
<p class="nhsuk-breadcrumb__back">
20-
<a class="nhsuk-breadcrumb__link" href="@Model.SourceUrl">Go back to @Model.SourcePageTitle</a>
21-
</p>
12+
<div class="nhsuk-width-container">
13+
<div class="nhsuk-back-link">
14+
<a class="nhsuk-back-link__link" href="@Model.SourceUrl">
15+
<svg class="nhsuk-icon nhsuk-icon__chevron-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" height="24" width="24">
16+
<path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
17+
</svg>
18+
Go back
19+
</a>
2220
</div>
23-
</nav>
21+
</div>
2422
}
2523

2624
<div class="nhsuk-grid-row">

0 commit comments

Comments
 (0)