Skip to content

TD-5570-DIg Inclusion Test Result 2025 :no error messages are presented #1117

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: Release v1.5.1 grass lily To Test
merged 1 commit into from
May 15, 2025
Merged

TD-5570-DIg Inclusion Test Result 2025 :no error messages are presented #1117

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
79 changes: 47 additions & 32 deletions LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,29 +678,37 @@ public async Task<IActionResult> ChangeCurrentRole([FromQuery] UserJobRoleUpdate
return this.View("ChangeCurrentRole", viewModel);
}

if (formSubmission && viewModel.SelectedJobRoleId.HasValue)
if (!string.IsNullOrWhiteSpace(viewModel.FilterText))
{
var newRoleId = viewModel.SelectedJobRoleId.Value;
var jobRole = await this.jobRoleService.GetByIdAsync(newRoleId);
var jobRoles = await this.jobRoleService.GetPagedFilteredAsync(viewModel.FilterText, viewModel.CurrentPage, viewModel.PageSize);
viewModel.RoleList = jobRoles.Item2;
viewModel.TotalItems = jobRoles.Item1;
viewModel.HasItems = jobRoles.Item1 > 0;
}

if (jobRole.MedicalCouncilId > 0 && jobRole.MedicalCouncilId < 4)
if (formSubmission)
{
if (viewModel.SelectedJobRoleId.HasValue)
{
return this.RedirectToAction(nameof(this.ChangeMedicalCouncilNo), new UserMedicalCouncilNoUpdateViewModel { SelectedJobRoleId = newRoleId });
var newRoleId = viewModel.SelectedJobRoleId.Value;
var jobRole = await this.jobRoleService.GetByIdAsync(newRoleId);

if (jobRole.MedicalCouncilId > 0 && jobRole.MedicalCouncilId < 4)
{
return this.RedirectToAction(nameof(this.ChangeMedicalCouncilNo), new UserMedicalCouncilNoUpdateViewModel { SelectedJobRoleId = newRoleId });
}
else
{
return this.RedirectToAction(nameof(this.ChangeGrade), new UserGradeUpdateViewModel { SelectedJobRoleId = newRoleId });
}
}
else
{
return this.RedirectToAction(nameof(this.ChangeGrade), new UserGradeUpdateViewModel { SelectedJobRoleId = newRoleId });
this.ModelState.AddModelError(nameof(viewModel.SelectedJobRoleId), CommonValidationErrorMessages.RoleRequired);
return this.View("ChangeCurrentRole", viewModel);
}
}

if (!string.IsNullOrWhiteSpace(viewModel.FilterText))
{
var jobRoles = await this.jobRoleService.GetPagedFilteredAsync(viewModel.FilterText, viewModel.CurrentPage, viewModel.PageSize);
viewModel.RoleList = jobRoles.Item2;
viewModel.TotalItems = jobRoles.Item1;
viewModel.HasItems = jobRoles.Item1 > 0;
}

return this.View("ChangeCurrentRole", viewModel);
}

Expand Down Expand Up @@ -800,26 +808,33 @@ public async Task<IActionResult> ChangeGrade([FromQuery] UserGradeUpdateViewMode
viewModel.Grade = profile.Grade;
viewModel.SelectedJobRole = jobRole.NameWithStaffGroup;
viewModel.SelectedMedicalCouncilId = jobRole.MedicalCouncilId;

if (this.User.IsInRole("BasicUser") || (formSubmission && viewModel.SelectedGradeId.HasValue))
if (formSubmission)
{
var medicalCouncilNoRequired = jobRole.MedicalCouncilId > 0 && jobRole.MedicalCouncilId < 4;
await this.userService.UpdateUserEmployment(
new elfhHub.Nhs.Models.Entities.UserEmployment
{
Id = profile.EmploymentId,
UserId = profile.Id,
JobRoleId = viewModel.SelectedJobRoleId,
MedicalCouncilId = medicalCouncilNoRequired ? jobRole.MedicalCouncilId : null,
MedicalCouncilNo = medicalCouncilNoRequired ? (viewModel.SelectedMedicalCouncilNo ?? profile.MedicalCouncilNo) : null,
GradeId = viewModel.SelectedGradeId,
SpecialtyId = profile.SpecialtyId,
StartDate = profile.JobStartDate,
LocationId = profile.LocationId,
});
if (this.User.IsInRole("BasicUser") || viewModel.SelectedGradeId.HasValue)
{
var medicalCouncilNoRequired = jobRole.MedicalCouncilId > 0 && jobRole.MedicalCouncilId < 4;
await this.userService.UpdateUserEmployment(
new elfhHub.Nhs.Models.Entities.UserEmployment
{
Id = profile.EmploymentId,
UserId = profile.Id,
JobRoleId = viewModel.SelectedJobRoleId,
MedicalCouncilId = medicalCouncilNoRequired ? jobRole.MedicalCouncilId : null,
MedicalCouncilNo = medicalCouncilNoRequired ? (viewModel.SelectedMedicalCouncilNo ?? profile.MedicalCouncilNo) : null,
GradeId = viewModel.SelectedGradeId,
SpecialtyId = profile.SpecialtyId,
StartDate = profile.JobStartDate,
LocationId = profile.LocationId,
});

this.ViewBag.SuccessMessage = "Your job details have been changed";
return this.View("SuccessMessage");
this.ViewBag.SuccessMessage = "Your job details have been changed";
return this.View("SuccessMessage");
}
else
{
this.ModelState.AddModelError(nameof(viewModel.SelectedGradeId), CommonValidationErrorMessages.GradeRequired);
return this.View("ChangeGrade", viewModel);
}
}

return this.View("ChangeGrade", viewModel);
Expand Down
Loading