Merge Grasslilly release to master

AdminUI/LearningHub.Nhs.AdminUI/Controllers/UserGroupController.cs

@@ -197,7 +197,15 @@ public async Task<IActionResult> Details(UserGroupAdminDetailViewModel userGroup
             if (userGroup.IsNew())
             {
                 validationResult = await this.userGroupService.CreateUserGroup(userGroup);
-                userGroup = await this.userGroupService.GetUserGroupAdminDetailbyIdAsync(validationResult.CreatedId.Value);
+                if (validationResult.IsValid)
+                {
+                    userGroup = await this.userGroupService.GetUserGroupAdminDetailbyIdAsync(validationResult.CreatedId.Value);
+                }
+                else
+                {
+                    this.ViewBag.ErrorMessage = $"Update failed: {string.Join(Environment.NewLine, validationResult.Details)}";
+                    return this.View("Details", userGroup);
+                }
             }
             else
             {

AdminUI/LearningHub.Nhs.AdminUI/Views/UserGroup/_UsersModal.cshtml

@@ -41,10 +41,10 @@
             {
             <tr>
                 <td style="vertical-align: middle">
-                    @Html.ActionLink(item.Id.ToString(), "Details", new { id = item.Id })
+                        @Html.ActionLink(item.Id.ToString(), "Details", "User", new { id = item.Id })
                 </td>
                 <td style="vertical-align: middle">
-                    @Html.ActionLink(item.UserName.ToString(), "Details", new { id = item.Id })
+                        @Html.ActionLink(item.UserName.ToString(), "Details", "User", new { id = item.Id })
                 </td>
                 <td style="vertical-align: middle">
                     <input type="checkbox" id=@($"user_{item.Id}") class="list-item-checked" />

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);
         }

LearningHub.Nhs.WebUI/Helpers/ResourceTypeEnumMoodle.cs

@@ -0,0 +1,82 @@
+namespace LearningHub.Nhs.WebUI.Helpers;
+
+/// <summary>
+/// Represents the types of resources available in Moodle.
+/// </summary>
+public enum ResourceTypeEnumMoodle
+{
+    /// <summary>
+    /// The undefined resource type.
+    /// </summary>
+    Undefined,
+
+    /// <summary>
+    /// The article resource type.
+    /// </summary>
+    Article,
+
+    /// <summary>
+    /// The audio resource type.
+    /// </summary>
+    Audio,
+
+    /// <summary>
+    /// The embedded resource type.
+    /// </summary>
+    Embedded,
+
+    /// <summary>
+    /// The equipment resource type.
+    /// </summary>
+    Equipment,
+
+    /// <summary>
+    /// The image resource type.
+    /// </summary>
+    Image,
+
+    /// <summary>
+    /// The SCORM resource type.
+    /// </summary>
+    Scorm,
+
+    /// <summary>
+    /// The video resource type.
+    /// </summary>
+    Video,
+
+    /// <summary>
+    /// The web link resource type.
+    /// </summary>
+    WebLink,
+
+    /// <summary>
+    /// The generic file resource type.
+    /// </summary>
+    GenericFile,
+
+    /// <summary>
+    /// The clinical case resource type.
+    /// </summary>
+    Case,
+
+    /// <summary>
+    /// The assessment resource type.
+    /// </summary>
+    Assessment,
+
+    /// <summary>
+    /// The HTML resource type.
+    /// </summary>
+    Html,
+
+    /// <summary>
+    /// The Moodle resource type.
+    /// </summary>
+    Moodle,
+
+    /// <summary>
+    /// The Moodle course resource type.
+    /// </summary>
+    Course,
+}

LearningHub.Nhs.WebUI/Helpers/UtilityHelper.cs

@@ -32,6 +32,25 @@ public static class UtilityHelper
             { "html", ResourceTypeEnum.Html },
         };
 
