Skip to content

Commit 204c070

Browse files
kevwhitt-heekevwhitt-hee
committed
Adds task status tags and cannot start yet logic and asp actions for links
1 parent e1b2cdd commit 204c070

File tree

2 files changed

+154
-69
lines changed

2 files changed

+154
-69
lines changed

‎DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml‎

Lines changed: 134 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,150 +1,215 @@
11
@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
22
@model ManageCompetencyAssessmentViewModel
3-
4-
<h1>Manage assessment: @Model.CompetencyAssessmentName</h1>
5-
<div class="content-group">
3+
@{
4+
ViewData["Title"] = "Manage Competency Assessment";
5+
ViewData["Application"] = "Framework Service";
6+
}
7+
<link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
8+
@section NavMenuItems {
9+
<partial name="~/Views/Frameworks/Shared/_NavMenuItems.cshtml" />
10+
}
11+
@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"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
16+
<li class="nhsuk-breadcrumb__item">@Model.CompetencyAssessmentName (<a asp-action="CompetencyAssessmentName" asp-route-actionName="Edit" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">Edit name</a>)</li>
17+
</ol>
18+
<p class="nhsuk-breadcrumb__back">
19+
<a class="nhsuk-breadcrumb__backlink" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">
20+
Back to competency assessments
21+
</a>
22+
</p>
23+
</div>
24+
</nav>
25+
}
26+
<h1>@ViewData["Title"]</h1>
27+
<div class="nhsuk-u-reading-width">
628
<ul class="nhsuk-task-list nhsuk-u-margin-bottom-0">
729
<li class="nhsuk-task-list__item nhsuk-task-list__item--with-link">
830
<div class="nhsuk-task-list__name-and-hint" aria-describedby="select-frameworks-status">
9-
<a class="nhsuk-link nhsuk-task-list__link" href="/paper-transfer/learner/paper-assessment-information">
31+
<a class="nhsuk-link nhsuk-task-list__link" asp-action="SelectFrameworkSources" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
1032
Select competency framework sources
1133
</a>
1234
</div>
1335
<div class="nhsuk-task-list__status" id="select-frameworks-status">
14-
<strong class="nhsuk-tag nhsuk-tag--green">
15-
Complete
16-
</strong>
36+
<partial name="Shared/_TaskStatusTag" model="@Model.CompetencyAssessmentTaskStatus.FrameworkLinksTaskStatus" />
1737
</div>
1838
</li>
1939
<li class="nhsuk-task-list__item nhsuk-task-list__item--with-link">
2040
<div class="nhsuk-task-list__name-and-hint" aria-describedby="description-status">
21-
<a class="nhsuk-link nhsuk-task-list__link" href="/paper-transfer/learner/paper-assessment-information">
41+
<a class="nhsuk-link nhsuk-task-list__link" asp-action="EditDescription" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
2242
Define assessment introductory description
2343
</a>
2444
</div>
2545
<div class="nhsuk-task-list__status" id="description-status">
26-
<strong class="nhsuk-tag nhsuk-tag--green">
27-
Complete
28-
</strong>
46+
<partial name="Shared/_TaskStatusTag" model="@Model.CompetencyAssessmentTaskStatus.IntroductoryTextTaskStatus" />
2947
</div>
3048
</li>
3149
<li class="nhsuk-task-list__item nhsuk-task-list__item--with-link">
3250
<div class="nhsuk-task-list__name-and-hint" aria-describedby="brand-status">
33-
<a class="nhsuk-link nhsuk-task-list__link" href="/paper-transfer/learner/paper-assessment-information">
51+
<a class="nhsuk-link nhsuk-task-list__link" asp-action="SelectBranding" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
3452
Select assessment brand and category
3553
</a>
3654
</div>
3755
<div class="nhsuk-task-list__status" id="brand-status">
38-
<strong class="nhsuk-tag nhsuk-tag--green">
39-
Complete
40-
</strong>
56+
<partial name="Shared/_TaskStatusTag" model="@Model.CompetencyAssessmentTaskStatus.BrandingTaskStatus" />
4157
</div>
4258
</li>
4359
<li class="nhsuk-task-list__item nhsuk-task-list__item--with-link">
4460
<div class="nhsuk-task-list__name-and-hint" aria-describedby="vocabulary-status">
45-
<a class="nhsuk-link nhsuk-task-list__link" href="/paper-transfer/learner/paper-assessment-information">
61+
<a class="nhsuk-link nhsuk-task-list__link" asp-action="AssessmentVocabulary" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
4662
Select assessment vocabulary (@Model.Vocabulary)
4763
</a>
4864
</div>
4965
<div class="nhsuk-task-list__status" id="vocabulary-status">
50-
<strong class="nhsuk-tag nhsuk-tag--green">
51-
Complete
52-
</strong>
66+
<partial name="Shared/_TaskStatusTag" model="@Model.CompetencyAssessmentTaskStatus.VocabularyTaskStatus" />
5367
</div>
5468
</li>
5569
<li class="nhsuk-task-list__item nhsuk-task-list__item--with-link">
5670
<div class="nhsuk-task-list__name-and-hint" aria-describedby="working-group-status">
57-
<a class="nhsuk-link nhsuk-task-list__link" href="/paper-transfer/learner/paper-assessment-information">
71+
<a class="nhsuk-link nhsuk-task-list__link" asp-action="AssessmentWorkingGroup" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
5872
Define working group (contributors and reviewers)
5973
</a>
6074
</div>
6175
<div class="nhsuk-task-list__status" id="working-group-status">
62-
<strong class="nhsuk-tag nhsuk-tag--green">
63-
Complete
64-
</strong>
76+
<partial name="Shared/_TaskStatusTag" model="@Model.CompetencyAssessmentTaskStatus.WorkingGroupTaskStatus" />
6577
</div>
6678
</li>
6779
<li class="nhsuk-task-list__item nhsuk-task-list__item--with-link">
6880
<div class="nhsuk-task-list__name-and-hint" aria-describedby="national-profiles-status">
69-
<a class="nhsuk-link nhsuk-task-list__link" href="/paper-transfer/learner/paper-assessment-information">
81+
<a class="nhsuk-link nhsuk-task-list__link" asp-action="SelectNationalProfiles" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
7082
Link assessment to National Role profiles
7183
</a>
7284
</div>
7385
<div class="nhsuk-task-list__status" id="national-profiles-status">
74-
<strong class="nhsuk-tag nhsuk-tag--green">
75-
Complete
76-
</strong>
86+
<partial name="Shared/_TaskStatusTag" model="@Model.CompetencyAssessmentTaskStatus.NationalRoleProfileTaskStatus" />
7787
</div>
7888
</li>
7989
<li class="nhsuk-task-list__item nhsuk-task-list__item--with-link">
80-
<div class="nhsuk-task-list__name-and-hint" aria-describedby="select-competencies-status">
81-
<a class="nhsuk-link nhsuk-task-list__link" href="/paper-transfer/learner/paper-assessment-information">
90+
91+
@if (Model.CompetencyAssessmentTaskStatus.FrameworkLinksTaskStatus == null)
92+
{
93+
<div class="nhsuk-task-list__name-and-hint" aria-describedby="select-competencies-status">
8294
Select competencies to assess
83-
</a>
84-
</div>
85-
<div class="nhsuk-task-list__status" id="select-competencies-status">
86-
<strong class="nhsuk-tag nhsuk-tag--green">
87-
Complete
88-
</strong>
89-
</div>
95+
</div>
96+
<div class="nhsuk-task-list__status nhsuk-task-list__status--cannot-start-yet" id="select-competencies-status">
97+
Cannot start yet
98+
</div>
99+
}
100+
else
101+
{
102+
<div class="nhsuk-task-list__name-and-hint" aria-describedby="select-competencies-status">
103+
<a class="nhsuk-link nhsuk-task-list__link" asp-action="SelectCompetencies" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
104+
Select competencies to assess
105+
</a>
106+
</div>
107+
<div class="nhsuk-task-list__status" id="select-competencies-status">
108+
<partial name="Shared/_TaskStatusTag" model="@Model.CompetencyAssessmentTaskStatus.SelectCompetenciesTaskStatus" />
109+
</div>
110+
}
111+
90112
</li>
91113
<li class="nhsuk-task-list__item nhsuk-task-list__item--with-link">
92-
<div class="nhsuk-task-list__name-and-hint" aria-describedby="optional-competencies-status">
93-
<a class="nhsuk-link nhsuk-task-list__link" href="/paper-transfer/learner/paper-assessment-information">
114+
@if (Model.CompetencyAssessmentTaskStatus.SelectCompetenciesTaskStatus == null)
115+
{
116+
<div class="nhsuk-task-list__name-and-hint" aria-describedby="optional-competencies-status">
94117
Identify optional competencies
95-
</a>
96-
</div>
97-
<div class="nhsuk-task-list__status" id="optional-competencies-status">
98-
<strong class="nhsuk-tag nhsuk-tag--green">
99-
Complete
100-
</strong>
101-
</div>
118+
</div>
119+
<div class="nhsuk-task-list__status nhsuk-task-list__status--cannot-start-yet" id="optional-competencies-status">
120+
Cannot start yet
121+
</div>
122+
}
123+
else
124+
{
125+
<div class="nhsuk-task-list__name-and-hint" aria-describedby="optional-competencies-status">
126+
<a class="nhsuk-link nhsuk-task-list__link" asp-action="SelectOptionalCompetencies" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
127+
Identify optional competencies
128+
</a>
129+
</div>
130+
<div class="nhsuk-task-list__status" id="optional-competencies-status">
131+
<partial name="Shared/_TaskStatusTag" model="@Model.CompetencyAssessmentTaskStatus.OptionalCompetenciesTaskStatus" />
132+
133+
</div>
134+
135+
}
102136
</li>
103137
<li class="nhsuk-task-list__item nhsuk-task-list__item--with-link">
104-
<div class="nhsuk-task-list__name-and-hint" aria-describedby="role-requirements-status">
105-
<a class="nhsuk-link nhsuk-task-list__link" href="/paper-transfer/learner/paper-assessment-information">
138+
@if (Model.CompetencyAssessmentTaskStatus.SelectCompetenciesTaskStatus == null)
139+
{
140+
<div class="nhsuk-task-list__name-and-hint" aria-describedby="role-requirements-status">
106141
Set competency attainment requirements
107-
</a>
108-
</div>
109-
<div class="nhsuk-task-list__status" id="role-requirements-status">
110-
<strong class="nhsuk-tag nhsuk-tag--green">
111-
Complete
112-
</strong>
113-
</div>
142+
</div>
143+
<div class="nhsuk-task-list__status nhsuk-task-list__status--cannot-start-yet" id="role-requirements-status">
144+
Cannot start yet
145+
</div>
146+
}
147+
else
148+
{
149+
<div class="nhsuk-task-list__name-and-hint" aria-describedby="role-requirements-status">
150+
<a class="nhsuk-link nhsuk-task-list__link" asp-action="SetRoleRequirements" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
151+
Set competency attainment requirements
152+
</a>
153+
</div>
154+
<div class="nhsuk-task-list__status" id="role-requirements-status">
155+
<partial name="Shared/_TaskStatusTag" model="@Model.CompetencyAssessmentTaskStatus.RoleRequirementsTaskStatus" />
156+
</div>
157+
}
114158
</li>
115159
<li class="nhsuk-task-list__item nhsuk-task-list__item--with-link">
116160
<div class="nhsuk-task-list__name-and-hint" aria-describedby="supervisor-roles-status">
117-
<a class="nhsuk-link nhsuk-task-list__link" href="/paper-transfer/learner/paper-assessment-information">
161+
<a class="nhsuk-link nhsuk-task-list__link" asp-action="SupervisorRoles" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
118162
Define supervisor roles
119163
</a>
120164
</div>
121165
<div class="nhsuk-task-list__status" id="supervisor-roles-status">
122-
<strong class="nhsuk-tag nhsuk-tag--green">
123-
Complete
124-
</strong>
166+
<partial name="Shared/_TaskStatusTag" model="@Model.CompetencyAssessmentTaskStatus.SupervisorRolesTaskStatus" />
125167
</div>
126168
</li>
127169
<li class="nhsuk-task-list__item nhsuk-task-list__item--with-link">
128170
<div class="nhsuk-task-list__name-and-hint" aria-describedby="configuration-status">
129-
<a class="nhsuk-link nhsuk-task-list__link" href="/paper-transfer/learner/paper-assessment-information">
171+
<a class="nhsuk-link nhsuk-task-list__link" asp-action="ConfigureOptions" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
130172
Configure navigation options and labels
131173
</a>
132174
</div>
133175
<div class="nhsuk-task-list__status" id="configuration-status">
134-
<strong class="nhsuk-tag nhsuk-tag--green">
135-
Complete
136-
</strong>
176+
<partial name="Shared/_TaskStatusTag" model="@Model.CompetencyAssessmentTaskStatus.SelfAssessmentOptionsTaskStatus" />
137177
</div>
138178
</li>
139179
<li class="nhsuk-task-list__item">
140-
<div class="nhsuk-task-list__name-and-hint" aria-describedby="review-status">
141-
<div>
142-
Send for review
180+
181+
@if (Model.CompetencyAssessmentTaskStatus.IntroductoryTextTaskStatus != true ||
182+
Model.CompetencyAssessmentTaskStatus.BrandingTaskStatus != true ||
183+
Model.CompetencyAssessmentTaskStatus.VocabularyTaskStatus != true ||
184+
Model.CompetencyAssessmentTaskStatus.WorkingGroupTaskStatus != true ||
185+
Model.CompetencyAssessmentTaskStatus.NationalRoleProfileTaskStatus != true ||
186+
Model.CompetencyAssessmentTaskStatus.FrameworkLinksTaskStatus != true ||
187+
Model.CompetencyAssessmentTaskStatus.SelectCompetenciesTaskStatus != true ||
188+
Model.CompetencyAssessmentTaskStatus.OptionalCompetenciesTaskStatus != true ||
189+
Model.CompetencyAssessmentTaskStatus.RoleRequirementsTaskStatus != true ||
190+
Model.CompetencyAssessmentTaskStatus.SupervisorRolesTaskStatus != true ||
191+
Model.CompetencyAssessmentTaskStatus.SelfAssessmentOptionsTaskStatus != true)
192+
{
193+
<div class="nhsuk-task-list__name-and-hint" aria-describedby="review-status">
194+
<div>
195+
Send for review
196+
</div>
143197
</div>
144-
</div>
145-
<div class="nhsuk-task-list__status nhsuk-task-list__status--cannot-start-yet" id="review-status">
146-
Cannot start yet
147-
</div>
198+
<div class="nhsuk-task-list__status nhsuk-task-list__status--cannot-start-yet" id="review-status">
199+
Cannot start yet
200+
</div>
201+
}
202+
else
203+
{
204+
<div class="nhsuk-task-list__name-and-hint" aria-describedby="review-status">
205+
<a class="nhsuk-link nhsuk-task-list__link" asp-action="SendForReview" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
206+
Send for review
207+
</a>
208+
</div>
209+
<div class="nhsuk-task-list__status" id="review-status">
210+
<partial name="Shared/_TaskStatusTag" model="@Model.CompetencyAssessmentTaskStatus.RoleRequirementsTaskStatus" />
211+
</div>
212+
}
148213
</li>
149214
</ul>
150215
</div>

‎DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_TaskStatusTag.cshtml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
@model bool?
2+
3+
@if (Model == null)
4+
{
5+
<strong class="nhsuk-tag nhsuk-tag--blue">
6+
Not yet started
7+
</strong>
8+
}
9+
else if (Model == false)
10+
{
11+
<strong class="nhsuk-tag nhsuk-tag--white">
12+
In progress
13+
</strong>
14+
}
15+
else
16+
{
17+
<strong class="nhsuk-tag nhsuk-tag--green">
18+
Complete
19+
</strong>
20+
}

0 commit comments

Comments
 (0)