Skip to content

Commit 86f7f05

Browse files
jack-nimbleapproachjack-nimbleapproach
authored
Added IDs to tasks and fields (#33)
* Added IDs to tasks and fields
1 parent 21826a1 commit 86f7f05

5 files changed

Lines changed: 28 additions & 16 deletions

File tree

‎src/DfE.ExternalApplications.Web/Pages/Applications/ApplicationPreview.cshtml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,16 @@
2626
{
2727
@foreach (var task in group.Tasks.OrderBy(t => t.TaskOrder))
2828
{
29-
<div class="govuk-summary-card govuk-!-margin-bottom-6">
29+
var taskNameHyphenated = task.TaskName.Replace(" ", "-").ToLower();
30+
31+
<div class="govuk-summary-card govuk-!-margin-bottom-6" id="task-@taskNameHyphenated-summary">
3032
<div class="govuk-summary-card__title-wrapper">
3133
<h2 class="govuk-summary-card__title">@task.TaskName</h2>
3234
@if (Model.IsApplicationEditable())
3335
{
3436
<ul class="govuk-summary-card__actions">
3537
<li class="govuk-summary-card__action">
36-
<a class="govuk-link" href="/applications/@Model.ReferenceNumber/@task.TaskId/summary">
38+
<a class="govuk-link" href="/applications/@Model.ReferenceNumber/@task.TaskId/summary" id="task-@taskNameHyphenated-change-link">
3739
Change<span class="govuk-visually-hidden"> @task.TaskName</span>
3840
</a>
3941
</li>

‎src/DfE.ExternalApplications.Web/Pages/Applications/Contributors-Invite.cshtml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,12 @@
8787
</div>
8888

8989
<div class="govuk-button-group">
90-
<button class="govuk-button" data-module="govuk-button" type="submit">
90+
<button id="send-email-invite" class="govuk-button" data-module="govuk-button" type="submit">
9191
Send email invite
9292
</button>
9393

94-
<button class="govuk-button govuk-button--secondary"
94+
<button class="govuk-button govuk-button--secondary"
95+
id="cancel"
9596
data-module="govuk-button"
9697
type="submit"
9798
asp-page-handler="Cancel"

‎src/DfE.ExternalApplications.Web/Pages/Applications/Contributors.cshtml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040

4141
<div class="govuk-button-group">
4242
<form method="post">
43-
<button class="govuk-button" type="submit" asp-page-handler="AddContributor" data-module="govuk-button">
43+
<button id="add-a-contributor" class="govuk-button" type="submit" asp-page-handler="AddContributor" data-module="govuk-button">
4444
Add a contributor
4545
</button>
4646
</form>
4747

4848
<form method="post">
49-
<button class="govuk-button govuk-button--secondary" type="submit" asp-page-handler="ProceedToForm" data-module="govuk-button">
49+
<button id="proceed-to-application-form" class="govuk-button govuk-button--secondary" type="submit" asp-page-handler="ProceedToForm" data-module="govuk-button">
5050
Proceed to the application form
5151
</button>
5252
</form>
@@ -65,20 +65,22 @@
6565
</tr>
6666
</thead>
6767
<tbody class="govuk-table__body">
68-
<tr class="govuk-table__row">
68+
<tr class="govuk-table__row" id="contributor-1">
6969
<td class="govuk-table__cell">@leadApplicantEmail</td>
7070
<td class="govuk-table__cell">@leadApplicantName</td>
7171
<td class="govuk-table__cell"></td>
7272
</tr>
73-
@foreach (var contributor in Model.Contributors)
73+
@foreach (var (contributor, index) in Model.Contributors.Select((contributor, index) => (contributor, index)))
7474
{
75-
<tr class="govuk-table__row">
75+
var contributorIndex = index + 2; //zero index so adding 2 so the lead applicant can start from 1
76+
<tr class="govuk-table__row" id="contributor-@contributorIndex">
7677
<td class="govuk-table__cell">@contributor.Email</td>
7778
<td class="govuk-table__cell">@contributor.Name</td>
7879
<td class="govuk-table__cell">
7980
<form method="post" style="display: inline;">
8081
<input type="hidden" name="contributorId" value="@contributor.UserId" />
81-
<button type="submit"
82+
<button type="submit"
83+
id="remove-contributor-@contributorIndex"
8284
asp-page-handler="RemoveContributor"
8385
class="govuk-button govuk-button--warning govuk-button--small"
8486
data-module="govuk-button"

‎src/DfE.ExternalApplications.Web/Pages/Applications/TaskSummary.cshtml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,25 @@
1818
var hasValue = Model.HasFieldValue(field.FieldId);
1919
var changeUrl = $"/applications/{Model.ReferenceNumber}/{page.PageId}";
2020

21+
var fieldIdHyphenated = field.FieldId.Replace(" ", "-").ToLower();
22+
2123
if ((field.Type == "autocomplete" || field.Type == "complexField") && hasValue)
2224
{
2325
// Handle multiple autocomplete/complex field values as separate rows
2426
var formattedValues = Model.GetFormattedFieldValues(field.FieldId);
2527
var itemLabel = Model.GetFieldItemLabel(field.FieldId);
2628
var allowMultiple = Model.IsFieldAllowMultiple(field.FieldId);
29+
30+
var itemLabelHyphenated = itemLabel.Replace(" ", "-").ToLower();
2731

2832
for (int i = 0; i < formattedValues.Count; i++)
2933
{
30-
<div class="govuk-summary-list__row">
34+
var fieldIndex = i + 1;
35+
<div class="govuk-summary-list__row" id="field-@itemLabelHyphenated-@fieldIndex">
3136
<dt class="govuk-summary-list__key">
3237
@if (allowMultiple)
3338
{
34-
@($"{itemLabel} {i + 1}")
39+
@($"{itemLabel} {fieldIndex}")
3540
}
3641
else
3742
{
@@ -44,7 +49,7 @@
4449
<dd class="govuk-summary-list__actions">
4550
@if (Model.IsApplicationEditable() && i == 0)
4651
{
47-
<a class="govuk-link" href="@changeUrl">
52+
<a class="govuk-link" href="@changeUrl" id="field-@fieldIdHyphenated-change-link">
4853
Change<span class="govuk-visually-hidden"> @field.Label.Value</span>
4954
</a>
5055
}
@@ -54,7 +59,7 @@
5459
}
5560
else
5661
{
57-
<div class="govuk-summary-list__row">
62+
<div class="govuk-summary-list__row" id="field-@fieldIdHyphenated">
5863
<dt class="govuk-summary-list__key">
5964
@field.Label.Value
6065
</dt>

‎src/DfE.ExternalApplications.Web/Pages/FormEngine/RenderForm.cshtml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ else
8989
var statusClass = Model.GetTaskStatusDisplayClass(currentTaskStatus);
9090
var statusText = Model.GetTaskStatusDisplayText(currentTaskStatus);
9191

92-
<li class="govuk-task-list__item govuk-task-list__item--with-link">
92+
var taskNameHyphenated = task.TaskName.Replace(" ", "-").ToLower();
93+
94+
<li class="govuk-task-list__item govuk-task-list__item--with-link" id="task-@taskNameHyphenated">
9395
<div class="govuk-task-list__name-and-hint">
9496
@if (Model.IsApplicationEditable())
9597
{
@@ -138,7 +140,7 @@ else
138140

139141
@if (Model.IsApplicationEditable())
140142
{
141-
<a href="/applications/@Model.ReferenceNumber/contributors" class="govuk-button govuk-button--secondary" role="button">
143+
<a href="/applications/@Model.ReferenceNumber/contributors" id="invite-contributors" class="govuk-button govuk-button--secondary" role="button">
142144
Invite contributors
143145
</a>
144146
}

0 commit comments

Comments
 (0)