Skip to content

Fixes for Mylearning page not displaying courses #1389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2025
Merged

Fixes for Mylearning page not displaying courses #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MoodleApiService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ public async Task<List<MoodleEnrolledCourseResponseModel>> GetRecentEnrolledCour
{
try
{
var moodleUser = this.GetMoodleUserIdByUsernameAsync(userId);
string statusFilter = string.Empty; ;

if ((requestModel.Incomplete && requestModel.Complete) || (!requestModel.Incomplete && !requestModel.Complete))
Expand All @@ -132,7 +133,7 @@ public async Task<List<MoodleEnrolledCourseResponseModel>> GetRecentEnrolledCour

var parameters = new Dictionary<string, string>
{
{ "userid", userId.ToString() },
{ "userid", moodleUser.Id.ToString() },
{ "months", months.ToString() },
{ "statusfilter", statusFilter },
{ "search", requestModel.SearchText ?? string.Empty }
Expand Down Expand Up @@ -165,6 +166,7 @@ public async Task<List<MoodleEnrolledCourseResponseModel>> GetEnrolledCoursesHis
{
try
{
var moodleUser = this.GetMoodleUserIdByUsernameAsync(userId);
string statusFilter = string.Empty;

if ((requestModel.Incomplete && requestModel.Complete) || (!requestModel.Incomplete && !requestModel.Complete))
Expand All @@ -182,7 +184,7 @@ public async Task<List<MoodleEnrolledCourseResponseModel>> GetEnrolledCoursesHis

var parameters = new Dictionary<string, string>
{
{ "userid", userId.ToString() },
{ "userid", moodleUser.Id.ToString() },
{ "statusfilter", statusFilter },
{ "search", requestModel.SearchText ?? string.Empty }
};
Expand Down Expand Up @@ -214,9 +216,10 @@ public async Task<List<MoodleUserCertificateResponseModel>> GetUserCertificateAs
{
try
{
var moodleUser = this.GetMoodleUserIdByUsernameAsync(userId);
var parameters = new Dictionary<string, string>
{
{ "userid", userId.ToString() },
{ "userid", moodleUser.Id.ToString() },
{ "searchterm", filterText }
};

Expand Down
106 changes: 53 additions & 53 deletions OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/MyLearningService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,61 +157,61 @@ public async Task<MyLearningDetailedViewModel> GetActivityDetailed(int userId, M
/// <returns>The <see cref="Task"/>.</returns>
public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearningActivitiesAsync(int userId, MyLearningRequestModel requestModel)
{
var result = await resourceActivityRepository.GetUserRecentMyLearningActivities(userId, requestModel);
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
{
UserId = userId,
ResourceId = Activity.ResourceId,
ResourceVersionId = Activity.ResourceVersionId,
ResourceReferenceId = Activity.ResourceReferenceId,
IsCurrentResourceVersion = Activity.IsCurrentResourceVersion,
MajorVersion = Activity.MajorVersion,
MinorVersion = Activity.MinorVersion,
ResourceType = Activity.ResourceType,
Title = Activity.Title,
CertificateEnabled = Activity.CertificateEnabled,
ActivityStatus = Activity.ActivityStatus,
ActivityDate = Activity.ActivityDate,
ScorePercentage = Activity.ScorePercentage,
TotalActivities = 0,
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();

// Combine both result sets
var combainedUserActivities = mappedMyLearningActivities.Concat(mappedEnrolledCourses).ToList();

var pagedResults = combainedUserActivities.OrderByDescending(activity => activity.ActivityDate).Skip(requestModel.Skip).Take(requestModel.Take).ToList();
var mappedMyLearningActivities = result.Select(Activity => new MyLearningCombinedActivitiesViewModel
{
UserId = userId,
ResourceId = Activity.ResourceId,
ResourceVersionId = Activity.ResourceVersionId,
ResourceReferenceId = Activity.ResourceReferenceId,
IsCurrentResourceVersion = Activity.IsCurrentResourceVersion,
MajorVersion = Activity.MajorVersion,
MinorVersion = Activity.MinorVersion,
ResourceType = Activity.ResourceType,
Title = Activity.Title,
CertificateEnabled = Activity.CertificateEnabled,
ActivityStatus = Activity.ActivityStatus,
ActivityDate = Activity.ActivityDate,
ScorePercentage = Activity.ScorePercentage,
TotalActivities = 0,
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();

// Combine both result sets
var combainedUserActivities = mappedMyLearningActivities.Concat(mappedEnrolledCourses).ToList();

var pagedResults = combainedUserActivities.OrderByDescending(activity => activity.ActivityDate).Skip(requestModel.Skip).Take(requestModel.Take).ToList();

// Count total records.
MyLearningActivitiesDetailedViewModel viewModel = new MyLearningActivitiesDetailedViewModel()
{
TotalCount = combainedUserActivities.Count(),
Activities = pagedResults,
};
// Count total records.
MyLearningActivitiesDetailedViewModel viewModel = new MyLearningActivitiesDetailedViewModel()
{
TotalCount = combainedUserActivities.Count(),
Activities = pagedResults,
};

return viewModel;
return viewModel;
}

/// <summary>
Expand Down Expand Up @@ -297,7 +297,7 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetUserLearningHistoryA
ResourceType = ResourceTypeEnum.Moodle,
Title = course.DisplayName,
CertificateEnabled = course.CertificateEnabled,
ActivityStatus = (course.Completed == true || course.ProgressPercentage.TrimEnd('%') == "100")? ActivityStatusEnum.Completed:ActivityStatusEnum.Incomplete,
ActivityStatus = (course.Completed == true || course.ProgressPercentage.TrimEnd('%') == "100") ? ActivityStatusEnum.Completed : ActivityStatusEnum.Incomplete,
ActivityDate = DateTimeOffset.FromUnixTimeMilliseconds((long)course.LastAccess),
ScorePercentage = int.TryParse(course.ProgressPercentage.TrimEnd('%'), out var score) ? score : 0,
TotalActivities = course.TotalActivities,
Expand Down Expand Up @@ -615,7 +615,7 @@ public async Task<MyLearningCertificatesDetailedViewModel> GetUserCertificateDet

if (filteredResource.Count() == 0 || (filteredResource.Any() && requestModel.Courses))
{
courseCertificatesTask = !string.IsNullOrWhiteSpace(requestModel.SearchText) ?
courseCertificatesTask = !string.IsNullOrWhiteSpace(requestModel.SearchText) ?
moodleApiService.GetUserCertificateAsync(userId, requestModel.SearchText) : moodleApiService.GetUserCertificateAsync(userId);

}
Expand Down
Loading