+        /// TODO: Remove this method after adding to Moodle resource types to models project.
+        /// <summary>
+        /// Findwise Moodle resource type dictionary.
+        /// </summary>
+        public static readonly Dictionary<string, ResourceTypeEnumMoodle> FindwiseResourceMoodleTypeDict = new Dictionary<string, ResourceTypeEnumMoodle>()
+        {
+            { "video", ResourceTypeEnumMoodle.Video },
+            { "article", ResourceTypeEnumMoodle.Article },
+            { "case", ResourceTypeEnumMoodle.Case },
+            { "weblink", ResourceTypeEnumMoodle.WebLink },
+            { "audio", ResourceTypeEnumMoodle.Audio },
+            { "scorm", ResourceTypeEnumMoodle.Scorm },
+            { "assessment", ResourceTypeEnumMoodle.Assessment },
+            { "genericfile", ResourceTypeEnumMoodle.GenericFile },
+            { "image", ResourceTypeEnumMoodle.Image },
+            { "html", ResourceTypeEnumMoodle.Html },
+            { "moodle", ResourceTypeEnumMoodle.Course },
+        };
+
         /// <summary>
         /// The FormatTwitterDate.
         /// </summary>
@@ -147,6 +166,54 @@ public static string GetPrettifiedResourceTypeName(ResourceTypeEnum resourceType
             }
         }
 
+        /// TODO: Remove this method after adding to Moodle resource types to models project.
+        /// <summary>
+        /// Returns a prettified resource type name, suitable for display in the UI. Includes video/audio duration string.
+        /// </summary>
+        /// <param name="resourceType">The resource type.</param>
+        /// <param name="durationInMilliseconds">The media duration in milliseconds.</param>
+        /// <returns>The resource type name, and duration if applicable.</returns>
+        public static string GetPrettifiedResourceTypeNameMoodle(ResourceTypeEnumMoodle resourceType, int? durationInMilliseconds = 0)
+        {
+            switch (resourceType)
+            {
+                case ResourceTypeEnumMoodle.Assessment:
+                    return "Assessment";
+                case ResourceTypeEnumMoodle.Article:
+                    return "Article";
+                case ResourceTypeEnumMoodle.Audio:
+                    string durationText = GetDurationText(durationInMilliseconds ?? 0);
+                    durationText = string.IsNullOrEmpty(durationText) ? string.Empty : " - " + durationText;
+                    return "Audio" + durationText;
+                case ResourceTypeEnumMoodle.Equipment:
+                    return "Equipment";
+                case ResourceTypeEnumMoodle.Image:
+                    return "Image";
+                case ResourceTypeEnumMoodle.Scorm:
+                    return "elearning";
+                case ResourceTypeEnumMoodle.Video:
+                    durationText = GetDurationText(durationInMilliseconds ?? 0);
+                    durationText = string.IsNullOrEmpty(durationText) ? string.Empty : " - " + durationText;
+                    return "Video" + durationText;
+                case ResourceTypeEnumMoodle.WebLink:
+                    return "Web link";
+                case ResourceTypeEnumMoodle.GenericFile:
+                    return "File";
+                case ResourceTypeEnumMoodle.Embedded:
+                    return "Embedded";
+                case ResourceTypeEnumMoodle.Case:
+                    return "Case";
+                case ResourceTypeEnumMoodle.Html:
+                    return "HTML";
+                case ResourceTypeEnumMoodle.Moodle:
+                    return "Course";
+                case ResourceTypeEnumMoodle.Course:
+                    return "Course";
+                default:
+                    return "File";
+            }
+        }
+
         /// <summary>
         /// Returns a prettified resource type name, suitable for display in the UI. Excludes video/audio duration string.
         /// </summary>

LearningHub.Nhs.WebUI/Models/MoodleCourseResponseViewModel.cs

@@ -92,10 +92,15 @@ public class MoodleCourseResponseViewModel
         /// </summary>
         public int? Category { get; set; }
 
+        /// <summary>
+        /// Gets the progress percentage formatted as a string.
+        /// </summary>
+        public string ProgressPercentage => $"{System.Math.Round(this.Progress ?? 0)}%";
+
         /// <summary>
         /// Gets or sets the progress.
         /// </summary>
