diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml index 4a62262bc..c3dbb7e45 100644 --- a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml @@ -34,15 +34,6 @@ return string.Empty; } - string GetBadgeUrl() - { - if (!string.IsNullOrEmpty(Model.Catalogue.BadgeUrl)) - { - return GetFileLink(Model.Catalogue.BadgeUrl); - } - return string.Empty; - } - string GetFileLink(string fileName) { return "/api/catalogue/download-image/" + Uri.EscapeDataString(fileName); @@ -82,6 +73,9 @@ CatalogueAccessRequest = Model.CatalogueAccessRequest, UserGroups = Model.UserGroups }; + + var provider = Model.Catalogue.Providers?.FirstOrDefault(); + var hasBadge = !string.IsNullOrWhiteSpace(Model.Catalogue.BadgeUrl); } @section styles{ @@ -124,9 +118,13 @@ }
- @if (!string.IsNullOrEmpty(Model.Catalogue.BadgeUrl)) + @if (provider != null) + { + @provider.Name catalogue badge + } + else if (hasBadge) { - Provider's catalogue badge + Provider's catalogue badgeTest }

@(ViewBag.ActiveTab == "browse" && Model.NodeDetails != null ? Model.NodeDetails.Name : Model.Catalogue.Name)

diff --git a/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs b/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs index a074e2b99..bf47b2e6d 100644 --- a/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs +++ b/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs @@ -198,6 +198,7 @@ public async Task GetCatalogueAsync(string reference, int us var bookmark = this.bookmarkRepository.GetAll().Where(b => b.NodeId == catalogue.NodeId && b.UserId == userId).FirstOrDefault(); catalogueVM.BookmarkId = bookmark?.Id; catalogueVM.IsBookmarked = !bookmark?.Deleted ?? false; + catalogueVM.Providers = await this.providerService.GetByCatalogueVersionIdAsync(catalogueVM.Id); return catalogueVM; } diff --git a/WebAPI/LearningHub.Nhs.Services/DashboardService.cs b/WebAPI/LearningHub.Nhs.Services/DashboardService.cs index e4d5fb1bc..2da064c3e 100644 --- a/WebAPI/LearningHub.Nhs.Services/DashboardService.cs +++ b/WebAPI/LearningHub.Nhs.Services/DashboardService.cs @@ -51,6 +51,15 @@ public async Task GetMyAccessLearnings(str var cataloguesResponse = dashboardType.ToLower() == "my-catalogues" ? this.catalogueNodeVersionRepository.GetCatalogues(dashboardType, pageNumber, userId) : (TotalCount: 0, Catalogues: new List()); + var catalogueList = cataloguesResponse.Catalogues.Any() ? this.mapper.Map>(cataloguesResponse.Catalogues) : new List(); + if (catalogueList.Any()) + { + foreach (var catalogue in catalogueList) + { + catalogue.Providers = await this.providerService.GetByCatalogueVersionIdAsync(catalogue.NodeVersionId); + } + } + var resourceList = resources.Any() ? this.mapper.Map>(resources) : new List(); if (resourceList.Any()) { @@ -64,7 +73,7 @@ public async Task GetMyAccessLearnings(str { Type = dashboardType, Resources = resourceList, - Catalogues = cataloguesResponse.Catalogues.Any() ? this.mapper.Map>(cataloguesResponse.Catalogues) : new List(), + Catalogues = catalogueList, TotalCount = dashboardType.ToLower() == "my-catalogues" ? cataloguesResponse.TotalCount : resourceCount, CurrentPage = pageNumber, };