diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml index 3c44a837..15e31011 100644 --- a/LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml +++ b/LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml @@ -59,7 +59,7 @@
No certificate available
- + Clear all filters diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/Activity/ResourceActivityRepository.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/Activity/ResourceActivityRepository.cs index 23458cc6..43c428d1 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/Activity/ResourceActivityRepository.cs +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/Activity/ResourceActivityRepository.cs @@ -241,18 +241,11 @@ public async Task> GetByUserIdFromSP(int userId, Nh /// public async Task> GetUserRecentMyLearningActivities(int userId, Nhs.Models.MyLearning.MyLearningRequestModel requestModel) { - try - { (string strActivityStatus, bool activityStatusEnumFlag) = this.GetActivityStatusFilter(requestModel); var param0 = new SqlParameter("@userId", SqlDbType.Int) { Value = userId }; var param1 = new SqlParameter("@activityStatuses", SqlDbType.NVarChar) { Value = activityStatusEnumFlag == false ? DBNull.Value : strActivityStatus }; var result = await DbContext.MyLearningActivitiesViewModel.FromSqlRaw("EXEC activity.GetUserRecentLearningActivities @userId, @activityStatuses", param0,param1).AsNoTracking().ToListAsync(); return result; - } - catch (Exception ex) - { - return null; - } } /// @@ -263,8 +256,6 @@ public async Task> GetUserRecentMyLearningAc /// public async Task> GetUserLearningHistory(int userId, Nhs.Models.MyLearning.MyLearningRequestModel requestModel) { - try - { (string strActivityStatus, bool activityStatusEnumFlag) = this.GetActivityStatusFilter(requestModel); (string strResourceTypes, bool resourceTypeFlag) = this.ApplyResourceTypesfilters(requestModel); var param0 = new SqlParameter("@userId", SqlDbType.Int) { Value = userId }; @@ -272,11 +263,6 @@ public async Task> GetUserLearningHistory(in var param2 = new SqlParameter("@resourceTypes", SqlDbType.NVarChar) { Value = resourceTypeFlag == false ? DBNull.Value : strResourceTypes }; var result = await DbContext.MyLearningActivitiesViewModel.FromSqlRaw("EXEC activity.GetUsersLearningHistory @userId, @activityStatuses,@resourceTypes", param0, param1, param2).AsNoTracking().ToListAsync(); return result; - } - catch (Exception ex) - { - return null; - } } /// diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs index 1e30482d..7e4aecbd 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs @@ -161,7 +161,7 @@ public async Task GetUserRecentMyLearning { var result = await resourceActivityRepository.GetUserRecentMyLearningActivities(userId, requestModel); - var entrolledCourses = await this.moodleApiService.GetRecentEnrolledCoursesAsync(userId, requestModel, 6); + //// var entrolledCourses = await this.moodleApiService.GetRecentEnrolledCoursesAsync(userId, requestModel, 6); var mappedMyLearningActivities = result.Select(Activity => new MyLearningCombinedActivitiesViewModel { @@ -182,27 +182,28 @@ public async Task GetUserRecentMyLearning CompletedActivities = 0, }).ToList(); - var mappedEnrolledCourses = entrolledCourses.Select(course => new MyLearningCombinedActivitiesViewModel - { - UserId = userId, - ResourceId = (int)course.Id, - ResourceVersionId = (int)course.Id, - IsCurrentResourceVersion = true, - ResourceReferenceId = (int)course.Id, - MajorVersion = 1, - MinorVersion = 0, - ResourceType = ResourceTypeEnum.Moodle, - Title = course.DisplayName, - CertificateEnabled = course.CertificateEnabled, - ActivityStatus = (course.Completed == true || course.ProgressPercentage.TrimEnd('%') == "100") ? ActivityStatusEnum.Completed : ActivityStatusEnum.Incomplete, - ActivityDate = DateTimeOffset.FromUnixTimeMilliseconds((long)course.LastAccess), - ScorePercentage = Convert.ToInt32(course.ProgressPercentage.TrimEnd('%')), - TotalActivities = course.TotalActivities, - CompletedActivities = course.CompletedActivities, - }).ToList(); + ////var mappedEnrolledCourses = entrolledCourses.Select(course => new MyLearningCombinedActivitiesViewModel + ////{ + //// UserId = userId, + //// ResourceId = (int)course.Id, + //// ResourceVersionId = (int)course.Id, + //// IsCurrentResourceVersion = true, + //// ResourceReferenceId = (int)course.Id, + //// MajorVersion = 1, + //// MinorVersion = 0, + //// ResourceType = ResourceTypeEnum.Moodle, + //// Title = course.DisplayName, + //// CertificateEnabled = course.CertificateEnabled, + //// ActivityStatus = (course.Completed == true || course.ProgressPercentage.TrimEnd('%') == "100") ? ActivityStatusEnum.Completed : ActivityStatusEnum.Incomplete, + //// ActivityDate = DateTimeOffset.FromUnixTimeMilliseconds((long)course.LastAccess), + //// ScorePercentage = Convert.ToInt32(course.ProgressPercentage.TrimEnd('%')), + //// TotalActivities = course.TotalActivities, + //// CompletedActivities = course.CompletedActivities, + ////}).ToList(); // Combine both result sets - var combainedUserActivities = mappedMyLearningActivities.Concat(mappedEnrolledCourses).ToList(); + ////var combainedUserActivities = mappedMyLearningActivities.Concat(mappedEnrolledCourses).ToList(); + var combainedUserActivities = mappedMyLearningActivities.ToList(); var pagedResults = combainedUserActivities.OrderByDescending(activity => activity.ActivityDate).Skip(requestModel.Skip).Take(requestModel.Take).ToList();