Skip to content

TD-6181 - Fixes for Issue 5 #1417

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 4 commits into from
Sep 17, 2025
Merged

TD-6181 - Fixes for Issue 5 #1417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
052225c
TD-6181 - Fixes for Issue 5
swapnamol-abraham Sep 17, 2025
b7f9a31
TD-6223- SIT fixes
swapnamol-abraham Sep 17, 2025
29eb4b7
Implemented filter summary in certificate page
swapnamol-abraham Sep 17, 2025
f05a48f
Added resource veersionid in the sp
swapnamol-abraham Sep 17, 2025
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
2 changes: 1 addition & 1 deletion AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
<PackageReference Include="IdentityModel" Version="4.6.0" />
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.54" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.55" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI.AutomatedUiTests/LearningHub.Nhs.WebUI.AutomatedUiTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.11" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.54" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.55" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.13" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Selenium.Axe" Version="4.0.19" />
Expand Down
192 changes: 9 additions & 183 deletions LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,181 +94,6 @@ public static string RenderRazorViewToString(Controller controller, string viewN
}
}

/////// <summary>
/////// Index.
/////// </summary>
/////// <param name="learningRequest">learningRequest.</param>
/////// <param name="myLearningDashboard">The my learning dashboard type.</param>
/////// <returns>IActionResult.</returns>
////[Route("MyLearning")]
////[Route("MyLearning/activity")]
////[HttpGet]
////[HttpPost]
////public async Task<IActionResult> Index(MyLearningViewModel learningRequest = null, string myLearningDashboard = null)
////{
//// var myLearningRequestModel = new MyLearningRequestModel
//// {
//// SearchText = learningRequest.SearchText?.Trim(),
//// Skip = learningRequest.CurrentPageIndex * MyLearningPageSize,
//// Take = MyLearningPageSize,
//// TimePeriod = !string.IsNullOrWhiteSpace(learningRequest.TimePeriod) ? learningRequest.TimePeriod : "allDates",
//// StartDate = learningRequest.StartDate,
//// EndDate = learningRequest.EndDate,
//// Weblink = learningRequest.Weblink,
//// File = learningRequest.File,
//// Video = learningRequest.Video,
//// Article = learningRequest.Article,
//// Case = learningRequest.Case,
//// Image = learningRequest.Image,
//// Audio = learningRequest.Audio,
//// Elearning = learningRequest.Elearning,
//// Html = learningRequest.Html,
//// Assessment = learningRequest.Assessment,
//// Complete = learningRequest.Complete,
//// Incomplete = learningRequest.Incomplete,
//// Passed = learningRequest.Passed,
//// Failed = learningRequest.Failed,
//// Downloaded = learningRequest.Downloaded,
//// Viewed = learningRequest.Viewed,
//// Launched = learningRequest.Launched,
//// CertificateEnabled = learningRequest.CertificateEnabled,
//// };

//// if (myLearningDashboard != null)
//// {
//// if (myLearningDashboard == "my-in-progress")
//// {
//// myLearningRequestModel.Incomplete = true;
//// myLearningRequestModel.Failed = true;
//// }
//// else if (myLearningDashboard == "my-recent-completed")
//// {
//// myLearningRequestModel.Complete = true;
//// myLearningRequestModel.Passed = true;
//// myLearningRequestModel.Downloaded = true;
//// }
//// else if (myLearningDashboard == "my-certificates")
//// {
//// myLearningRequestModel.CertificateEnabled = true;
//// myLearningRequestModel.Complete = true;
//// myLearningRequestModel.Passed = true;
//// myLearningRequestModel.Downloaded = true;
//// }
//// }

//// switch (learningRequest.MyLearningFormActionType)
//// {
//// case MyLearningFormActionTypeEnum.NextPageChange:
//// learningRequest.CurrentPageIndex += 1;
//// myLearningRequestModel.Skip = learningRequest.CurrentPageIndex * MyLearningPageSize;
//// break;

//// case MyLearningFormActionTypeEnum.PreviousPageChange:
//// learningRequest.CurrentPageIndex -= 1;
//// myLearningRequestModel.Skip = learningRequest.CurrentPageIndex * MyLearningPageSize;
//// break;
//// case MyLearningFormActionTypeEnum.BasicSearch:

