Skip to content

Commit 2a57889

Browse files
rshrirohitrshrirohit
committed
Merge branch 'DLS-Release-v1.2.1' into UAT
2 parents 752e4c3 + b395ce1 commit 2a57889

File tree

4 files changed

+170
-170
lines changed

4 files changed

+170
-170
lines changed

‎DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ FROM FrameworkCollaborators fc
291291
JOIN AdminAccounts aa1 ON fc.AdminID = aa1.ID
292292
WHERE fc.FrameworkID = fw.ID
293293
AND fc.CanModify = 1 AND fc.IsDeleted = 0
294-
AND aa1.UserID = (SELECT aa2.UserID FROM AdminAccounts aa2 WHERE aa2.ID = 12842)) > 0 THEN 2
294+
AND aa1.UserID = (SELECT aa2.UserID FROM AdminAccounts aa2 WHERE aa2.ID = @adminId)) > 0 THEN 2
295295
WHEN fwc.CanModify = 0 THEN 1 ELSE 0 END AS UserRole,
296296
fwr.ID AS FrameworkReviewID";
297297

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

Lines changed: 87 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -3,100 +3,100 @@
33
<h1>My Frameworks</h1>
44
@if (Model.NoDataFound)
55
{
6-
<p class="nhsuk-u-margin-top-4" role="alert">
7-
<b>You are not currently working on any frameworks.</b>
8-
</p>
6+
<p class="nhsuk-u-margin-top-4" role="alert">
7+
<b>You are not currently working on any frameworks.</b>
8+
</p>
99
}
1010
else
1111
{
12-
<form method="get" role="search" asp-action="ViewFrameworks" asp-route-tabname="Mine" asp-route-page="@Model.Page">
12+
<form method="get" role="search" asp-action="ViewFrameworks" asp-route-tabname="Mine" asp-route-page="@Model.Page">
1313

14-
<partial name="Shared/_FrameworksSearchAndSort" model="Model" />
14+
<partial name="Shared/_FrameworksSearchAndSort" model="Model" />
1515

16-
<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
17-
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
18-
<partial name="SearchablePage/_TopPagination" model="Model" />
19-
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
20-
@if (Model.MatchingSearchResults > 0)
21-
{
22-
<table role="table" class="nhsuk-table-responsive">
23-
<caption class="nhsuk-table__caption nhsuk-u-visually-hidden">Frameworks you are working on</caption>
24-
<thead role="rowgroup" class="nhsuk-table__head">
25-
<tr role="row">
26-
<th role="columnheader" class="" scope="col">
27-
Framework
28-
</th>
29-
<th role="columnheader" class="" scope="col">
30-
Created
31-
</th>
32-
<th role="columnheader" class="" scope="col">
33-
Status
34-
</th>
35-
<th role="columnheader" class="" scope="col">
36-
Owner
37-
</th>
38-
<th role="columnheader" class="" scope="col">
39-
Actions
40-
</th>
41-
</tr>
42-
</thead>
43-
<tbody class="nhsuk-table__body">
44-
@foreach (var framework in Model.BrandedFrameworks)
45-
{
46-
<tr role="row" class="nhsuk-table__row framework-row">
47-
<td role="cell" class="nhsuk-table__cell">
48-
<span class="nhsuk-table-responsive__heading">Framework </span>
49-
<span class="framework-name">
50-
@framework.FrameworkName
51-
</span>
52-
</td>
53-
<td role="cell" class="nhsuk-table__cell">
54-
<span class="nhsuk-table-responsive__heading">Created </span>
55-
<span class="framework-created-date">
56-
@framework.CreatedDate.ToShortDateString()
57-
</span>
58-
</td>
59-
<td role="cell" class="nhsuk-table__cell">
60-
<span class="nhsuk-table-responsive__heading">Status </span>
61-
<span class="framework-publish-status">
62-
<partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
63-
</span>
64-
</td>
65-
<td role="cell" class="nhsuk-table__cell">
66-
<span class="nhsuk-table-responsive__heading">Owner </span>
67-
<span class="framework-owner">
68-
@framework.Owner
69-
</span>
70-
</td>
71-
<td role="cell" class="nhsuk-table__cell">
72-
<span class="nhsuk-table-responsive__heading">Actions </span>
73-
@if (framework.UserRole > 1)
74-
{
75-
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
76-
View/Edit
77-
<span class="visually-hidden">@framework.FrameworkName</span>
78-
</a>
79-
}
80-
else if (framework.UserRole == 1)
81-
{
82-
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
83-
Review
84-
<span class="visually-hidden">@framework.FrameworkName</span>
85-
</a>
86-
}
87-
</td>
88-
</tr>
89-
}
90-
</tbody>
91-
</table>
92-
}
93-
<partial name="SearchablePage/_BottomPagination" model="Model" />
16+
<hr class="nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" />
17+
<partial name="SearchablePage/_SearchResultsCount" model="Model" />
18+
<partial name="SearchablePage/_TopPagination" model="Model" />
19+
<partial name="SearchablePage/_ResultCountAndPageAlerts" model="Model" />
20+
@if (Model.MatchingSearchResults > 0)
21+
{
22+
<table role="table" class="nhsuk-table-responsive">
23+
<caption class="nhsuk-table__caption nhsuk-u-visually-hidden">Frameworks you are working on</caption>
24+
<thead role="rowgroup" class="nhsuk-table__head">
25+
<tr role="row">
26+
<th role="columnheader" class="" scope="col">
27+
Framework
28+
</th>
29+
<th role="columnheader" class="" scope="col">
30+
Created
31+
</th>
32+
<th role="columnheader" class="" scope="col">
33+
Status
34+
</th>
35+
<th role="columnheader" class="" scope="col">
36+
Owner
37+
</th>
38+
<th role="columnheader" class="" scope="col">
39+
Actions
40+
</th>
41+
</tr>
42+
</thead>
43+
<tbody class="nhsuk-table__body">
44+
@foreach (var framework in Model.BrandedFrameworks)
45+
{
46+
<tr role="row" class="nhsuk-table__row framework-row">
47+
<td role="cell" class="nhsuk-table__cell">
48+
<span class="nhsuk-table-responsive__heading">Framework </span>
49+
<span class="framework-name">
50+
@framework.FrameworkName
51+
</span>
52+
</td>
53+
<td role="cell" class="nhsuk-table__cell">
54+
<span class="nhsuk-table-responsive__heading">Created </span>
55+
<span class="framework-created-date">
56+
@framework.CreatedDate.ToShortDateString()
57+
</span>
58+
</td>
59+
<td role="cell" class="nhsuk-table__cell">
60+
<span class="nhsuk-table-responsive__heading">Status </span>
61+
<span class="framework-publish-status">
62+
<partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
63+
</span>
64+
</td>
65+
<td role="cell" class="nhsuk-table__cell">
66+
<span class="nhsuk-table-responsive__heading">Owner </span>
67+
<span class="framework-owner">
68+
@framework.Owner
69+
</span>
70+
</td>
71+
<td role="cell" class="nhsuk-table__cell">
72+
<span class="nhsuk-table-responsive__heading">Actions </span>
73+
@if (framework.UserRole > 1)
74+
{
75+
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
76+
View/Edit
77+
<span class="visually-hidden">@framework.FrameworkName</span>
78+
</a>
79+
}
80+
else if (framework.UserRole == 1)
81+
{
82+
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
83+
@(framework.FrameworkReviewID == null ? "View" : "Review")
84+
<span class="visually-hidden">@framework.FrameworkName</span>
85+
</a>
86+
}
87+
</td>
88+
</tr>
89+
}
90+
</tbody>
91+
</table>
92+
}
93+
<partial name="SearchablePage/_BottomPagination" model="Model" />
9494

95-
</form>
95+
</form>
9696
}
9797
@if (Model.IsFrameworkDeveloper)
9898
{
99-
<a class="nhsuk-button nhsuk-u-margin-top-4" asp-action="StartNewFrameworkSession">
100-
Create new framework
101-
</a>
99+
<a class="nhsuk-button nhsuk-u-margin-top-4" asp-action="StartNewFrameworkSession">
100+
Create new framework
101+
</a>
102102
}

