Skip to content

TD-3744-Job role with slash in causes error during registration #151

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
Parent: CI to Content Referencing V2 Branch
merged 2 commits into from
Feb 27, 2024
Merged

TD-3744-Job role with slash in causes error during registration #151

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
faeea0b
DefectFix-TD-3744
AnjuJose011 Feb 27, 2024
187650b
DefectFix-TD-3744
AnjuJose011 Feb 27, 2024
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
13 changes: 12 additions & 1 deletion LearningHub.Nhs.WebUI/Controllers/AccountController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
namespace LearningHub.Nhs.WebUI.Controllers
{
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
Expand Down Expand Up @@ -1232,7 +1233,17 @@ private async Task<AccountCreationConfirmation> GetAccountConfirmationDetails(Ac
var employer = await this.locationService.GetByIdAsync(int.TryParse(accountCreationViewModel.LocationId, out int primaryEmploymentId) ? primaryEmploymentId : 0);
var region = await this.regionService.GetAllAsync();
var specialty = await this.specialtyService.GetSpecialtiesAsync();
var role = await this.jobRoleService.GetPagedFilteredAsync(accountCreationViewModel.CurrentRoleName, accountCreationViewModel.CurrentPageIndex, UserRegistrationContentPageSize);
var role = new Tuple<int, List<JobRoleBasicViewModel>>(0, null);
if (!string.IsNullOrEmpty(accountCreationViewModel.CurrentRoleName) && accountCreationViewModel.CurrentRoleName.Contains('/'))
{
string jobrole = accountCreationViewModel.CurrentRoleName.Replace("/", " ");
role = await this.jobRoleService.GetPagedFilteredAsync(jobrole, accountCreationViewModel.CurrentPageIndex, UserRegistrationContentPageSize);
}
else
{
role = await this.jobRoleService.GetPagedFilteredAsync(accountCreationViewModel.CurrentRoleName, accountCreationViewModel.CurrentPageIndex, UserRegistrationContentPageSize);
}

if (role.Item1 > 0)
{
accountCreationViewModel.CurrentRoleName = role.Item2.FirstOrDefault(x => x.Id == int.Parse(accountCreationViewModel.CurrentRole)).NameWithStaffGroup;
Expand Down