From 5d027164c0347a1da9180c2b0be6de293ab10b72 Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Tue, 3 Jun 2025 13:47:20 +0100
Subject: [PATCH] fixes-TD-5570

---
 LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs  | 8 ++++++--
 .../Models/UserProfile/UserGradeUpdateViewModel.cs        | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs b/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs
index bac3461a4..6fd57f208 100644
--- a/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs
@@ -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(
@@ -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,
@@ -836,6 +836,10 @@ await this.userService.UpdateUserEmployment(
                     return this.View("ChangeGrade", viewModel);
                 }
             }
+            else
+            {
+                viewModel.SelectedGradeId = profile.GradeId.ToString();
+            }
 
             return this.View("ChangeGrade", viewModel);
         }
diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/UserGradeUpdateViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/UserGradeUpdateViewModel.cs
index af9915c18..5394cf09b 100644
--- a/LearningHub.Nhs.WebUI/Models/UserProfile/UserGradeUpdateViewModel.cs
+++ b/LearningHub.Nhs.WebUI/Models/UserProfile/UserGradeUpdateViewModel.cs
@@ -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.