Skip to content

Commit a9c9979

Browse files
rshrirohitrshrirohit
authored
Merge pull request #3191 from TechnologyEnhancedLearning/Develop/feature/TD-5435-Move-Todo-list-above-Staff
TD-5435-'To Do' section has been moved above the 'Staff' section.
2 parents 92fe354 + 87d3841 commit a9c9979

File tree

1 file changed

+82
-82
lines changed

1 file changed

+82
-82
lines changed

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

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -3,99 +3,99 @@
33

44
@model SupervisorDashboardViewModel;
55
@{
6-
ViewData["Title"] = "Dashboard";
7-
ViewData["Application"] = "Supervisor";
8-
ViewData["HeaderPathName"] = "Supervisor";
6+
ViewData["Title"] = "Dashboard";
7+
ViewData["Application"] = "Supervisor";
8+
ViewData["HeaderPathName"] = "Supervisor";
99
}
1010
<link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
1111
@section NavMenuItems {
12-
<partial name="Shared/_NavMenuItems" />
12+
<partial name="Shared/_NavMenuItems" />
1313
}
14-
@section NavBreadcrumbs {
15-
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
16-
<div class="nhsuk-width-container">
17-
<ol class="nhsuk-breadcrumb__list">
18-
<li class="nhsuk-breadcrumb__item">Supervisor</li>
19-
</ol>
20-
</div>
21-
</nav>
14+
@section NavBreadcrumbs {
15+
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
16+
<div class="nhsuk-width-container">
17+
<ol class="nhsuk-breadcrumb__list">
18+
<li class="nhsuk-breadcrumb__item">Supervisor</li>
19+
</ol>
20+
</div>
21+
</nav>
2222
}
23-
<h1>Supervisor Dashboard</h1>
24-
@if (Model.BannerText != null)
23+
<h1>Supervisor Dashboard</h1>
24+
<h2>Your to do list</h2>
25+
@if (Model.SupervisorDashboardToDoItems.Count() > 0)
2526
{
26-
<h2 class="page-subheading word-break">@Model.BannerText</h2>
27-
}
28-
<ul class="nhsuk-grid-row nhsuk-card-group">
29-
30-
<feature name="@(FeatureFlags.SupervisorProfileAssessmentInterface)">
31-
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
32-
</feature>
33-
<feature name="@(FeatureFlags.SupervisorProfileAssessmentInterface)" negate="true">
34-
<li class="nhsuk-grid-column-full nhsuk-card-group__item">
35-
</feature>
36-
<div class="nhsuk-card">
37-
<div class="nhsuk-card__content">
38-
<p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
39-
@Model.DashboardData.StaffCount Staff @if (Model.DashboardData.StaffUnregisteredCount > 0)
27+
<ul class="nhsuk-contents-list__list">
28+
@foreach (var toDoItem in Model.SupervisorDashboardToDoItems)
4029
{
41-
<span class="nhsuk-u-secondary-text-color nhsuk-u-font-weight-normal">
42-
(@Model.DashboardData.StaffUnregisteredCount not registered)
43-
</span>
44-
}
45-
</p>
46-
<ul class="nhsuk-contents-list__list">
4730

48-
<li class="nhsuk-contents-list__item"><a asp-controller="Supervisor" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="MyStaffList">View My Staff List</a></li>
49-
</ul>
50-
</div>
51-
</div>
52-
</li>
53-
<feature name="@(FeatureFlags.SupervisorProfileAssessmentInterface)">
54-
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
55-
<div class="nhsuk-card">
56-
<div class="nhsuk-card__content">
57-
<p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
58-
@Model.DashboardData.ProfileCount Role Profiles
59-
</p>
60-
<ul class="nhsuk-contents-list__list">
61-
@if (Model.DashboardData.AwaitingReviewCount > 0)
31+
if (toDoItem.SignOffRequest)
6232
{
63-
<li class="nhsuk-contents-list__item"><a asp-controller="Supervisor" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="RoleProfileReviewRequests" asp-route-tabname="Mine">Profile Assessment Sign-off Requests (@Model.DashboardData.AwaitingReviewCount)</a></li>
33+
<li class="nhsuk-contents-list__item">
34+
<a class="nhsuk-link--no-visited-state" asp-action="ReviewDelegateSelfAssessment" asp-route-supervisorDelegateId="@toDoItem.SupervisorDelegateId" asp-route-candidateAssessmentId="@toDoItem.ID">
35+
Review and sign-off @toDoItem.DelegateName's @toDoItem.ProfileName
36+
</a>. Requested @toDoItem.Requested.ToShortDateString()
37+
</li>
6438
}
65-
<li class="nhsuk-contents-list__item"><a asp-controller="Supervisor" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewRoleProfileAssessments" asp-route-tabname="All">View Profile Assessments (@Model.DashboardData.ProfileSelfAssessmentCount)</a></li>
66-
</ul>
67-
</div>
68-
</div>
69-
</li>
70-
</feature>
71-
</ul>
72-
<h2>Your to do list</h2>
73-
@if (Model.SupervisorDashboardToDoItems.Count() > 0)
74-
{
75-
<ul class="nhsuk-contents-list__list">
76-
@foreach (var toDoItem in Model.SupervisorDashboardToDoItems)
77-
{
78-
79-
if (toDoItem.SignOffRequest)
80-
{
81-
<li class="nhsuk-contents-list__item">
82-
<a class="nhsuk-link--no-visited-state" asp-action="ReviewDelegateSelfAssessment" asp-route-supervisorDelegateId="@toDoItem.SupervisorDelegateId" asp-route-candidateAssessmentId="@toDoItem.ID">
83-
Review and sign-off @toDoItem.DelegateName's @toDoItem.ProfileName
84-
</a>. Requested @toDoItem.Requested.ToShortDateString()
85-
</li>
86-
}
87-
else if (toDoItem.ResultsReviewRequest)
88-
{
89-
<li class="nhsuk-contents-list__item">
90-
<a class="nhsuk-link--no-visited-state" asp-action="ReviewDelegateSelfAssessment" asp-route-supervisorDelegateId="@toDoItem.SupervisorDelegateId" asp-route-candidateAssessmentId="@toDoItem.ID">
91-
Confirm self-assessment results for @toDoItem.DelegateName's @toDoItem.ProfileName
92-
</a>. Requested @toDoItem.Requested.ToShortDateString()
93-
</li>
94-
}
95-
}
96-
</ul>
39+
else if (toDoItem.ResultsReviewRequest)
40+
{
41+
<li class="nhsuk-contents-list__item">
42+
<a class="nhsuk-link--no-visited-state" asp-action="ReviewDelegateSelfAssessment" asp-route-supervisorDelegateId="@toDoItem.SupervisorDelegateId" asp-route-candidateAssessmentId="@toDoItem.ID">
43+
Confirm self-assessment results for @toDoItem.DelegateName's @toDoItem.ProfileName
44+
</a>. Requested @toDoItem.Requested.ToShortDateString()
45+
</li>
46+
}
47+
}
48+
</ul>
9749
}
9850
else
9951
{
100-
<p>There are no tasks requiring your attention.</p>
52+
<p>There are no tasks requiring your attention.</p>
53+
}
54+
@if (Model.BannerText != null)
55+
{
56+
<h2 class="page-subheading word-break">@Model.BannerText</h2>
10157
}
58+
<ul class="nhsuk-grid-row nhsuk-card-group">
59+
60+
<feature name="@(FeatureFlags.SupervisorProfileAssessmentInterface)">
61+
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
62+
</feature>
63+
<feature name="@(FeatureFlags.SupervisorProfileAssessmentInterface)" negate="true">
64+
<li class="nhsuk-grid-column-full nhsuk-card-group__item">
65+
</feature>
66+
<div class="nhsuk-card">
67+
<div class="nhsuk-card__content">
68+
<p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
69+
@Model.DashboardData.StaffCount Staff @if (Model.DashboardData.StaffUnregisteredCount > 0)
70+
{
71+
<span class="nhsuk-u-secondary-text-color nhsuk-u-font-weight-normal">
72+
(@Model.DashboardData.StaffUnregisteredCount not registered)
73+
</span>
74+
}
75+
</p>
76+
<ul class="nhsuk-contents-list__list">
77+
78+
<li class="nhsuk-contents-list__item"><a asp-controller="Supervisor" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="MyStaffList">View My Staff List</a></li>
79+
</ul>
80+
</div>
81+
</div>
82+
</li>
83+
<feature name="@(FeatureFlags.SupervisorProfileAssessmentInterface)">
84+
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
85+
<div class="nhsuk-card">
86+
<div class="nhsuk-card__content">
87+
<p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
88+
@Model.DashboardData.ProfileCount Role Profiles
89+
</p>
90+
<ul class="nhsuk-contents-list__list">
91+
@if (Model.DashboardData.AwaitingReviewCount > 0)
92+
{
93+
<li class="nhsuk-contents-list__item"><a asp-controller="Supervisor" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="RoleProfileReviewRequests" asp-route-tabname="Mine">Profile Assessment Sign-off Requests (@Model.DashboardData.AwaitingReviewCount)</a></li>
94+
}
95+
<li class="nhsuk-contents-list__item"><a asp-controller="Supervisor" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewRoleProfileAssessments" asp-route-tabname="All">View Profile Assessments (@Model.DashboardData.ProfileSelfAssessmentCount)</a></li>
96+
</ul>
97+
</div>
98+
</div>
99+
</li>
100+
</feature>
101+
</ul>

0 commit comments

Comments
 (0)