fixing the conflict

Author: Binon

.gitignore

@@ -53,3 +53,6 @@ obj
 /AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj.user
 /WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user
 /ReportAPI/LearningHub.Nhs.ReportApi/web.config
+/AdminUI/LearningHub.Nhs.AdminUI/web.config
+/LearningHub.Nhs.WebUI/web.config
+/WebAPI/LearningHub.Nhs.API/web.config

AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs

@@ -85,7 +85,15 @@ public static string GetResourceTypeVerb(this MyLearningDetailedItemViewModel my
                 case ResourceTypeEnum.Article:
                     return "Read";
                 case ResourceTypeEnum.Audio:
-                    return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000);
+                    if ((myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000) > myLearningDetailedItemViewModel.ResourceDurationMilliseconds)
+                    {
+                        return "Played " + GetDurationText(myLearningDetailedItemViewModel.ResourceDurationMilliseconds);
+                    }
+                    else
+                    {
+                        return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000);
+                    }
+
                 case ResourceTypeEnum.Embedded:
                     return string.Empty;
                 case ResourceTypeEnum.Equipment:
@@ -113,7 +121,15 @@ public static string GetResourceTypeVerb(this MyLearningDetailedItemViewModel my
                     }
 
                 case ResourceTypeEnum.Video:
-                    return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000);
+                    if ((myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000) > myLearningDetailedItemViewModel.ResourceDurationMilliseconds)
+                    {
+                        return "Played " + GetDurationText(myLearningDetailedItemViewModel.ResourceDurationMilliseconds);
+                    }
+                    else
+                    {
+                        return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000);
+                    }
+
                 case ResourceTypeEnum.WebLink:
                     return "Visited";
                 case ResourceTypeEnum.Html:

AdminUI/LearningHub.Nhs.AdminUI/web.config

@@ -40,6 +40,7 @@ public class HomeController : BaseController
         private readonly IDashboardService dashboardService;
         private readonly IContentService contentService;
         private readonly IFeatureManager featureManager;
+        private readonly IUserGroupService userGroupService;
         private readonly Microsoft.Extensions.Configuration.IConfiguration configuration;
 
         /// <summary>
@@ -55,6 +56,7 @@ public class HomeController : BaseController
         /// <param name="dashboardService">Dashboard service.</param>
         /// <param name="contentService">Content service.</param>
         /// <param name="featureManager"> featureManager.</param>
