Skip to content

Commit 4cc9cbb

Browse files
kevwhitt-heekevwhitt-hee
committed
Revert "Squashed commit of the following:"
This reverts commit 0415f9a.
1 parent e5ac58c commit 4cc9cbb

File tree

5 files changed

+79
-71
lines changed

5 files changed

+79
-71
lines changed

‎DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ GROUP BY
171171
public void UpdateLastAccessed(int selfAssessmentId, int delegateUserId)
172172
{
173173
var numberOfAffectedRows = connection.Execute(
174-
@"UPDATE CandidateAssessments SET LastAccessed = GETUTCDATE()
174+
@"UPDATE CandidateAssessments SET LastAccessed = GETDATE()
175175
WHERE SelfAssessmentID = @selfAssessmentId AND DelegateUserID = @delegateUserId",
176176
new { selfAssessmentId, delegateUserId }
177177
);

‎DigitalLearningSolutions.Data/Enums/SelfAssessmentCompetencyFilter.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
{
33
public enum SelfAssessmentCompetencyFilter
44
{
5-
Optional = -11,
6-
AwaitingConfirmation = -10,
7-
PendingConfirmation = -9,
8-
RequiresSelfAssessment = -8,
9-
SelfAssessed = -7,
10-
ConfirmationRequested = -6,
11-
Verified = -5, /* Confirmed */
12-
ConfirmationRejected = -4,
5+
AwaitingConfirmation = -11,
6+
PendingConfirmation = -10,
7+
RequiresSelfAssessment = -9,
8+
SelfAssessed = -8,
9+
ConfirmationRequested = -7,
10+
Verified = -6, /* Confirmed */
11+
ConfirmationRejected = -5,
12+
Optional = -4,
1313
MeetingRequirements = -3,
1414
PartiallyMeetingRequirements = -2,
1515
NotMeetingRequirements = -1

‎DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
{ "selfAssessedCount", selfAssessedCount },
2626
{ "verifiedCount", verifiedCount }
2727
};
28-
28+
var competencyQuestionsSummary = competencySummaries.Sum(c => (int)c["questionsCount"]);
29+
var competencyVerifiedSummary = competencySummaries.Sum(c => (int)c["verifiedCount"]);
2930
Layout = "SelfAssessments/_Layout";
3031
ViewData["Title"] = "Self Assessment - Proficiencies";
3132
ViewData["SelfAssessmentTitle"] = Model.SelfAssessment.Name;
@@ -199,10 +200,13 @@
199200
All required @Model.SelfAssessment.Vocabulary.ToLower() self-assessments must be completed and confirmed,
200201
before requesting @Model.SelfAssessment.SignOffRoleName sign off of the @Model.SelfAssessment.Name.
201202
</p>
203+
@if (competencyQuestionsSummary == competencyVerifiedSummary)
204+
{
202205
<p class="nhsuk-body-l">
203206
Your self assessment does not contain enough optional proficiencies to request sign off.
204207
Go to Manage Optional Competencies to choose the optional competencies that you wish to include..
205208
</p>
209+
}
206210
}
207211
</div>
208212
}

‎DigitalLearningSolutions.Web/Views/SuperAdmin/Centres/ManageCentre.cshtml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
</ol>
1313
<p class="nhsuk-breadcrumb__back">
1414
<a class="nhsuk-breadcrumb__backlink"
15-
asp-controller="Centres" asp-action="Index">Back to Centres</a>
15+
asp-controller="Centres" asp-action="Index"
16+
>Back to Centres</a>
1617
</p>
1718
</div>
1819
</nav>
@@ -186,14 +187,7 @@
186187
<b>Per delegate upload space</b>
187188
</dt>
188189
<dd class="nhsuk-summary-list__value">
189-
@if (@Model.CandidateByteLimit == 1024)
190-
{
191-
@($"{Model.CandidateByteLimit / 1024} GB")
192-
}
193-
else
194-
{
195-
@($"{Model.CandidateByteLimit} MB")
196-
}
190+
@Model.CandidateByteLimit MB
197191
</dd>
198192
</div>
199193
<div class="nhsuk-summary-list__row details-list-with-button__row">
@@ -214,7 +208,7 @@
214208
asp-controller="Centres"
215209
asp-action="CentreRoleLimits"
216210
asp-route-centreId="@Model.CentreId">
217-
Customise role limits
211+
Customise role limits
218212
</a>
219213
</div>
220214
</div>

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