‎DigitalLearningSolutions.Web/Views/Frameworks/Shared/_BrandedFrameworkTable.cshtml‎

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -2,85 +2,85 @@
22
@model IEnumerable<BrandedFramework>
33
@if (Model != null && Model.Count() > 0)
44
{
5-
<table role="table" class="nhsuk-table-responsive">
6-
<caption class="nhsuk-table__caption nhsuk-u-visually-hidden">
7-
Frameworks
8-
</caption>
9-
<thead role="rowgroup" class="nhsuk-table__head">
10-
<tr role="row">
11-
<th role="columnheader" class="" scope="col">
12-
Framework
13-
</th>
14-
<th role="columnheader" class="" scope="col">
15-
Created
16-
</th>
17-
<th role="columnheader" class="" scope="col">
18-
Status
19-
</th>
20-
<th role="columnheader" class="" scope="col">
21-
Owner
22-
</th>
23-
<th role="columnheader" class="" scope="col">
24-
Actions
25-
</th>
26-
</tr>
27-
</thead>
28-
<tbody class="nhsuk-table__body">
29-
@foreach (var framework in Model)
30-
{
31-
<tr role="row" class="nhsuk-table__row framework-row">
32-
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
33-
<span class="nhsuk-table-responsive__heading">Framework </span>
34-
<span class="framework-brand">
35-
@framework.Brand
36-
</span>
37-
@if (framework.Category != null)
5+
<table role="table" class="nhsuk-table-responsive">
6+
<caption class="nhsuk-table__caption nhsuk-u-visually-hidden">
7+
Frameworks
8+
</caption>
9+
<thead role="rowgroup" class="nhsuk-table__head">
10+
<tr role="row">
11+
<th role="columnheader" class="" scope="col">
12+
Framework
13+
</th>
14+
<th role="columnheader" class="" scope="col">
15+
Created
16+
</th>
17+
<th role="columnheader" class="" scope="col">
18+
Status
19+
</th>
20+
<th role="columnheader" class="" scope="col">
21+
Owner
22+
</th>
23+
<th role="columnheader" class="" scope="col">
24+
Actions
25+
</th>
26+
</tr>
27+
</thead>
28+
<tbody class="nhsuk-table__body">
29+
@foreach (var framework in Model)
3830
{
39-
<span>/</span>
31+
<tr role="row" class="nhsuk-table__row framework-row">
32+
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
33+
<span class="nhsuk-table-responsive__heading">Framework </span>
34+
<span class="framework-brand">
35+
@framework.Brand
36+
</span>
37+
@if (framework.Category != null)
38+
{
39+
<span>/</span>
4040

41-
<span class="framework-category"> @framework.Category </span>
42-
}<span>/</span>
43-
<span class="framework-name nhsuk-u-font-weight-bold">
44-
@framework.FrameworkName
45-
</span>
46-
</td>
47-
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
48-
<span class="nhsuk-table-responsive__heading">Created </span>
49-
<span class="framework-created-date">
50-
@framework.CreatedDate.ToShortDateString()
51-
</span>
52-
</td>
53-
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
54-
<span class="nhsuk-table-responsive__heading">Status </span>
55-
<span class="framework-publish-status">
56-
<partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
57-
</span>
58-
</td>
59-
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
60-
<span class="nhsuk-table-responsive__heading">Owner </span>
61-
<span class="framework-owner">
62-
@framework.Owner
63-
</span>
64-
</td>
65-
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
66-
<span class="nhsuk-table-responsive__heading">Actions </span>
67-
@if (framework.UserRole > 1)
68-
{
69-
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
70-
View/Edit
71-
<span class="visually-hidden">@framework.FrameworkName</span>
72-
</a>
73-
}
74-
else
75-
{
76-
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
77-
View
78-
<span class="visually-hidden">@framework.FrameworkName</span>
79-
</a>
41+
<span class="framework-category"> @framework.Category </span>
42+
}<span>/</span>
43+
<span class="framework-name nhsuk-u-font-weight-bold">
44+
@framework.FrameworkName
45+
</span>
46+
</td>
47+
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
48+
<span class="nhsuk-table-responsive__heading">Created </span>
49+
<span class="framework-created-date">
50+
@framework.CreatedDate.ToShortDateString()
51+
</span>
52+
</td>
53+
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
54+
<span class="nhsuk-table-responsive__heading">Status </span>
55+
<span class="framework-publish-status">
56+
<partial name="Shared/_StatusTag" model="framework.PublishStatusID" />
57+
</span>
58+
</td>
59+
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
60+
<span class="nhsuk-table-responsive__heading">Owner </span>
61+
<span class="framework-owner">
62+
@framework.Owner
63+
</span>
64+
</td>
65+
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
66+
<span class="nhsuk-table-responsive__heading">Actions </span>
67+
@if (framework.UserRole > 1)
68+
{
69+
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
70+
View/Edit
71+
<span class="visually-hidden">@framework.FrameworkName</span>
72+
</a>
73+
}
74+
else
75+
{
76+
<a asp-action="ViewFramework" asp-route-frameworkId="@framework.ID" asp-route-tabname="Structure">
77+
@(framework.FrameworkReviewID == null ? "View" : "Review")
78+
<span class="visually-hidden">@framework.FrameworkName</span>
79+
</a>
80+
}
81+
</td>
82+
</tr>
8083
}
81-
</td>
82-
</tr>
83-
}
84-
</tbody>
85-
</table>
84+
</tbody>
85+
</table>
8686
}

