diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml index 832bc47a..88e11b91 100644 --- a/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml @@ -76,17 +76,6 @@
} - @if (item.Providers?.Count > 0) - { -
- @ProviderHelper.GetProviderString(item.Providers.FirstOrDefault().Name) -
- } - else - { -
- } -

@@ -132,6 +121,16 @@

+ @if (item.Providers?.Count > 0) + { +
+ @ProviderHelper.GetProviderString(item.Providers.FirstOrDefault().Name) +
+ } + else + { +
+ } diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogueSearch.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogueSearch.cshtml index dab2977f..379cffa6 100644 --- a/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogueSearch.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogueSearch.cshtml @@ -62,17 +62,6 @@
} - @if (item.Providers?.Count > 0) - { -
- @ProviderHelper.GetProviderString(item.Providers.FirstOrDefault().Name) -
- } - else - { -
- } -

@@ -119,6 +108,16 @@

+ @if (item.Providers?.Count > 0) + { +
+ @ProviderHelper.GetProviderString(item.Providers.FirstOrDefault().Name) +
+ } + else + { +
+ } diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml index af1ecfab..486a6b62 100644 --- a/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml @@ -15,7 +15,7 @@ var suggestedTerm = Model.DidYouMeanEnabled ? Model.SuggestedCatalogue : searhTerm; string GetCatalogueUrl(string catalogueUrl, SearchClickPayloadModel list, int catalogueId) - { + { string encodedCatalogueUrl = HttpUtility.UrlEncode("/Catalogue/" + catalogueUrl); string searchSignalQueryEncoded = HttpUtility.UrlEncode(HttpUtility.UrlDecode(list?.SearchSignal?.Query)); string groupId = HttpUtility.UrlEncode(Model.GroupId.ToString()); @@ -24,125 +24,124 @@ &GroupId={groupId}&searchId={list?.SearchSignal.SearchId}&timeOfSearch={list?.SearchSignal.TimeOfSearch}&userQuery={HttpUtility.UrlEncode(list?.SearchSignal?.UserQuery)} &query={searchSignalQueryEncoded}&name={list?.DocumentFields?.Name}"; return url; - } + } } -@section styles{ - +@section styles { + }
- @if (hasSearchTerm) - { - var parms = new Dictionary { { "term", searhTerm } }; - - } - else - { - - } -

- @(hasSearchTerm ? $"Search results for {suggestedTerm}" : "All catalogues") -

- -

- @($"{Model.TotalCount} catalogue results") -

- - -
    - - @foreach (var item in Model.Catalogues) + @if (hasSearchTerm) { -
  • - -
    - -
    - @if (!string.IsNullOrWhiteSpace(item.CardImageUrl)) - { - @item.Name - } - else if (!string.IsNullOrWhiteSpace(item.BannerUrl)) - { - @item.Name - } - else - { -
    - } -
    - @if (item.Providers?.Count > 0) - { -
    - @ProviderHelper.GetProviderString(item.Providers.FirstOrDefault().Name) -
    - } - else - { -
    - } - -
    - -

    - @item.Name -

    - -
    -
    - @Html.Raw(item.Description) -
    - -
    -
    -
    - @if (item.RestrictedAccess) + var parms = new Dictionary { { "term", searhTerm } }; + + } + else + { + + } +

    + @(hasSearchTerm ? $"Search results for {suggestedTerm}" : "All catalogues") +

    + +

    + @($"{Model.TotalCount} catalogue results") +

    + + +
      + + @foreach (var item in Model.Catalogues) + { +
    • + +
      + +
      + @if (!string.IsNullOrWhiteSpace(item.CardImageUrl)) + { + @item.Name + } + else if (!string.IsNullOrWhiteSpace(item.BannerUrl)) + { + @item.Name + } + else + { +
      + } +
      +
      + +

      + @item.Name +

      + +
      +
      + @Html.Raw(item.Description) +
      + +
      +
      +
      + @if (item.RestrictedAccess) + { +
      @((item.HasAccess || this.User.IsInRole("Administrator")) ? "Access Granted" : "Access restricted")
      + } +
      + +
      +
      + @if (item.Providers?.Count > 0) + { + var provider = item.Providers.First(); + @provider.Name catalogue badge + } + else if (!string.IsNullOrEmpty(item.BadgeUrl)) + { + Provider's catalogue badge + } +
      +
      +
      +
      + @if (item.Providers?.Count > 0) { -
      @((item.HasAccess || this.User.IsInRole("Administrator")) ? "Access Granted" : "Access restricted")
      +
      + @ProviderHelper.GetProviderString(item.Providers.FirstOrDefault().Name) +
      } -
      - -
    -
    - @if (item.Providers?.Count > 0) + else { - var provider = item.Providers.First(); - @provider.Name catalogue badge +
    } - else if (!string.IsNullOrEmpty(item.BadgeUrl)) - { - Provider's catalogue badge - }
    -
    -
    -
    -
    -
    • + + } +
+ + @if (Model.TotalCount > 9) + { + var currentPage = this.ViewBag.PageIndex; + int totalPage = (Model.TotalCount / 9) + (Model.TotalCount % 9 == 0 ? 0 : 1); + var searchQueryParam = hasSearchTerm ? $"&term={searhTerm}" : string.Empty; + var prevUrl = $"/catalogues?pageindex={currentPage - 1}{searchQueryParam}"; + var nextUrl = $"/catalogues?pageindex={currentPage + 1}{searchQueryParam}"; + + @await Html.PartialAsync("_Pagination", new PaginationViewModel(currentPage, totalPage, prevUrl, nextUrl)) } - - - @if (Model.TotalCount > 9) - { - var currentPage = this.ViewBag.PageIndex; - int totalPage = (Model.TotalCount / 9) + (Model.TotalCount % 9 == 0 ? 0 : 1); - var searchQueryParam = hasSearchTerm ? $"&term={searhTerm}" : string.Empty; - var prevUrl = $"/catalogues?pageindex={currentPage - 1}{searchQueryParam}"; - var nextUrl = $"/catalogues?pageindex={currentPage + 1}{searchQueryParam}"; - - @await Html.PartialAsync("_Pagination", new PaginationViewModel(currentPage, totalPage, prevUrl, nextUrl)) - }
\ No newline at end of file diff --git a/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml index 34155651..781c4210 100644 --- a/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml @@ -3,74 +3,73 @@ @using LearningHub.Nhs.WebUI.Helpers @model DashboardCatalogueViewModel @{ - bool providerExists = Model.Providers?.Count > 0; - string cardStyle = "card-provider-details--blank"; + bool providerExists = Model.Providers?.Count > 0; + string cardStyle = "card-provider-details--blank"; }
-
- @if (!string.IsNullOrWhiteSpace(Model.CardImageUrl)) - { - @Model.Name - } - else if (!string.IsNullOrWhiteSpace(Model.BannerUrl)) +
+ @if (!string.IsNullOrWhiteSpace(Model.CardImageUrl)) + { + @Model.Name + } + else if (!string.IsNullOrWhiteSpace(Model.BannerUrl)) + { + @Model.Name + } + else + { +
+ } +
+
+

+ @Model.Name +

+
+
+ @UtilityHelper.StripHtmlFromString(Model.Description) +
+ +
+
+
+ @if (Model.RestrictedAccess) + { +
@((Model.HasAccess || this.User.IsInRole("Administrator")) ? "Access granted" : "Access restricted")
+ } +
+ +
+
+ @if (providerExists) + { + var provider = @Model.Providers.First(); + @provider.Name catalogue badge + } + else if (!string.IsNullOrEmpty(Model.BadgeUrl)) + { + Provider's catalogue badge + } +
+
+
+
+ @if (providerExists) { - @Model.Name +
+ @ProviderHelper.GetProviderString(Model.Providers.FirstOrDefault().Name) +
} else { -
+
} -
- @if (providerExists) - { -
- @ProviderHelper.GetProviderString(Model.Providers.FirstOrDefault().Name) -
- } - else - { -
- } - -
-

- @Model.Name -

-
-
- @UtilityHelper.StripHtmlFromString(Model.Description) -
- -
-
-
- @if (Model.RestrictedAccess) - { -
@((Model.HasAccess || this.User.IsInRole("Administrator")) ? "Access granted" : "Access restricted")
- } -
- -
-
- @if (providerExists) - { - var provider = @Model.Providers.First(); - @provider.Name catalogue badge - } - else if (!string.IsNullOrEmpty(Model.BadgeUrl)) - { - Provider's catalogue badge - } -
-
-
-
\ No newline at end of file diff --git a/LearningHub.Nhs.WebUI/Views/Home/_CertificateCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_CertificateCard.cshtml index ed6b78ec..b2716efb 100644 --- a/LearningHub.Nhs.WebUI/Views/Home/_CertificateCard.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Home/_CertificateCard.cshtml @@ -80,5 +80,5 @@ - @*
*@ +
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_CourseEnrolled.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_CourseEnrolled.cshtml index a7351226..da0e9bdb 100644 --- a/LearningHub.Nhs.WebUI/Views/Home/_CourseEnrolled.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Home/_CourseEnrolled.cshtml @@ -32,16 +32,6 @@
} - @if (providerExists) - { -
-
- } - else - { -
- } -

@Model.DisplayName @@ -106,4 +96,13 @@

+ @if (providerExists) + { +
+
+ } + else + { +
+ } \ No newline at end of file diff --git a/LearningHub.Nhs.WebUI/Views/Home/_LearningActivityCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_LearningActivityCard.cshtml index f34c22c3..28e33f82 100644 --- a/LearningHub.Nhs.WebUI/Views/Home/_LearningActivityCard.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Home/_LearningActivityCard.cshtml @@ -109,5 +109,5 @@ - @*
*@ +
\ No newline at end of file diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml index 8b06fb2a..311c1238 100644 --- a/LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml +++ b/LearningHub.Nhs.WebUI/Views/MyLearning/Index.cshtml @@ -86,7 +86,10 @@ - +
+ +
+
diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/LearningHistory.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/LearningHistory.cshtml index 1ff1f7c7..5f9e7dee 100644 --- a/LearningHub.Nhs.WebUI/Views/MyLearning/LearningHistory.cshtml +++ b/LearningHub.Nhs.WebUI/Views/MyLearning/LearningHistory.cshtml @@ -156,7 +156,10 @@
- +
+ +
+
diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/_LearningFilterSummary.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/_LearningFilterSummary.cshtml new file mode 100644 index 00000000..03ee1092 --- /dev/null +++ b/LearningHub.Nhs.WebUI/Views/MyLearning/_LearningFilterSummary.cshtml @@ -0,0 +1,125 @@ +@using LearningHub.Nhs.Models.Enums +@using LearningHub.Nhs.WebUI.Helpers +@using LearningHub.Nhs.WebUI.Models +@using LearningHub.Nhs.WebUI.Models.Learning; +@model MyLearningUserActivitiesViewModel; +@{ + string statusFilter = "Status: "; + string certificateFilter = string.Empty; + string typeFilter = "Type: "; + string filtersummary = string.Empty; + + @if (Model.CertificateEnabled) + { + certificateFilter = $"Certificates: Certificate"; + } + @if (Model.Complete) + { + filtersummary = filtersummary + $" Completed"; + } + @if (Model.Incomplete) + { + filtersummary = filtersummary + $" In progress"; + } + @if (Model.Passed) + { + filtersummary = filtersummary + $" Passed"; + } + @if (Model.Failed) + { + filtersummary = filtersummary + $" Failed"; + } + @if (Model.Downloaded) + { + filtersummary = filtersummary + $" Downloaded"; + } + @if (Model.Viewed) + { + filtersummary = filtersummary + $" Viewed"; + } + @if (Model.Launched) + { + filtersummary = filtersummary + $" Launched"; + } + @if (string.IsNullOrWhiteSpace(filtersummary)) + { + statusFilter = string.Empty; + } + else + { + statusFilter = statusFilter + filtersummary; + filtersummary = string.Empty; + } + + @if (Model.Article) + { + filtersummary = filtersummary + $" Article"; + } + @if (Model.Assessment) + { + filtersummary = filtersummary + $" Assessment"; + } + @if (Model.Audio) + { + filtersummary = filtersummary + $" Audio"; + } + @if (Model.Case) + { + filtersummary = filtersummary + $" Case"; + } + @if (Model.Elearning) + { + filtersummary = filtersummary + $" elearning"; + } + @if (Model.Html) + { + filtersummary = filtersummary + $" HTML"; + } + @if (Model.File) + { + filtersummary = filtersummary + $" File"; + } + @if (Model.Image) + { + filtersummary = filtersummary + $" Image"; + } + @if (Model.Video) + { + filtersummary = filtersummary + $" Video"; + } + @if (Model.Weblink) + { + filtersummary = filtersummary + $" Weblink"; + } + + @if (Model.Courses) + { + filtersummary = filtersummary + $" Courses"; + } + + @if (string.IsNullOrWhiteSpace(filtersummary)) + { + typeFilter = string.Empty; + } + else + { + typeFilter = typeFilter + filtersummary; + } + +} + +
+ @if (!string.IsNullOrWhiteSpace(statusFilter) || !string.IsNullOrWhiteSpace(statusFilter)) + { + Filtered by + } + @if (!string.IsNullOrWhiteSpace(statusFilter)) + { + @Html.Raw(statusFilter) + } + @if (!string.IsNullOrWhiteSpace(typeFilter)) + { + @Html.Raw(typeFilter) + } +
+ diff --git a/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml index 55b29741..e3c6d3ac 100644 --- a/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml @@ -22,105 +22,105 @@ &GroupId={groupId}&searchId={searchSignal?.SearchId}&timeOfSearch={searchSignal?.TimeOfSearch}&userQuery={HttpUtility.UrlEncode(searchSignal?.UserQuery)} &query={searchSignalQueryEncoded}&name={payload?.DocumentFields?.Name}"; return url; - } + } } @if (pagingModel.TotalPages > 1) { - @await Html.PartialAsync("_CataloguePagination", Model) + @await Html.PartialAsync("_CataloguePagination", Model) -
- View all catalogues -
+
+ View all catalogues +
} @if (catalogueResult.DocumentModel != null) { - var index = pagingModel.CurrentPage * pagingModel.PageSize; - } \ No newline at end of file diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/DashboardService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/DashboardService.cs index 94685100..fddd94c6 100644 --- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/DashboardService.cs +++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/DashboardService.cs @@ -324,7 +324,7 @@ public async Task GetUserCertificateDet var allCertificates = resourceCertificates.Concat(mappedCourseCertificates); - var allowedTypeIds = new List { 6 }; + var allowedTypeIds = new List { 6,13 }; allCertificates = allCertificates.Where(c => allowedTypeIds.Contains(c.ResourceTypeId));