-        public int? Progress { get; set; }
+        public double? Progress { get; set; }
 
         /// <summary>
         /// Gets or sets the completion status.

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.

LearningHub.Nhs.WebUI/Services/SearchService.cs

@@ -163,10 +163,10 @@ public async Task<SearchResultViewModel> PerformSearch(IPrincipal user, SearchRe
                     {
                         var filter = filters.Where(x => x.DisplayName == filteritem).FirstOrDefault();
 
-                        if (filter != null && UtilityHelper.FindwiseResourceTypeDict.ContainsKey(filter.DisplayName))
+                        if (filter != null && UtilityHelper.FindwiseResourceMoodleTypeDict.ContainsKey(filter.DisplayName))
                         {
-                            var resourceTypeEnum = UtilityHelper.FindwiseResourceTypeDict[filter.DisplayName];
-                            var searchfilter = new SearchFilterModel() { DisplayName = UtilityHelper.GetPrettifiedResourceTypeName(resourceTypeEnum), Count = filter.Count, Value = filteritem, Selected = searchRequest.Filters?.Contains(filter.DisplayName) ?? false };
+                            var resourceTypeEnum = UtilityHelper.FindwiseResourceMoodleTypeDict[filter.DisplayName];
+                            var searchfilter = new SearchFilterModel() { DisplayName = UtilityHelper.GetPrettifiedResourceTypeNameMoodle(resourceTypeEnum), Count = filter.Count, Value = filteritem, Selected = searchRequest.Filters?.Contains(filter.DisplayName) ?? false };
                             searchfilters.Add(searchfilter);
                         }
                     }

LearningHub.Nhs.WebUI/Views/Catalogue/AccessRequested.cshtml

@@ -13,7 +13,7 @@
         <vc:back-link asp-controller="Catalogue" asp-action="@Model.CatalogueUrl" link-text="Back to: @Model.CatalogueName" />
         <h1>Access requested</h1>
 
-        <p>Your request to access this cataloque has seen sent to the cataloque administrator.</p>
+        <p>Your request to access this catalogue has seen sent to the catalogue administrator.</p>
 
         <h2>What happens next?</h2>
         <p>The catalogue administrator will review your request and you will be notified of their decision by email.</p>

LearningHub.Nhs.WebUI/Views/Home/_CourseEnrolled.cshtml

@@ -12,7 +12,7 @@
     {
         var apiBaseUrl = Configuration["MoodleAPIConfig:BaseUrl"];        
         string path = $"course/view.php";
-        string returnUrl = $@"{apiBaseUrl}/{path}?id={courseId}";
+        string returnUrl = $@"{apiBaseUrl}{path}?id={courseId}";
 
         return returnUrl;
     }
@@ -21,11 +21,9 @@
     <div class="nhsuk-card-banner-container">
         @if (!string.IsNullOrWhiteSpace(Model.CourseImage))
         {
-            if (Model.CourseImage.EndsWith(".svg", StringComparison.OrdinalIgnoreCase))
+            @if (Model.CourseImage.EndsWith(".svg", StringComparison.OrdinalIgnoreCase))
             {
-                <object class="nhsuk-card__img nhsuk-card-banner" type="image/svg+xml" data="@Model.CourseImage">
-                    <img src="/images/default-course.jpg" alt="Fallback image" />
-                </object>
+                <img class="nhsuk-card__img nhsuk-card-banner" src="@Model.CourseImage" alt="Course image" onerror="this.onerror=null;this.src='/images/default-course.jpg';" />
             }
             else
             {
@@ -60,7 +58,7 @@
             <div class="line-clamp-3 nhsuk-u-margin-bottom-2point5">
                 @if (@Model?.Progress != null)
                 {
-                    <div>Progress: @Model.Progress%</div>
+                    <div>Progress: @Model.ProgressPercentage</div>
                 }
             </div>