Revert "Release v1.5.1 grass lily To Test"

Author: AnjuJose011

AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/Details.cshtml

@@ -571,32 +571,6 @@
                             </dl>
                         </div>
                     }
-                    @if (Model.ResourceTypeEnum == ResourceTypeEnum.Html)
-                    {
-                        <div class="col-12">
-                            <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
-                            <dl>
-                                <dt>Resource Version Id</dt>
-                                <dd>@Html.DisplayFor(model => model.ResourceVersionId)</dd>
-                                <dt>Resource Type</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceTypeDescription)
-                                </dd>
-                                <dt>ESR Link</dt>
-                                <dd><a href="@Model.HtmlDetails.HostedContentUrl" target="_blank">@Model.HtmlDetails.HostedContentUrl</a></dd>
-                                @if (Model.HtmlDetails.File != null)
-                                {
-                                    <dt>Zip File</dt>
-                                    <dd>
-                                        <a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.HtmlDetails.File.FilePath, Model.HtmlDetails.File.FileName)" target="_blank" download>@Model.HtmlDetails.File.FileName</a>
-                                    </dd>
-                                }
-
-                                <dt>Content Folder</dt>
-                                <dd>@Model.HtmlDetails.ContentFilePath</dd>
-                            </dl>
-                        </div>
-                    }
 
                     @if (Model.ResourceTypeEnum == ResourceTypeEnum.Assessment)
                     {

LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs

@@ -678,37 +678,29 @@ public async Task<IActionResult> ChangeCurrentRole([FromQuery] UserJobRoleUpdate
                 return this.View("ChangeCurrentRole", viewModel);
             }
 
-            if (!string.IsNullOrWhiteSpace(viewModel.FilterText))
+            if (formSubmission && viewModel.SelectedJobRoleId.HasValue)
             {
-                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;
-            }
+                var newRoleId = viewModel.SelectedJobRoleId.Value;
+                var jobRole = await this.jobRoleService.GetByIdAsync(newRoleId);
 
-            if (formSubmission)
-            {
-                if (viewModel.SelectedJobRoleId.HasValue)
+                if (jobRole.MedicalCouncilId > 0 && jobRole.MedicalCouncilId < 4)
                 {
-                    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 });
-                    }
+                    return this.RedirectToAction(nameof(this.ChangeMedicalCouncilNo), new UserMedicalCouncilNoUpdateViewModel { SelectedJobRoleId = newRoleId });
                 }
                 else
                 {
-                    this.ModelState.AddModelError(nameof(viewModel.SelectedJobRoleId), CommonValidationErrorMessages.RoleRequired);
-                    return this.View("ChangeCurrentRole", viewModel);
+                    return this.RedirectToAction(nameof(this.ChangeGrade), new UserGradeUpdateViewModel { SelectedJobRoleId = newRoleId });
                 }
             }
 
+            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);
         }
 
@@ -808,33 +800,26 @@ public async Task<IActionResult> ChangeGrade([FromQuery] UserGradeUpdateViewMode
             viewModel.Grade = profile.Grade;
             viewModel.SelectedJobRole = jobRole.NameWithStaffGroup;
             viewModel.SelectedMedicalCouncilId = jobRole.MedicalCouncilId;
-            if (formSubmission)
+
+            if (this.User.IsInRole("BasicUser") || (formSubmission && viewModel.SelectedGradeId.HasValue))
             {
-                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,
-                        });
+                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");
-                }
-                else
-                {
-                    this.ModelState.AddModelError(nameof(viewModel.SelectedGradeId), CommonValidationErrorMessages.GradeRequired);
-                    return this.View("ChangeGrade", viewModel);
-                }
+                this.ViewBag.SuccessMessage = "Your job details have been changed";
+                return this.View("SuccessMessage");
             }
 
             return this.View("ChangeGrade", viewModel);

WebAPI/LearningHub.Nhs.Services/MyLearningService.cs

@@ -252,7 +252,7 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai
                     MinorVersion = resourceActivity.MinorVersion,
                     Version = resourceActivity.MajorVersion + "." + resourceActivity.MinorVersion,
                     ResourceType = resourceActivity.Resource.ResourceTypeEnum,
-                    ActivityDate = resourceActivity.ActivityStart ?? resourceActivity.CreateDate,
+                    ActivityDate = resourceActivity.ActivityStart.GetValueOrDefault(),
                     ActivityStatus = (ActivityStatusEnum)resourceActivity.ActivityStatusId,
                     IsCurrentResourceVersion = resourceActivity.ResourceVersionId == resourceActivity.Resource.CurrentResourceVersionId,
                     VersionStatusId = (int?)resourceActivity.ResourceVersion.VersionStatusEnum,