‎DigitalLearningSolutions.Web/Views/Supervisor/VerifyMultipleResults.cshtml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,17 +130,17 @@
130130
<span class="nhsuk-table-responsive__heading">@competency.Vocabulary </span>
131131
<div class="nhsuk-checkboxes__item">
132132
<input data-group="@competencyGroup.Key" class="nhsuk-checkboxes__input select-all-checkbox" id="result-check-@question.SelfAssessmentResultSupervisorVerificationId" name="resultChecked" type="checkbox" value="@question.SelfAssessmentResultSupervisorVerificationId">
133-
<label aria-label="Competency.Name" class="@(string.IsNullOrEmpty(competency.Description) ? "nhsuk-label nhsuk-checkboxes__label nhsuk-u-font-size-16" : "nhsuk-label nhsuk-checkboxes__label nhsuk-u-padding-0 nhsuk-u-display-block")" for="result-check-@question.SelfAssessmentResultSupervisorVerificationId">
134-
@if (competency.Description == null)
133+
<label aria-label="Competency.Name" class="@(string.IsNullOrWhiteSpace(competency.Description) ? "nhsuk-label nhsuk-checkboxes__label nhsuk-u-font-size-19" : "nhsuk-label nhsuk-checkboxes__label nhsuk-u-padding-0 nhsuk-u-display-block")" for="result-check-@question.SelfAssessmentResultSupervisorVerificationId">
134+
@if (string.IsNullOrWhiteSpace(competency.Description))
135135
{
136136
@competency.Name
137137
}
138138
</label>
139-
@if (!string.IsNullOrEmpty(competency.Description))
139+
@if (!string.IsNullOrWhiteSpace(competency.Description))
140140
{
141141
<details class="nhsuk-details nhsuk-u-padding-left-2 ">
142142
<summary class="nhsuk-details__summary nhsuk-u-padding-left-2">
143-
<span class="nhsuk-label nhsuk-checkboxes__label nhsuk-u-font-size-16 " for="result-check-@question.SelfAssessmentResultSupervisorVerificationId">
143+
<span class="nhsuk-label nhsuk-checkboxes__label nhsuk-u-font-size-19 " for="result-check-@question.SelfAssessmentResultSupervisorVerificationId">
144144
@competency.Name
145145
</span>
146146
</summary>

0 commit comments

Comments
 (0)