Skip to content

TD-4384 Correction for test failed #2841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2024
Merged

TD-4384 Correction for test failed #2841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions DigitalLearningSolutions.Web/Controllers/UserFeedbackController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ IMultiPageFormService multiPageFormService
this._userFeedbackService = userFeedbackService;
this._multiPageFormService = multiPageFormService;
this._userFeedbackViewModel = new UserFeedbackViewModel();
this.config = config;
this.config = config;
}

[Route("/Index")]
public IActionResult Index(string sourceUrl, string sourcePageTitle)
{
ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] = true;
_multiPageFormService.ClearMultiPageFormData(MultiPageFormDataFeature.AddUserFeedback, TempData);

_userFeedbackViewModel = new()
{
UserId = User.GetUserId(),
Expand All @@ -51,13 +51,13 @@ public IActionResult Index(string sourceUrl, string sourcePageTitle)
TaskRating = null,
};

if(sourcePageTitle == "Digital Learning Solutions - Page no longer available")
if (sourcePageTitle == "Digital Learning Solutions - Page no longer available")
{
var url = ContentUrlHelper.ReplaceUrlSegment(sourceUrl);
_userFeedbackViewModel.SourceUrl = url;
_userFeedbackViewModel.SourceUrl = url;
_userFeedbackViewModel.SourcePageTitle = "Welcome";
}

if (_userFeedbackViewModel.UserId == null || _userFeedbackViewModel.UserId == 0)
{
return GuestFeedbackStart(_userFeedbackViewModel);
Expand Down Expand Up @@ -198,8 +198,6 @@ public IActionResult UserFeedbackTaskAttempted(UserFeedbackViewModel userFeedbac
{
ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] = true;

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

return View("UserFeedbackTaskAttempted", userFeedbackViewModel);
Expand Down
74 changes: 38 additions & 36 deletions DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAchieved.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@using DigitalLearningSolutions.Web.ViewModels.UserFeedback
@using Microsoft.AspNetCore.Http.Extensions
@using Microsoft.AspNetCore.Mvc.TagHelpers

@model UserFeedbackViewModel;
Expand Down Expand Up @@ -51,44 +52,45 @@

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

<form method="post" asp-action="UserFeedbackTaskAchievedSet">
<input type="hidden" asp-for="SourceUrl" value="@Context.Request.Path" /> @* changing the value of source URL to the current route *@
<input type="hidden" asp-for="SourcePageTitle" value="@Model.SourcePageTitle" />
<div class="nhsuk-hint" id="task-achieve-hint">
Did you achieve everything you came to do today?
</div>
<fieldset class="nhsuk-fieldset" id="feedback-achieved-form" aria-describedby="task-achieve-hint">
<div class="nhsuk-u-margin-bottom-6">
<div class="nhsuk-radios__item">
<input class="nhsuk-radios__input"
id="feedback-achieved-yes"
asp-for="TaskAchieved"
type="radio"
value="true">
<label class="nhsuk-label nhsuk-radios__label" for="feedback-achieved-yes">
Yes
</label>
<form method="post" asp-action="UserFeedbackTaskAchievedSet">
<input type="hidden" asp-for="SourceUrl" value="@Context.Request.GetDisplayUrl()" /> @* changing the value of source URL to the current route *@
<input type="hidden" asp-for="SourcePageTitle" value="@Model.SourcePageTitle" />
<div class="nhsuk-hint" id="task-achieve-hint">
Did you achieve everything you came to do today?
</div>
<div class="nhsuk-radios__item">
<input class="nhsuk-radios__input"
id="feedback-achieved-no"
asp-for="TaskAchieved"
type="radio"
value="false" />
<label class="nhsuk-label nhsuk-radios__label" for="feedback-achieved-no">
No
</label>
<fieldset class="nhsuk-fieldset" id="feedback-achieved-form" aria-describedby="task-achieve-hint">
<div class="nhsuk-u-margin-bottom-6">
<div class="nhsuk-radios__item">
<input class="nhsuk-radios__input"
id="feedback-achieved-yes"
asp-for="TaskAchieved"
type="radio"
value="true">
<label class="nhsuk-label nhsuk-radios__label" for="feedback-achieved-yes">
Yes
</label>
</div>
<div class="nhsuk-radios__item">
<input class="nhsuk-radios__input"
id="feedback-achieved-no"
asp-for="TaskAchieved"
type="radio"
value="false" />
<label class="nhsuk-label nhsuk-radios__label" for="feedback-achieved-no">
No
</label>
</div>
</div>
</fieldset>
<div class="nhsuk-u-float-right">
<button class="nhsuk-button" type="submit">
Continue
<span class="feedback-chevron">
<partial name="_NhsChevronRightOffset" class="feedback-chevron" />
</span>
</button>
</div>
</div>
</fieldset>
<div class="nhsuk-u-float-right">
<button class="nhsuk-button" type="submit">Continue
<span class="feedback-chevron">
<partial name="_NhsChevronRightOffset" class="feedback-chevron" />
</span>
</button>
</div>
</form>
</form>
</div>
</div>

3 changes: 2 additions & 1 deletion DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskAttempted.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@using DigitalLearningSolutions.Web.ViewModels.UserFeedback
@using Microsoft.AspNetCore.Http.Extensions
@using Microsoft.AspNetCore.Mvc.TagHelpers

@model UserFeedbackViewModel;
Expand Down Expand Up @@ -29,7 +30,7 @@
</div>
<div class="nhsuk-grid-column-two-thirds">
<form method="post" asp-action="UserFeedbackTaskAttemptedSet">
<input type="hidden" asp-for="SourceUrl" value="@Context.Request.Path" />
<input type="hidden" asp-for="SourceUrl" value="@Context.Request.GetDisplayUrl()" />
<input type="hidden" asp-for="SourcePageTitle" value="@Model.SourcePageTitle" />

<p class="nhsuk-body-l">Step 2 of 4</p>
Expand Down
3 changes: 2 additions & 1 deletion DigitalLearningSolutions.Web/Views/UserFeedback/UserFeedbackTaskDifficulty.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@using DigitalLearningSolutions.Web.ViewModels.UserFeedback
@using Microsoft.AspNetCore.Http.Extensions
@using Microsoft.AspNetCore.Mvc.TagHelpers

@model UserFeedbackViewModel;
Expand Down Expand Up @@ -31,7 +32,7 @@
<p class="nhsuk-body-l">Step 3 of 4</p>

<form method="post" asp-action="UserFeedbackTaskDifficultySet">
<input type="hidden" asp-for="SourceUrl" value="@Context.Request.Path" />
<input type="hidden" asp-for="SourceUrl" value="@Context.Request.GetDisplayUrl()" />
<input type="hidden" asp-for="SourcePageTitle" value="@Model.SourcePageTitle" />

<div class="nhsuk-hint" id="feedback-difficulty-hint">
Expand Down
Loading