//// myLearningRequestModel = new MyLearningRequestModel
//// {
//// SearchText = learningRequest.SearchText?.Trim(),
//// TimePeriod = !string.IsNullOrWhiteSpace(learningRequest.TimePeriod) ? learningRequest.TimePeriod : "allDates",
//// Skip = learningRequest.CurrentPageIndex * MyLearningPageSize,
//// Take = MyLearningPageSize,
//// };
//// break;

//// case MyLearningFormActionTypeEnum.ApplyWeekFilter:
//// myLearningRequestModel = new MyLearningRequestModel
//// {
//// SearchText = learningRequest.SearchText?.Trim(),
//// TimePeriod = "thisWeek",
//// Skip = learningRequest.CurrentPageIndex * MyLearningPageSize,
//// Take = MyLearningPageSize,
//// };
//// break;
//// case MyLearningFormActionTypeEnum.ApplyMonthFilter:
//// myLearningRequestModel = new MyLearningRequestModel
//// {
//// SearchText = learningRequest.SearchText?.Trim(),
//// TimePeriod = "thisMonth",
//// Skip = learningRequest.CurrentPageIndex * MyLearningPageSize,
//// Take = MyLearningPageSize,
//// };
//// break;

//// case MyLearningFormActionTypeEnum.ApplyTwelveMonthFilter:
//// myLearningRequestModel = new MyLearningRequestModel
//// {
//// SearchText = learningRequest.SearchText?.Trim(),
//// TimePeriod = "last12Months",
//// Skip = learningRequest.CurrentPageIndex * MyLearningPageSize,
//// Take = MyLearningPageSize,
//// };
//// break;

//// case MyLearningFormActionTypeEnum.ApplyMajorFilters:
//// if (learningRequest.TimePeriod == "dateRange")
//// {
//// if (!this.ModelState.IsValid)
//// {
//// break;
//// }

//// myLearningRequestModel.TimePeriod = learningRequest.TimePeriod;
//// myLearningRequestModel.StartDate = learningRequest.GetStartDate().HasValue ? learningRequest.GetStartDate().Value : null;
//// myLearningRequestModel.EndDate = learningRequest.GetEndDate().HasValue ? learningRequest.GetEndDate().Value : null;
//// }

//// break;

//// case MyLearningFormActionTypeEnum.ClearAllFilters:

//// myLearningRequestModel = new MyLearningRequestModel
//// {
//// SearchText = learningRequest.SearchText?.Trim(),
//// Skip = learningRequest.CurrentPageIndex * MyLearningPageSize,
//// TimePeriod = "allDates",
//// Take = MyLearningPageSize,
//// };
//// break;
//// }

//// ////var result = await this.myLearningService.GetUserRecentMyLearningActivities(myLearningRequestModel);
//// var result = await this.myLearningService.GetActivityDetailed(myLearningRequestModel);
//// var response = new MyLearningViewModel(myLearningRequestModel);
//// if (learningRequest.TimePeriod == "dateRange")
//// {
//// response.StartDay = learningRequest.StartDay;
//// response.StartMonth = learningRequest.StartMonth;
//// response.StartYear = learningRequest.StartYear;
//// response.EndDay = learningRequest.EndDay;
//// response.EndMonth = learningRequest.EndMonth;
//// response.EndYear = learningRequest.EndYear;
//// }

//// if (result != null)
//// {
//// response.TotalCount = result.TotalCount;
//// response.Activities = result.Activities.Select(entry => new ActivityDetailedItemViewModel(entry)).ToList();
//// if (response.Activities.Any())
//// {
//// foreach (var activity in response.Activities)
//// {
//// if (!response.MostRecentResources.Contains(activity.ResourceId))
//// {
//// activity.IsMostRecent = true;
//// response.MostRecentResources.Add(activity.ResourceId);
//// }
//// }
//// }
//// }

//// response.MyLearningPaging = new MyLearningPagingModel() { CurrentPage = learningRequest.CurrentPageIndex, PageSize = MyLearningPageSize, TotalItems = response.TotalCount, HasItems = response.TotalCount > 0 };
//// this.ViewBag.MyLearningHelpUrl = this.Settings.SupportUrls.MyLearningHelpUrl;
//// return this.View(response);
////}

