Skip to content

Commit 839cd64

Browse files
rshrirohitrshrirohit
authored
Merge pull request #2800 from TechnologyEnhancedLearning/Develop/Fixes/TD-4384-IssueWithBackLinks
TD-4384, changes to fix the issue with the Back Links on the User Feedback Component
2 parents e6d78cf + 04e712b commit 839cd64

File tree

5 files changed

+48
-74
lines changed

5 files changed

+48
-74
lines changed

‎DigitalLearningSolutions.Web/Controllers/UserFeedbackController.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ public IActionResult UserFeedbackTaskAttempted(UserFeedbackViewModel userFeedbac
198198
{
199199
ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] = true;
200200

201+
//set the source URL to the sequentially previous page route which is Task Achieved
202+
userFeedbackViewModel.SourceUrl ??= "/UserFeedbackTaskAchieved";
201203
userFeedbackViewModel = MapMultiformDataToViewModel(userFeedbackViewModel);
202204

203205
return View("UserFeedbackTaskAttempted", userFeedbackViewModel);
@@ -247,6 +249,9 @@ public IActionResult UserFeedbackTaskDifficulty(UserFeedbackViewModel userFeedba
247249
)]
248250
public IActionResult UserFeedbackTaskDifficultySet(UserFeedbackViewModel userFeedbackViewModel)
249251
{
252+
//set the SourceURL to blank so we can retrieve the original sourceURL whether current/completed/available
253+
userFeedbackViewModel.SourceUrl = null;
254+
250255
userFeedbackViewModel = MapMultiformDataToViewModel(userFeedbackViewModel);
251256

252257
SaveMultiPageFormData(userFeedbackViewModel);
@@ -277,7 +282,6 @@ public IActionResult UserFeedbackSave(UserFeedbackViewModel userFeedbackViewMode
277282

278283
transaction.Complete();
279284

280-
userFeedbackViewModel.SourceUrl = data.SourceUrl;
281285

282286
return RedirectToAction("UserFeedbackComplete", userFeedbackViewModel);
283287
}

‎DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackComplete.cshtml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,7 @@
1313
<div class="nhsuk-width-container">
1414
<ol class="nhsuk-breadcrumb__list">
1515
<li class="nhsuk-breadcrumb__item">
16-
<a class="nhsuk-breadcrumb__link trigger-loader" href="@Model.SourceUrl">
17-
@if (Model.SourcePageTitle != String.Empty)
18-
{
19-
<div><partial name="_NhsChevronLeft" /> Go back to @Model.SourcePageTitle</div>
20-
}
21-
@if (Model.SourcePageTitle == String.Empty)
22-
{
23-
<div><partial name="_NhsChevronLeft" /> Go back</div>
24-
}
25-
</a>
16+
@* no link required in the Thank You For The Feedback page*@
2617
</li>
2718
</ol>
2819
<p class="nhsuk-breadcrumb__back">

‎DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAchieved.cshtml‎

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
<a class="nhsuk-breadcrumb__link trigger-loader" href="@Model.SourceUrl">
1717
@if (Model.SourcePageTitle != String.Empty)
1818
{
19-
<div>&lt Go back to @Model.SourcePageTitle</div>
19+
<div><partial name="_NhsChevronLeft" />Go back to @Model.SourcePageTitle</div>
2020
}
2121
@if (Model.SourcePageTitle == String.Empty)
2222
{
23-
<div>&lt Go back</div>
23+
<div><partial name="_NhsChevronLeft" />Go back</div>
2424
}
2525
</a>
2626
</li>
@@ -51,45 +51,44 @@
5151

5252
<p class="nhsuk-body-l">Step 1 of 4</p>
5353

54-
<form method="post" asp-action="UserFeedbackTaskAchievedSet">
55-
<input type="hidden" asp-for="SourceUrl" value="@Model.SourceUrl" />
56-
<input type="hidden" asp-for="SourcePageTitle" value="@Model.SourcePageTitle" />
57-
<div class="nhsuk-hint" id="task-achieve-hint">
58-
Did you achieve everything you came to do today?
54+
<form method="post" asp-action="UserFeedbackTaskAchievedSet">
55+
<input type="hidden" asp-for="SourceUrl" value="@Context.Request.Path" /> @* changing the value of source URL to the current route *@
56+
<input type="hidden" asp-for="SourcePageTitle" value="@Model.SourcePageTitle" />
57+
<div class="nhsuk-hint" id="task-achieve-hint">
58+
Did you achieve everything you came to do today?
59+
</div>
60+
<fieldset class="nhsuk-fieldset" id="feedback-achieved-form" aria-describedby="task-achieve-hint">
61+
<div class="nhsuk-u-margin-bottom-6">
62+
<div class="nhsuk-radios__item">
63+
<input class="nhsuk-radios__input"
64+
id="feedback-achieved-yes"
65+
asp-for="TaskAchieved"
66+
type="radio"
67+
value="true">
68+
<label class="nhsuk-label nhsuk-radios__label" for="feedback-achieved-yes">
69+
Yes
70+
</label>
5971
</div>
60-
<fieldset class="nhsuk-fieldset" id="feedback-achieved-form" aria-describedby="task-achieve-hint">
61-
<div class="nhsuk-u-margin-bottom-6">
62-
<div class="nhsuk-radios__item">
63-
<input class="nhsuk-radios__input"
64-
id="feedback-achieved-yes"
65-
asp-for="TaskAchieved"
66-
type="radio"
67-
value="true">
68-
<label class="nhsuk-label nhsuk-radios__label" for="feedback-achieved-yes">
69-
Yes
70-
</label>
71-
</div>
72-
<div class="nhsuk-radios__item">
73-
<input class="nhsuk-radios__input"
74-
id="feedback-achieved-no"
75-
asp-for="TaskAchieved"
76-
type="radio"
77-
value="false" />
78-
<label class="nhsuk-label nhsuk-radios__label" for="feedback-achieved-no">
79-
No
80-
</label>
81-
</div>
82-
</div>
83-
</fieldset>
84-
<div class="nhsuk-u-float-right">
85-
<button class="nhsuk-button" type="submit">
86-
Continue
87-
<span class="feedback-chevron">
88-
<partial name="_NhsChevronRightOffset" class="feedback-chevron" />
89-
</span>
90-
</button>
72+
<div class="nhsuk-radios__item">
73+
<input class="nhsuk-radios__input"
74+
id="feedback-achieved-no"
75+
asp-for="TaskAchieved"
76+
type="radio"
77+
value="false" />
78+
<label class="nhsuk-label nhsuk-radios__label" for="feedback-achieved-no">
79+
No
80+
</label>
9181
</div>
92-
</form>
82+
</div>
83+
</fieldset>
84+
<div class="nhsuk-u-float-right">
85+
<button class="nhsuk-button" type="submit">Continue
86+
<span class="feedback-chevron">
87+
<partial name="_NhsChevronRightOffset" class="feedback-chevron" />
88+
</span>
89+
</button>
90+
</div>
91+
</form>
9392
</div>
9493
</div>
9594

‎DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAttempted.cshtml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,10 @@
1414
<ol class="nhsuk-breadcrumb__list">
1515
<li class="nhsuk-breadcrumb__item">
1616
<a class="nhsuk-breadcrumb__link trigger-loader" href="@Model.SourceUrl">
17-
@if (Model.SourcePageTitle != String.Empty)
18-
{
19-
<div>&lt Go back to @Model.SourcePageTitle</div>
20-
}
21-
@if (Model.SourcePageTitle == String.Empty)
22-
{
23-
<div>&lt Go back</div>
24-
}
17+
<div><partial name="_NhsChevronLeft" />Go back</div>
2518
</a>
2619
</li>
2720
</ol>
28-
<p class="nhsuk-breadcrumb__back">
29-
<a class="nhsuk-breadcrumb__link" href="@Model.SourceUrl">Go back to @Model.SourcePageTitle</a>
30-
</p>
3121
</div>
3222
</nav>
3323
}
@@ -39,7 +29,7 @@
3929
</div>
4030
<div class="nhsuk-grid-column-two-thirds">
4131
<form method="post" asp-action="UserFeedbackTaskAttemptedSet">
42-
<input type="hidden" asp-for="SourceUrl" value="@Model.SourceUrl" />
32+
<input type="hidden" asp-for="SourceUrl" value="@Context.Request.Path" />
4333
<input type="hidden" asp-for="SourcePageTitle" value="@Model.SourcePageTitle" />
4434