+        /// <param name="userGroupService"> userGroupService.</param>
         /// <param name="configuration"> config.</param>
         public HomeController(
             IHttpClientFactory httpClientFactory,
@@ -67,6 +69,7 @@ public HomeController(
             IDashboardService dashboardService,
             IContentService contentService,
             IFeatureManager featureManager,
+            IUserGroupService userGroupService,
             Microsoft.Extensions.Configuration.IConfiguration configuration)
         : base(hostingEnvironment, httpClientFactory, logger, settings.Value)
         {
@@ -76,6 +79,7 @@ public HomeController(
             this.dashboardService = dashboardService;
             this.contentService = contentService;
             this.featureManager = featureManager;
+            this.userGroupService = userGroupService;
             this.configuration = configuration;
         }
 
@@ -212,6 +216,7 @@ public async Task<IActionResult> Index(string myLearningDashboard = "my-in-progr
                     var learningTask = this.dashboardService.GetMyAccessLearningsAsync(myLearningDashboard, 1);
                     var resourcesTask = this.dashboardService.GetResourcesAsync(resourceDashboard, 1);
                     var cataloguesTask = this.dashboardService.GetCataloguesAsync(catalogueDashboard, 1);
+                    var userGroupsTask = this.userGroupService.UserHasCatalogueContributionPermission();
 
                     var enrolledCoursesTask = Task.FromResult(new List<MoodleCourseResponseViewModel>());
                     var enableMoodle = Task.Run(() => this.featureManager.IsEnabledAsync(FeatureFlags.EnableMoodle)).Result;
@@ -222,7 +227,7 @@ public async Task<IActionResult> Index(string myLearningDashboard = "my-in-progr
                         enrolledCoursesTask = this.dashboardService.GetEnrolledCoursesFromMoodleAsync(this.CurrentMoodleUserId, 1);
                     }
 
-                    await Task.WhenAll(learningTask, resourcesTask, cataloguesTask);
+                    await Task.WhenAll(learningTask, resourcesTask, cataloguesTask, userGroupsTask);
 
                     var model = new DashboardViewModel()
                     {
@@ -231,7 +236,8 @@ public async Task<IActionResult> Index(string myLearningDashboard = "my-in-progr
                         Catalogues = await cataloguesTask,
                         EnrolledCourses = await enrolledCoursesTask,
                     };
-
+                    var userHasContributePermission = await userGroupsTask;
+                    this.ViewBag.userHasContributePermission = userHasContributePermission;
                     if (!string.IsNullOrEmpty(this.Request.Query["preview"]) && Convert.ToBoolean(this.Request.Query["preview"]))
                     {
                         return this.View("LandingPage", await this.GetLandingPageContent(Convert.ToBoolean(this.Request.Query["preview"])));

LearningHub.Nhs.WebUI/Controllers/HomeController.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/ResourceTypeEnumMoodle.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/Helpers/UtilityHelper.cs

@@ -84,7 +84,15 @@ public static string GetResourceTypeVerb(this ActivityDetailedItemViewModel acti
                 case ResourceTypeEnum.Article:
                     return "Read";
                 case ResourceTypeEnum.Audio:
-                    return "Played " + GetDurationText(activityDetailedItemViewModel.ActivityDurationSeconds * 1000);
+                    if ((activityDetailedItemViewModel.ActivityDurationSeconds * 1000) > activityDetailedItemViewModel.ResourceDurationMilliseconds)
+                    {
+                        return "Played " + GetDurationText(activityDetailedItemViewModel.ResourceDurationMilliseconds);
+                    }
+                    else
+                    {
+                        return "Played " + GetDurationText(activityDetailedItemViewModel.ActivityDurationSeconds * 1000);
+                    }
+
                 case ResourceTypeEnum.Embedded:
                     return string.Empty;
                 case ResourceTypeEnum.Equipment:
@@ -112,7 +120,15 @@ public static string GetResourceTypeVerb(this ActivityDetailedItemViewModel acti
                     }
 
                 case ResourceTypeEnum.Video:
-                    return "Played " + GetDurationText(activityDetailedItemViewModel.ActivityDurationSeconds * 1000);
+                    if ((activityDetailedItemViewModel.ActivityDurationSeconds * 1000) > activityDetailedItemViewModel.ResourceDurationMilliseconds)
+                    {
+                        return "Played " + GetDurationText(activityDetailedItemViewModel.ResourceDurationMilliseconds);
+                    }
+                    else
+                    {
+                        return "Played " + GetDurationText(activityDetailedItemViewModel.ActivityDurationSeconds * 1000);
+                    }
+
                 case ResourceTypeEnum.WebLink:
                     return "Visited";
                 case ResourceTypeEnum.Html:

LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs

@@ -22,6 +22,12 @@ public interface IUserGroupService
         /// <returns>The <see cref="Task{List}"/>.</returns>
         Task<List<RoleUserGroupViewModel>> GetRoleUserGroupDetailForUserAsync(int userId);
 
+        /// <summary>
+        /// The UserHasCatalogueContributionPermission.
+        /// </summary>
+        /// <returns>The <see cref="UserHasCatalogueContributionPermission"/>.</returns>
+        Task<bool> UserHasCatalogueContributionPermission();
+
         /// <summary>
         /// Check if user has given permission.
         /// </summary>

LearningHub.Nhs.WebUI/Interfaces/IUserGroupService.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/MoodleCourseResponseViewModel.cs

@@ -11,14 +11,19 @@
     public class NavigationPermissionService : INavigationPermissionService
     {
         private readonly IResourceService resourceService;
+        private readonly IUserGroupService userGroupService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="NavigationPermissionService"/> class.
         /// </summary>
         /// <param name="resourceService">Resource service.</param>
-        public NavigationPermissionService(IResourceService resourceService)
+        /// <param name="userGroupService">UserGroup service.</param>
+        public NavigationPermissionService(
+        IResourceService resourceService,
+        IUserGroupService userGroupService)
         {
             this.resourceService = resourceService;
+            this.userGroupService = userGroupService;
         }
 
         /// <summary>
@@ -52,7 +57,7 @@ public async Task<NavigationModel> GetNavigationModelAsync(IPrincipal user, bool
             }
             else if (user.IsInRole("BlueUser"))
             {
-                return this.AuthenticatedBlueUser(controllerName);
+                return await this.AuthenticatedBlueUser(controllerName);
             }
             else
             {
@@ -114,11 +119,11 @@ private NavigationModel AuthenticatedAdministrator(string controllerName)
         /// </summary>
         /// <param name="controllerName">The controller name.</param>
         /// <returns>The <see cref="NavigationModel"/>.</returns>
-        private NavigationModel AuthenticatedBlueUser(string controllerName)
+        private async Task<NavigationModel> AuthenticatedBlueUser(string controllerName)
         {
             return new NavigationModel()
             {
-                ShowMyContributions = true,
+                ShowMyContributions = await this.userGroupService.UserHasCatalogueContributionPermission(),
                 ShowMyLearning = true,
                 ShowMyBookmarks = true,
                 ShowSearch = controllerName != "search" && controllerName != string.Empty,