Skip to content

Commit 9c892a4

Browse files
Auldrin-PossaAuldrin-Possa
committed
TD-5436-The 'To Do' section has been moved above the 'Frameworks' section.
1 parent e086d72 commit 9c892a4

File tree

1 file changed

+75
-74
lines changed

1 file changed

+75
-74
lines changed

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

Lines changed: 75 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -3,91 +3,92 @@
33

44
@model DashboardViewModel;
55
@{
6-
ViewData["Title"] = "Dashboard";
7-
ViewData["Application"] = "Framework Service";
8-
ViewData["HeaderPathName"] = "Framework Service";
6+
ViewData["Title"] = "Dashboard";
7+
ViewData["Application"] = "Framework Service";
8+
ViewData["HeaderPathName"] = "Framework Service";
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">Frameworks</li>
19-
</ol>
20-
</div>
21-
</nav>
22-
}
23-
<h1>Frameworks Dashboard</h1>
24-
<p class="nhsuk-body-m">Welcome <span class="nhsuk-u-font-weight-bold">@Model.Username</span>. You are accessing as a <span class="nhsuk-u-font-weight-bold">@(Model.IsFrameworkDeveloper ? "Framework Developer" : Model.IsFrameworkContributor ? "Framework Contributor" : "Framework Viewer")</span><feature name="@(FeatureFlags.WorkforceManagerInterface)"> and a <span class="nhsuk-u-font-weight-bold">@(Model.IsWorkforceManager ? "Workforce Manager" : Model.IsWorkforceContributor ? "Role Profile Contributor" : "Role Profile Viewer")</span></feature>.</p>
25-
<ul class="nhsuk-grid-row nhsuk-card-group">
26-
<feature name="@(FeatureFlags.WorkforceManagerInterface)">
27-
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
28-
</feature>
29-
<feature name="@(FeatureFlags.WorkforceManagerInterface)" negate="true">
30-
<li class="nhsuk-grid-column-full nhsuk-card-group__item">
31-
</feature>
32-
<div class="nhsuk-card">
33-
<div class="nhsuk-card__content">
34-
<p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
35-
@Model.DashboardData.FrameworksCount Frameworks
36-
</p>
37-
<ul class="nhsuk-contents-list__list">
38-
@if (Model.IsFrameworkContributor | Model.IsFrameworkDeveloper)
39-
{
40-
<li class="nhsuk-contents-list__item"><a asp-controller="Frameworks" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewFrameworks" asp-route-tabname="Mine">Manage My Frameworks (@Model.DashboardData.MyFrameworksCount)</a></li>
41-
}
42-
<li class="nhsuk-contents-list__item"><a asp-controller="Frameworks" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewFrameworks" asp-route-tabname="All">View All Frameworks</a></li>
43-
</ul>
44-
</div>
45-
</div>
46-
</li>
47-
<feature name="@(FeatureFlags.WorkforceManagerInterface)">
48-
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
49-
<div class="nhsuk-card">
50-
<div class="nhsuk-card__content">
51-
<p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
52-
@Model.DashboardData.RoleProfileCount Role Profiles
53-
</p>
54-
<ul class="nhsuk-contents-list__list">
55-
@if (Model.IsWorkforceManager | Model.IsWorkforceContributor)
56-
{
57-
<li class="nhsuk-contents-list__item"><a asp-controller="RoleProfiles" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewRoleProfiles" asp-route-tabname="Mine">Manage My Role Profiles (@Model.DashboardData.MyRoleProfileCount)</a></li>
58-
}
59-
<li class="nhsuk-contents-list__item"><a asp-controller="RoleProfiles" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewRoleProfiles" asp-route-tabname="All">View All Role Profiles</a></li>
60-
</ul>
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">Frameworks</li>
19+
</ol>
6120
</div>
62-
</div>
63-
</li>
64-
</feature>
65-
</ul>
21+
</nav>
22+
}
23+
<h1>Frameworks Dashboard</h1>
24+
<p class="nhsuk-body-m">Welcome <span class="nhsuk-u-font-weight-bold">@Model.Username</span>. You are accessing as a <span class="nhsuk-u-font-weight-bold">@(Model.IsFrameworkDeveloper ? "Framework Developer" : Model.IsFrameworkContributor ? "Framework Contributor" : "Framework Viewer")</span><feature name="@(FeatureFlags.WorkforceManagerInterface)"> and a <span class="nhsuk-u-font-weight-bold">@(Model.IsWorkforceManager ? "Workforce Manager" : Model.IsWorkforceContributor ? "Role Profile Contributor" : "Role Profile Viewer")</span></feature>.</p>
6625
<h2>Your to do list</h2>
6726
@if (Model.DashboardToDoItems.Count() > 0)
6827
{
69-
<ul class="nhsuk-contents-list__list">
70-
@foreach (var toDoItem in Model.DashboardToDoItems)
71-
{
72-
<li class="nhsuk-contents-list__item">
73-
@if (toDoItem.FrameworkID != null)
74-
{
75-
<a class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-controller="Frameworks" asp-route-tabname="Structure" asp-route-frameworkId="@toDoItem.FrameworkID" asp-action="ViewFramework">
76-
@(toDoItem.SignOffRequired ? "Approve " : "Review ") @toDoItem.ItemName for @toDoItem.RequestorName (requested @toDoItem.Requested.ToShortDateString())
77-
</a>
78-
}
79-
else
28+
<ul class="nhsuk-contents-list__list">
29+
@foreach (var toDoItem in Model.DashboardToDoItems)
8030
{
81-
<a class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-controller="RoleProfiles" asp-route-roleProfileId="@toDoItem.RoleProfileID" asp-action="ViewRoleProfile">
82-
@(toDoItem.SignOffRequired ? "Approve " : "Review ") @toDoItem.ItemName for @toDoItem.RequestorName (requested @toDoItem.Requested.ToShortDateString())
83-
</a>
84-
}
31+
<li class="nhsuk-contents-list__item">
32+
@if (toDoItem.FrameworkID != null)
33+
{
34+
<a class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-controller="Frameworks" asp-route-tabname="Structure" asp-route-frameworkId="@toDoItem.FrameworkID" asp-action="ViewFramework">
35+
@(toDoItem.SignOffRequired ? "Approve " : "Review ") @toDoItem.ItemName for @toDoItem.RequestorName (requested @toDoItem.Requested.ToShortDateString())
36+
</a>
37+
}
38+
else
39+
{
40+
<a class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-controller="RoleProfiles" asp-route-roleProfileId="@toDoItem.RoleProfileID" asp-action="ViewRoleProfile">
41+
@(toDoItem.SignOffRequired ? "Approve " : "Review ") @toDoItem.ItemName for @toDoItem.RequestorName (requested @toDoItem.Requested.ToShortDateString())
42+
</a>
43+
}
8544

86-
</li>
87-
}
88-
</ul>
45+
</li>
46+
}
47+
</ul>
8948
}
9049
else
9150
{
92-
<p>There are no tasks requiring your attention.</p>
51+
<p>There are no tasks requiring your attention.</p>
9352
}
53+
54+
<ul class="nhsuk-grid-row nhsuk-card-group">
55+
<feature name="@(FeatureFlags.WorkforceManagerInterface)">
56+
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
57+
</feature>
58+
<feature name="@(FeatureFlags.WorkforceManagerInterface)" negate="true">
59+
<li class="nhsuk-grid-column-full nhsuk-card-group__item">
60+
</feature>
61+
<div class="nhsuk-card">
62+
<div class="nhsuk-card__content">
63+
<p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
64+
@Model.DashboardData.FrameworksCount Frameworks
65+
</p>
66+
<ul class="nhsuk-contents-list__list">
67+
@if (Model.IsFrameworkContributor | Model.IsFrameworkDeveloper)
68+
{
69+
<li class="nhsuk-contents-list__item"><a asp-controller="Frameworks" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewFrameworks" asp-route-tabname="Mine">Manage My Frameworks (@Model.DashboardData.MyFrameworksCount)</a></li>
70+
}
71+
<li class="nhsuk-contents-list__item"><a asp-controller="Frameworks" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewFrameworks" asp-route-tabname="All">View All Frameworks</a></li>
72+
</ul>
73+
</div>
74+
</div>
75+
</li>
76+
<feature name="@(FeatureFlags.WorkforceManagerInterface)">
77+
<li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
78+
<div class="nhsuk-card">
79+
<div class="nhsuk-card__content">
80+
<p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
81+
@Model.DashboardData.RoleProfileCount Role Profiles
82+
</p>
83+
<ul class="nhsuk-contents-list__list">
84+
@if (Model.IsWorkforceManager | Model.IsWorkforceContributor)
85+
{
86+
<li class="nhsuk-contents-list__item"><a asp-controller="RoleProfiles" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewRoleProfiles" asp-route-tabname="Mine">Manage My Role Profiles (@Model.DashboardData.MyRoleProfileCount)</a></li>
87+
}
88+
<li class="nhsuk-contents-list__item"><a asp-controller="RoleProfiles" class="nhsuk-contents-list__link nhsuk-link--no-visited-state" asp-action="ViewRoleProfiles" asp-route-tabname="All">View All Role Profiles</a></li>
89+
</ul>
90+
</div>
91+
</div>
92+
</li>
93+
</feature>
94+
</ul>

0 commit comments

Comments
 (0)