/// <summary>
/// Index.
/// </summary>
Expand Down Expand Up @@ -746,11 +571,12 @@ public async Task<IActionResult> ViewProgress(int resourceId, int resourceRefere
[HttpPost]
public async Task<IActionResult> Certificates(MyLearningUserCertificatesViewModel certificateRequest = null)
{
int certificatePageSize = 6;
var myLearningRequestModel = new MyLearningRequestModel
{
SearchText = certificateRequest.SearchText?.Trim(),
Skip = certificateRequest.CurrentPageIndex * MyLearningPageSize,
Take = MyLearningPageSize,
Skip = certificateRequest.CurrentPageIndex * certificatePageSize,
Take = certificatePageSize,
File = certificateRequest.File,
Video = certificateRequest.Video,
Article = certificateRequest.Article,
Expand All @@ -767,29 +593,29 @@ public async Task<IActionResult> Certificates(MyLearningUserCertificatesViewMode
{
case MyLearningFormActionTypeEnum.NextPageChange:
certificateRequest.CurrentPageIndex += 1;
myLearningRequestModel.Skip = certificateRequest.CurrentPageIndex * MyLearningPageSize;
myLearningRequestModel.Skip = certificateRequest.CurrentPageIndex * certificatePageSize;
break;

case MyLearningFormActionTypeEnum.PreviousPageChange:
certificateRequest.CurrentPageIndex -= 1;
myLearningRequestModel.Skip = certificateRequest.CurrentPageIndex * MyLearningPageSize;
myLearningRequestModel.Skip = certificateRequest.CurrentPageIndex * certificatePageSize;
break;
case MyLearningFormActionTypeEnum.BasicSearch:

myLearningRequestModel = new MyLearningRequestModel
{
SearchText = certificateRequest.SearchText?.Trim(),
Skip = certificateRequest.CurrentPageIndex * MyLearningPageSize,
Take = MyLearningPageSize,
Skip = certificateRequest.CurrentPageIndex * certificatePageSize,
Take = certificatePageSize,
};
break;
case MyLearningFormActionTypeEnum.ClearAllFilters:

myLearningRequestModel = new MyLearningRequestModel
{
SearchText = certificateRequest.SearchText?.Trim(),
Skip = certificateRequest.CurrentPageIndex * MyLearningPageSize,
Take = MyLearningPageSize,
Skip = certificateRequest.CurrentPageIndex * certificatePageSize,
Take = certificatePageSize,
};
break;
}
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<PackageReference Include="HtmlAgilityPack" Version="1.11.72" />
<PackageReference Include="IdentityModel" Version="4.6.0" />
<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.54" />
<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.55" />
<PackageReference Include="linqtotwitter" Version="6.9.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />
Expand Down
12 changes: 11 additions & 1 deletion LearningHub.Nhs.WebUI/Views/Home/_LearningActivityCard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
@inject LearningHub.Nhs.WebUI.Interfaces.IMoodleApiService moodleApiService;
@model Tuple<string, MyLearningCombinedActivitiesViewModel>
@{
bool providerExists = Model.Item2.Providers?.Count > 0;
string cardStyle = Model.Item1.Contains("my-learning") ? "card-provider-details--darkblank" : "card-provider-details--blank";
var activityDate = Model.Item2.ActivityDate.Date;
var today = DateTime.Today;
Expand Down Expand Up @@ -109,5 +110,14 @@
</div>
</div>
</div>
<div class="card-provider-details @cardStyle"></div>
@if (providerExists)
{
<div class="card-provider-details">
@ProviderHelper.GetProviderString(Model.Item2.Providers.FirstOrDefault().Name)
</div>
}
else
{
<div class="card-provider-details @cardStyle"></div>
}
</div>
5 changes: 4 additions & 1 deletion LearningHub.Nhs.WebUI/Views/MyLearning/Certificates.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,10 @@
</form>
</div>
</div>

<div class="filter-summary">
<partial name="_CertificateFilterSummary" model="@Model" />
</div>
<hr class="nhsuk-u-margin-top-0 nhsuk-u-margin-bottom-0" />
<div class="nhsuk-u-padding-bottom-4">
<hr class="nhsuk-section-break nhsuk-section-break--visible">
</div>
Expand Down
Loading
Loading