Lines changed: 61 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-controller="Supervisor" asp-action="MyStaffList">My Staff</a></li>
3131
<li class="nhsuk-breadcrumb__item">
3232
<a class="nhsuk-breadcrumb__link trigger-loader" asp-controller="Supervisor"
33-
asp-action="DelegateProfileAssessments"
34-
asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]">
33+
asp-action="DelegateProfileAssessments"
34+
asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]">
3535
@Model.SupervisorDelegateDetail.FirstName @Model.SupervisorDelegateDetail.LastName
3636
</a>
3737
</li>
@@ -44,15 +44,15 @@
4444
@if (ViewBag.navigatedFrom)
4545
{
4646
<a class="nhsuk-breadcrumb__backlink" asp-controller="Supervisor"
47-
asp-action="Index">
47+
asp-action="Index">
4848
Back to Supervisor Dashboard
4949
</a>
5050
}
5151
else
5252
{
5353
<a class="nhsuk-breadcrumb__backlink" asp-controller="Supervisor"
54-
asp-action="DelegateProfileAssessments"
55-
asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]">
54+
asp-action="DelegateProfileAssessments"
55+
asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]">
5656
Back to @Model.SupervisorDelegateDetail.FirstName @Model.SupervisorDelegateDetail.LastName
5757
</a>
5858
}
@@ -86,23 +86,23 @@
8686
@if (!Model.ExportToExcelHide)
8787
{
8888
<a class="nhsuk-button nhsuk-button--secondary"
89-
asp-route-candidateAssessmentId="@Model.CandidateAssessmentId"
90-
asp-route-selfAssessmentName="@Model.DelegateSelfAssessment.RoleName"
91-
asp-route-delegateUserID="@Model.DelegateSelfAssessment.DelegateUserID"
92-
asp-route-delegateName="@Model.SupervisorDelegateDetail.FirstName @Model.SupervisorDelegateDetail.LastName"
93-
asp-action="ExportCandidateAssessment"
94-
role="button">
89+
asp-route-candidateAssessmentId="@Model.CandidateAssessmentId"
90+
asp-route-selfAssessmentName="@Model.DelegateSelfAssessment.RoleName"
91+
asp-route-delegateUserID="@Model.DelegateSelfAssessment.DelegateUserID"
92+
asp-route-delegateName="@Model.SupervisorDelegateDetail.FirstName @Model.SupervisorDelegateDetail.LastName"
93+
asp-action="ExportCandidateAssessment"
94+
role="button">
9595
Export to Excel
9696
</a>
9797
}
9898

