Skip to content

TD- 5570- fix for the values that need to be retained in the page on page load #1155

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: Merge RC changes into CI
merged 2 commits into from
Jun 3, 2025
Merged

TD- 5570- fix for the values that need to be retained in the page on page load #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d02716
fixes-TD-5570
AnjuJose011 Jun 3, 2025
6c1de72
fixes
AnjuJose011 Jun 3, 2025
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
8 changes: 6 additions & 2 deletions LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ public async Task<IActionResult> ChangeGrade([FromQuery] UserGradeUpdateViewMode
viewModel.SelectedMedicalCouncilId = jobRole.MedicalCouncilId;
if (formSubmission)
{
if (this.User.IsInRole("BasicUser") || viewModel.SelectedGradeId.HasValue)
if (this.User.IsInRole("BasicUser") || viewModel.SelectedGradeId != null)
{
var medicalCouncilNoRequired = jobRole.MedicalCouncilId > 0 && jobRole.MedicalCouncilId < 4;
await this.userService.UpdateUserEmployment(
Expand All @@ -821,7 +821,7 @@ await this.userService.UpdateUserEmployment(
JobRoleId = viewModel.SelectedJobRoleId,
MedicalCouncilId = medicalCouncilNoRequired ? jobRole.MedicalCouncilId : null,
MedicalCouncilNo = medicalCouncilNoRequired ? (viewModel.SelectedMedicalCouncilNo ?? profile.MedicalCouncilNo) : null,
GradeId = viewModel.SelectedGradeId,
GradeId = Convert.ToInt32(viewModel.SelectedGradeId),
SpecialtyId = profile.SpecialtyId,
StartDate = profile.JobStartDate,
LocationId = profile.LocationId,
Expand All @@ -836,6 +836,10 @@ await this.userService.UpdateUserEmployment(
return this.View("ChangeGrade", viewModel);
}
}
else
{
viewModel.SelectedGradeId = profile.GradeId.ToString();
}

return this.View("ChangeGrade", viewModel);
}
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Models/UserProfile/UserGradeUpdateViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class UserGradeUpdateViewModel
/// <summary>
/// Gets or sets the selected grade id.
/// </summary>
public int? SelectedGradeId { get; set; }
public string SelectedGradeId { get; set; }

/// <summary>
/// Gets or sets the grade list.
Expand Down
Loading