Skip to content

Commit 6cef817

Browse files
MrKevJoyMrKevJoy
authored
Add person content changes (#2830)
### Context https://trello.com/c/DPypyG60/1925-content-design-updates-updates-to-the-check-details-pages-across-support-tasks **Create a record content changes** - change Check details and create record’ H1 to ‘Check details before creating record’ - Add ‘Why are you creating this record?’ H2 - change ‘Reason for creating record’ label to ‘Reason’ - change ‘Reason details' to ‘Additional information’ - Remove Summary card. ### Checklist - [x] Attach to Trello card - [x] Rebased master - [x] Cleaned commit history - [x] Tested by running locally
1 parent 8e5ba0d commit 6cef817

File tree

2 files changed

+81
-82
lines changed

2 files changed

+81
-82
lines changed

‎TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Persons/AddPerson/CheckAnswers.cshtml‎

Lines changed: 77 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@model TeachingRecordSystem.SupportUi.Pages.Persons.AddPerson.CheckAnswersModel
33
@{
44
Layout = "_Layout";
5-
ViewBag.Title = "Check details and create record";
5+
ViewBag.Title = "Check details before creating record";
66
}
77

88
@section BeforeContent {
@@ -15,84 +15,83 @@
1515
<span class="govuk-caption-l" data-testid="edit-details-caption">Create a record</span>
1616
<h1 class="govuk-heading-l">@ViewBag.Title</h1>
1717

18-
<govuk-summary-card>
19-
<govuk-summary-card-title>Personal details</govuk-summary-card-title>
20-
<govuk-summary-list>
21-
<govuk-summary-list-row>
22-
<govuk-summary-list-row-key>Full name</govuk-summary-list-row-key>
23-
<govuk-summary-list-row-value>@Model.Name</govuk-summary-list-row-value>
24-
<govuk-summary-list-row-actions>
25-
<govuk-summary-list-row-action data-testid="change-details-link" href=@Model.ChangePersonalDetailsLink visually-hidden-text="name">Change</govuk-summary-list-row-action>
26-
</govuk-summary-list-row-actions>
27-
</govuk-summary-list-row>
28-
<govuk-summary-list-row>
29-
<govuk-summary-list-row-key>Date of birth</govuk-summary-list-row-key>
30-
<govuk-summary-list-row-value use-empty-fallback>@Model.DateOfBirth?.ToString(UiDefaults.DateOnlyDisplayFormat)</govuk-summary-list-row-value>
31-
<govuk-summary-list-row-actions>
32-
<govuk-summary-list-row-action href=@Model.ChangePersonalDetailsLink visually-hidden-text="date of birth">Change</govuk-summary-list-row-action>
33-
</govuk-summary-list-row-actions>
34-
</govuk-summary-list-row>
35-
<govuk-summary-list-row>
36-
<govuk-summary-list-row-key>Email address</govuk-summary-list-row-key>
37-
<govuk-summary-list-row-value use-empty-fallback>@Model.EmailAddress?.ToDisplayString()</govuk-summary-list-row-value>
38-
<govuk-summary-list-row-actions>
39-
<govuk-summary-list-row-action href=@Model.ChangePersonalDetailsLink visually-hidden-text="email address">Change</govuk-summary-list-row-action>
40-
</govuk-summary-list-row-actions>
41-
</govuk-summary-list-row>
42-
<govuk-summary-list-row>
43-
<govuk-summary-list-row-key>National Insurance number</govuk-summary-list-row-key>
44-
<govuk-summary-list-row-value use-empty-fallback>@Model.NationalInsuranceNumber?.ToDisplayString()</govuk-summary-list-row-value>
45-
<govuk-summary-list-row-actions>
46-
<govuk-summary-list-row-action href=@Model.ChangePersonalDetailsLink visually-hidden-text="National Insurance number">Change</govuk-summary-list-row-action>
47-
</govuk-summary-list-row-actions>
48-
</govuk-summary-list-row>
49-
<govuk-summary-list-row>
50-
<govuk-summary-list-row-key>Gender</govuk-summary-list-row-key>
51-
<govuk-summary-list-row-value use-empty-fallback>@Model.Gender?.GetDisplayName()</govuk-summary-list-row-value>
52-
<govuk-summary-list-row-actions>
53-
<govuk-summary-list-row-action href=@Model.ChangePersonalDetailsLink visually-hidden-text="gender">Change</govuk-summary-list-row-action>
54-
</govuk-summary-list-row-actions>
55-
</govuk-summary-list-row>
56-
</govuk-summary-list>
57-
</govuk-summary-card>
5818

59-
<govuk-summary-card>
60-
<govuk-summary-card-title>Why are you creating this record?</govuk-summary-card-title>
61-
<govuk-summary-list>
62-
<govuk-summary-list-row>
63-
<govuk-summary-list-row-key>Reason for creating record</govuk-summary-list-row-key>
64-
<govuk-summary-list-row-value>@Model.Reason?.GetDisplayName()</govuk-summary-list-row-value>
65-
<govuk-summary-list-row-actions>
66-
<govuk-summary-list-row-action data-testid="change-create-reason-link" href=@Model.ChangeReasonLink visually-hidden-text="reason">Change</govuk-summary-list-row-action>
67-
</govuk-summary-list-row-actions>
68-
</govuk-summary-list-row>
69-
<govuk-summary-list-row>
70-
<govuk-summary-list-row-key>Reason details</govuk-summary-list-row-key>
71-
<govuk-summary-list-row-value>
72-
@if (Model.ReasonDetail is not null)
73-
{
74-
@Html.ConvertNewlinesToLineBreaks(Model.ReasonDetail)
75-
}
76-
else
77-
{
78-
<span use-empty-fallback></span>
79-
}
80-
</govuk-summary-list-row-value>
81-
<govuk-summary-list-row-actions>
82-
<govuk-summary-list-row-action href=@Model.ChangeReasonLink visually-hidden-text="reason details">Change</govuk-summary-list-row-action>
83-
</govuk-summary-list-row-actions>
84-
</govuk-summary-list-row>
85-
<govuk-summary-list-row>
86-
<govuk-summary-list-row-key>Evidence</govuk-summary-list-row-key>
87-
<govuk-summary-list-row-value>
88-
<vc:evidence-file-link evidence-file="@Model.EvidenceFile" />
89-
</govuk-summary-list-row-value>
90-
<govuk-summary-list-row-actions>
91-
<govuk-summary-list-row-action href=@Model.ChangeReasonLink visually-hidden-text="evidence">Change</govuk-summary-list-row-action>
92-
</govuk-summary-list-row-actions>
93-
</govuk-summary-list-row>
94-
</govuk-summary-list>
95-
</govuk-summary-card>
19+
20+
<govuk-summary-list>
21+
<govuk-summary-list-row>
22+
<govuk-summary-list-row-key>Full name</govuk-summary-list-row-key>
23+
<govuk-summary-list-row-value>@Model.Name</govuk-summary-list-row-value>
24+
<govuk-summary-list-row-actions>
25+
<govuk-summary-list-row-action data-testid="change-details-link" href=@Model.ChangePersonalDetailsLink visually-hidden-text="name">Change</govuk-summary-list-row-action>
26+
</govuk-summary-list-row-actions>
27+
</govuk-summary-list-row>
28+
<govuk-summary-list-row>
29+
<govuk-summary-list-row-key>Date of birth</govuk-summary-list-row-key>
30+
<govuk-summary-list-row-value use-empty-fallback>@Model.DateOfBirth?.ToString(UiDefaults.DateOnlyDisplayFormat)</govuk-summary-list-row-value>
31+
<govuk-summary-list-row-actions>
32+
<govuk-summary-list-row-action href=@Model.ChangePersonalDetailsLink visually-hidden-text="date of birth">Change</govuk-summary-list-row-action>
33+
</govuk-summary-list-row-actions>
34+
</govuk-summary-list-row>
35+
<govuk-summary-list-row>
36+
<govuk-summary-list-row-key>Email address</govuk-summary-list-row-key>
37+
<govuk-summary-list-row-value use-empty-fallback>@Model.EmailAddress?.ToDisplayString()</govuk-summary-list-row-value>
38+
<govuk-summary-list-row-actions>
39+
<govuk-summary-list-row-action href=@Model.ChangePersonalDetailsLink visually-hidden-text="email address">Change</govuk-summary-list-row-action>
40+
</govuk-summary-list-row-actions>
41+
</govuk-summary-list-row>
42+
<govuk-summary-list-row>
43+
<govuk-summary-list-row-key>National Insurance number</govuk-summary-list-row-key>
44+
<govuk-summary-list-row-value use-empty-fallback>@Model.NationalInsuranceNumber?.ToDisplayString()</govuk-summary-list-row-value>
45+
<govuk-summary-list-row-actions>
46+
<govuk-summary-list-row-action href=@Model.ChangePersonalDetailsLink visually-hidden-text="National Insurance number">Change</govuk-summary-list-row-action>
47+
</govuk-summary-list-row-actions>
48+
</govuk-summary-list-row>
49+
<govuk-summary-list-row>
50+
<govuk-summary-list-row-key>Gender</govuk-summary-list-row-key>
51+
<govuk-summary-list-row-value use-empty-fallback>@Model.Gender?.GetDisplayName()</govuk-summary-list-row-value>
52+
<govuk-summary-list-row-actions>
53+
<govuk-summary-list-row-action href=@Model.ChangePersonalDetailsLink visually-hidden-text="gender">Change</govuk-summary-list-row-action>
54+
</govuk-summary-list-row-actions>
55+
</govuk-summary-list-row>
56+
57+
</govuk-summary-list>
58+
59+
<h2 class="govuk-heading-m">Why are you creating this record?</h2>
60+
<govuk-summary-list>
61+
<govuk-summary-list-row>
62+
<govuk-summary-list-row-key>Reason</govuk-summary-list-row-key>
63+
<govuk-summary-list-row-value>@Model.Reason?.GetDisplayName()</govuk-summary-list-row-value>
64+
<govuk-summary-list-row-actions>
65+
<govuk-summary-list-row-action data-testid="change-create-reason-link" href=@Model.ChangeReasonLink visually-hidden-text="reason">Change</govuk-summary-list-row-action>
66+
</govuk-summary-list-row-actions>
67+
</govuk-summary-list-row>
68+
<govuk-summary-list-row>
69+
<govuk-summary-list-row-key>Additional information</govuk-summary-list-row-key>
70+
<govuk-summary-list-row-value>
71+
@if (Model.ReasonDetail is not null)
72+
{
73+
@Html.ConvertNewlinesToLineBreaks(Model.ReasonDetail)
74+
}
75+
else
76+
{
77+
<span use-empty-fallback></span>
78+
}
79+
</govuk-summary-list-row-value>
80+
<govuk-summary-list-row-actions>
81+
<govuk-summary-list-row-action href=@Model.ChangeReasonLink visually-hidden-text="reason details">Change</govuk-summary-list-row-action>
82+
</govuk-summary-list-row-actions>
83+
</govuk-summary-list-row>
84+
<govuk-summary-list-row>
85+
<govuk-summary-list-row-key>Evidence</govuk-summary-list-row-key>
86+
<govuk-summary-list-row-value>
87+
<vc:evidence-file-link evidence-file="@Model.EvidenceFile" />
88+
</govuk-summary-list-row-value>
89+
<govuk-summary-list-row-actions>
90+
<govuk-summary-list-row-action href=@Model.ChangeReasonLink visually-hidden-text="evidence">Change</govuk-summary-list-row-action>
91+
</govuk-summary-list-row-actions>
92+
</govuk-summary-list-row>
93+
</govuk-summary-list>
94+
9695

9796
<div class="govuk-button-group">
9897
<govuk-button type="submit" data-testid="confirm-button">Confirm and create record</govuk-button>

‎TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/PageTests/Persons/AddPerson/CheckAnswersTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ public async Task Get_ShowsCreateReasonAndEvidenceFile_AsExpected()
118118
// Assert
119119
var doc = await AssertEx.HtmlResponseAsync(response);
120120

121-
doc.AssertSummaryListRowValue("Reason for creating record", v => Assert.Equal("Another reason", v.TrimmedText()));
122-
doc.AssertSummaryListRowValue("Reason details", v => Assert.Equal(ChangeReasonDetails, v.TrimmedText()));
121+
doc.AssertSummaryListRowValue("Reason", v => Assert.Equal("Another reason", v.TrimmedText()));
122+
doc.AssertSummaryListRowValue("Additional information", v => Assert.Equal(ChangeReasonDetails, v.TrimmedText()));
123123
var urlEncoder = UrlEncoder.Default;
124124
var expectedBlobStorageFileUrl = urlEncoder.Encode($"{TestScopedServices.FakeBlobStorageFileUrlBase}{evidenceFileId}");
125125
var expectedFileUrl = $"http://localhost/files/evidence.pdf?fileUrl={expectedBlobStorageFileUrl}";
@@ -153,8 +153,8 @@ public async Task Get_WhenMissingAdditionalDetailAndEvidenceFile_ShowsAsNotProvi
153153
// Assert
154154
var doc = await AssertEx.HtmlResponseAsync(response);
155155

156-
doc.AssertSummaryListRowValue("Reason for creating record", v => Assert.Equal("They were awarded a mandatory qualification", v.TrimmedText()));
157-
doc.AssertSummaryListRowValue("Reason details", v => Assert.Equal("Not provided", v.TrimmedText()));
156+
doc.AssertSummaryListRowValue("Reason", v => Assert.Equal("They were awarded a mandatory qualification", v.TrimmedText()));
157+
doc.AssertSummaryListRowValue("Additional information", v => Assert.Equal("Not provided", v.TrimmedText()));
158158
doc.AssertSummaryListRowValues("Evidence", v => Assert.Equal("Not provided", v.TrimmedText()));
159159
}
160160

0 commit comments

Comments
 (0)