Skip to content

Removed the commented code #1373

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
Parent: Merge RC changes into CI
merged 1 commit into from
Sep 3, 2025
Merged

Removed the commented code #1373

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
48 changes: 20 additions & 28 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,11 +157,9 @@ public async Task<MyLearningDetailedViewModel> GetActivityDetailed(int userId, M
/// <returns>The <see cref="Task"/>.</returns>
public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearningActivitiesAsync(int userId, MyLearningRequestModel requestModel)
{
try
{
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
{
Expand All @@ -182,28 +180,27 @@ public async Task<MyLearningActivitiesDetailedViewModel> 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.ToList();
var combainedUserActivities = mappedMyLearningActivities.Concat(mappedEnrolledCourses).ToList();

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

Expand All @@ -215,11 +212,6 @@ public async Task<MyLearningActivitiesDetailedViewModel> GetUserRecentMyLearning
};

return viewModel;
}
catch (Exception ex)
{
return null;
}
}

/// <summary>
Expand Down
Loading