9999
@if (ViewBag.CanViewCertificate)
100100
{
101101
<a class="nhsuk-button"
102-
asp-route-candidateAssessmentId="@Model.CandidateAssessmentId"
103-
asp-action="CompetencySelfAssessmentCertificatesupervisor"
104-
asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID"
105-
role="button">
102+
asp-route-candidateAssessmentId="@Model.CandidateAssessmentId"
103+
asp-action="CompetencySelfAssessmentCertificatesupervisor"
104+
asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID"
105+
role="button">
106106
Certificate
107107
</a>
108108
}
@@ -163,50 +163,60 @@
163163
{
164164
<tr role="row" class="nhsuk-table__row first-row">
165165
<td role="cell" rowspan="@competency.AssessmentQuestions.Count()" class="nhsuk-table__cell">
166-
@if(competency.Optional)
167-
{
168-
<partial name="Shared/_TagRow"/>
169-
}
170-
<b> <span class="nhsuk-table-responsive__heading">@competency.Vocabulary </span></b>
171-
<partial name="_CompetencyFlags" model="competency.CompetencyFlags" />
172-
@if (competency.Description != null && !competency.AlwaysShowDescription)
173-
{
174-
<details class="nhsuk-details">
175-
<summary class="nhsuk-details__summary">
176-
<h2 class="nhsuk-u-font-size-24 nhsuk-u-margin-bottom-0">
177-
<span class="nhsuk-details__summary-text">
178-
@competency.Name
179-
</span>
166+
<span class="nhsuk-table-responsive__heading">@competency.Vocabulary </span>
167+
<div class="nhsuk-grid-row">
168+
<div class="nhsuk-grid-column-full">
169+
@if (competency.Optional)
170+
{
171+
<partial name="Shared/_TagRow" />
172+
}
173+
</div>
174+
<div class="nhsuk-grid-column-full">
175+
<partial name="_CompetencyFlags" model="competency.CompetencyFlags" />
176+
</div>
177+
<div class="nhsuk-grid-column-full">
178+
179+
@if (competency.Description != null && !competency.AlwaysShowDescription)
180+
{
181+
<details class="nhsuk-details">
182+
<summary class="nhsuk-details__summary">
183+
<h2 class="nhsuk-u-font-size-24 nhsuk-u-margin-bottom-0">
184+
<span class="nhsuk-details__summary-text">
185+
@competency.Name
186+
</span>
187+
</h2>
188+
</summary>
189+
<div class="nhsuk-details__text">
190+
@(Html.Raw(@competency.Description))
191+
</div>
192+
</details>
193+
}
194+
else
195+
{
196+
<h2 class="nhsuk-u-margin-bottom-0 nhsuk-u-font-size-24">
197+
@competency.Name
180198
</h2>
181-
</summary>
182-
<div class="nhsuk-details__text">
183-
@(Html.Raw(@competency.Description))
184-
</div>
185-
</details>
186-
}
187-
else
188-
{
189-
<h2 class="nhsuk-u-margin-bottom-0 nhsuk-u-font-size-24">
190-
@competency.Name
191-
</h2>
192-
@if (competency.Description != null)
193-
{
194-
<p class="nhsuk-body-l">
195-
@(Html.Raw(competency.Description))
196-
</p>
197-
}
198-
}
199+
@if (competency.Description != null)
200+
{
201+
<p class="nhsuk-body-l">
202+
@(Html.Raw(competency.Description))
203+
</p>
204+
}
205+
}
206+
</div>
207+
208+
</div>
199209
</td>
200210
<partial name="Shared/_AssessmentQuestionReviewCells"
201-
model="competency.AssessmentQuestions.First()"
202-
view-data="@(new ViewDataDictionary(ViewData) {{ "isSupervisorResultsReviewed", Model.IsSupervisorResultsReviewed }, { "ReviewerCommentsLabel", Model.DelegateSelfAssessment.ReviewerCommentsLabel} } )" />
211+
model="competency.AssessmentQuestions.First()"
212+
view-data="@(new ViewDataDictionary(ViewData) {{ "isSupervisorResultsReviewed", Model.IsSupervisorResultsReviewed }, { "ReviewerCommentsLabel", Model.DelegateSelfAssessment.ReviewerCommentsLabel} } )" />
203213
</tr>
204214
@foreach (var question in competency.AssessmentQuestions.Skip(1))
205215
{
206216
<tr role="row" class="nhsuk-table__row">
207217
<partial name="Shared/_AssessmentQuestionReviewCells"
208-
model="question"
209-
view-data="@(new ViewDataDictionary(ViewData) {{ "isSupervisorResultsReviewed", Model.IsSupervisorResultsReviewed }, { "ReviewerCommentsLabel", Model.DelegateSelfAssessment.ReviewerCommentsLabel} } )" />
218+
model="question"
219+
view-data="@(new ViewDataDictionary(ViewData) {{ "isSupervisorResultsReviewed", Model.IsSupervisorResultsReviewed }, { "ReviewerCommentsLabel", Model.DelegateSelfAssessment.ReviewerCommentsLabel} } )" />
210220
</tr>
211221
}
212222
}

0 commit comments

Comments
 (0)