4535
<p class="nhsuk-body-l">Step 2 of 4</p>

‎DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskDifficulty.cshtml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,10 @@
1414
<ol class="nhsuk-breadcrumb__list">
1515
<li class="nhsuk-breadcrumb__item">
1616
<a class="nhsuk-breadcrumb__link trigger-loader" href="@Model.SourceUrl">
17-
@if (Model.SourcePageTitle != String.Empty)
18-
{
19-
<div><partial name="_NhsChevronLeft" /> Go back to @Model.SourcePageTitle</div>
20-
}
21-
@if (Model.SourcePageTitle == String.Empty)
22-
{
23-
<div><partial name="_NhsChevronLeft" /> Go back</div>
24-
}
17+
<div><partial name="_NhsChevronLeft" />Go back</div>
2518
</a>
2619
</li>
2720
</ol>
28-
<p class="nhsuk-breadcrumb__back">
29-
<a class="nhsuk-breadcrumb__link" href="@Model.SourceUrl">Go back to @Model.SourcePageTitle</a>
30-
</p>
3121
</div>
3222
</nav>
3323
}
@@ -41,7 +31,7 @@
4131
<p class="nhsuk-body-l">Step 3 of 4</p>
4232

4333
<form method="post" asp-action="UserFeedbackTaskDifficultySet">
44-
<input type="hidden" asp-for="SourceUrl" value="@Model.SourceUrl" />
34+
<input type="hidden" asp-for="SourceUrl" value="@Context.Request.Path" />
4535
<input type="hidden" asp-for="SourcePageTitle" value="@Model.SourcePageTitle" />
4636

4737
<div class="nhsuk-hint" id="feedback-difficulty-hint">

0 commit comments

Comments
 (0)