diff --git a/.github/azure-pipeline-database-ci.yml b/.github/azure-pipeline-database-ci.yml index 827fa3977..db055c665 100644 --- a/.github/azure-pipeline-database-ci.yml +++ b/.github/azure-pipeline-database-ci.yml @@ -1,7 +1,13 @@ trigger: branches: - include: - - CI + exclude: + - '*' + +pr: + branches: + exclude: + - '*' + resources: repositories: - repository: self @@ -12,6 +18,7 @@ jobs: displayName: Agent job pool: vmImage: windows-2019 + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/CI')) steps: - checkout: self clean: true diff --git a/.github/azure-pipeline-openapi-reportapi-ci.yml b/.github/azure-pipeline-openapi-reportapi-ci.yml index fe44998ce..1b10679e6 100644 --- a/.github/azure-pipeline-openapi-reportapi-ci.yml +++ b/.github/azure-pipeline-openapi-reportapi-ci.yml @@ -8,12 +8,14 @@ trigger: branches: include: - CI + exclude: + - '*' name: $(date:yyyyMMdd)$(rev:.r) resources: repositories: - repository: self type: git - ref: refs/heads/RC + ref: refs/heads/CI jobs: - job: Job_1 displayName: Agent job diff --git a/.github/azure-pipeline-webui-ci.yml b/.github/azure-pipeline-webui-ci.yml index 936677328..21d9d6ddc 100644 --- a/.github/azure-pipeline-webui-ci.yml +++ b/.github/azure-pipeline-webui-ci.yml @@ -4,10 +4,7 @@ variables: value: '**/*.csproj' - name: BuildParameters.TestProjects value: '**/*[Tt]ests/*.csproj' -trigger: - branches: - include: - - CI +# Triggered Via Azure pipeline name: $(date:yyyyMMdd)$(rev:.r) resources: repositories: diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Configuration/FileUploadSettingsModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Configuration/FileUploadSettingsModel.cs index 4232a6269..751f0ee45 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Configuration/FileUploadSettingsModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Configuration/FileUploadSettingsModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Configuration +namespace LearningHub.Nhs.AdminUI.Configuration { /// /// Defines the . diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs b/AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs index 0e9d025c3..ace067941 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Configuration +namespace LearningHub.Nhs.AdminUI.Configuration { using System; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/AuthorisationController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/AuthorisationController.cs index df8cbd9af..3f56b78dc 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/AuthorisationController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/AuthorisationController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using Microsoft.AspNetCore.Mvc; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/BaseController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/BaseController.cs index 7f24f6400..90fd149ce 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/BaseController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/BaseController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Hosting; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CacheController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CacheController.cs index 411d342b4..a8b1e94c5 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CacheController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CacheController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using System.Threading.Tasks; using LearningHub.Nhs.AdminUI.Interfaces; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CatalogueController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CatalogueController.cs index 3b27f9aed..d03f1f84c 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CatalogueController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CatalogueController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using System; using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CmsController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CmsController.cs index 8dbc83845..0f04eafaf 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CmsController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/CmsController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ExternalSystemController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ExternalSystemController.cs index e20a8ca56..97d19066c 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ExternalSystemController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ExternalSystemController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using System; using System.Linq; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/FileController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/FileController.cs index 822773c76..1892ebb4f 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/FileController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/FileController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using System.Threading.Tasks; using LearningHub.Nhs.AdminUI.Interfaces; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/HomeController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/HomeController.cs index 8d6dea8ed..8052e9703 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/HomeController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/HomeController.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.AdminUI.Controllers { using System; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/LogController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/LogController.cs index 6d5c997c0..fc6d7a7d1 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/LogController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/LogController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using System.Collections.Generic; using System.Linq; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/LogoutController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/LogoutController.cs index a7727c0d4..2ec4929d4 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/LogoutController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/LogoutController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using System; using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/MediaController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/MediaController.cs index 264dd30c2..296d2e5d6 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/MediaController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/MediaController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using System.Threading.Tasks; using Azure.Storage.Blobs.Models; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/NotificationsController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/NotificationsController.cs index 5cde412d1..7e3492a5d 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/NotificationsController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/NotificationsController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using System; using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ReleaseController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ReleaseController.cs index ef3a43b05..86c3b8cde 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ReleaseController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ReleaseController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using System.Linq; using System.Threading.Tasks; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs index af0dd4d7b..91c5052af 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using System; using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceSyncController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceSyncController.cs index e48302b2e..b250113bd 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceSyncController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceSyncController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using System.Threading.Tasks; using LearningHub.Nhs.AdminUI.Interfaces; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/RoadmapController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/RoadmapController.cs index 668b382d8..319c8938c 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/RoadmapController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/RoadmapController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using System; using System.Linq; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/UserController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/UserController.cs index 0f76ae614..14fee0208 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/UserController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/UserController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using System; using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/UserGroupController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/UserGroupController.cs index 9fbfecbf8..3a27787f4 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/UserGroupController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/UserGroupController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers +namespace LearningHub.Nhs.AdminUI.Controllers { using System; using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/BaseApiController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/BaseApiController.cs index c24782968..146163269 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/BaseApiController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/BaseApiController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers.Api +namespace LearningHub.Nhs.AdminUI.Controllers.Api { using LearningHub.Nhs.Models.Extensions; using Microsoft.AspNetCore.Mvc; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/ContentController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/ContentController.cs index 1b21e95fe..aa2df23b1 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/ContentController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/ContentController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System; using System.Configuration; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/HierarchyController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/HierarchyController.cs index 1da7015cf..7833c08e2 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/HierarchyController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/HierarchyController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Collections.Generic; using System.Linq; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/MediaManifestProxyController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/MediaManifestProxyController.cs index 3e6b0a8ca..2cf327f6e 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/MediaManifestProxyController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/MediaManifestProxyController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Controllers.Api +namespace LearningHub.Nhs.AdminUI.Controllers.Api { using System; using System.Globalization; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Extensions/ClaimsPrincipalExtensions.cs b/AdminUI/LearningHub.Nhs.AdminUI/Extensions/ClaimsPrincipalExtensions.cs index bf96022dc..e7c7f0fc6 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Extensions/ClaimsPrincipalExtensions.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Extensions/ClaimsPrincipalExtensions.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Extensions +namespace LearningHub.Nhs.AdminUI.Extensions { using System; using System.Security.Claims; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Extensions/PagingRequestModelExtensions.cs b/AdminUI/LearningHub.Nhs.AdminUI/Extensions/PagingRequestModelExtensions.cs index 793cbfa9e..78445e061 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Extensions/PagingRequestModelExtensions.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Extensions/PagingRequestModelExtensions.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Extensions +namespace LearningHub.Nhs.AdminUI.Extensions { using System; using LearningHub.Nhs.Models.Common.Enums; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Filters/CheckInitialLogonFilter.cs b/AdminUI/LearningHub.Nhs.AdminUI/Filters/CheckInitialLogonFilter.cs index 83e61f075..3e07e56f7 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Filters/CheckInitialLogonFilter.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Filters/CheckInitialLogonFilter.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Filters +namespace LearningHub.Nhs.AdminUI.Filters { using System.Threading.Tasks; using LearningHub.Nhs.AdminUI.Helpers; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ImportModelStateAttribute.cs b/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ImportModelStateAttribute.cs index 23e255d36..dbaf67ce8 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ImportModelStateAttribute.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ImportModelStateAttribute.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Filters.PRG +namespace LearningHub.Nhs.AdminUI.Filters.PRG { using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ModelStateHelpers.cs b/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ModelStateHelpers.cs index d1a5b970f..54fd162a9 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ModelStateHelpers.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ModelStateHelpers.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Filters.PRG +namespace LearningHub.Nhs.AdminUI.Filters.PRG { using System.Collections.Generic; using System.Linq; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ModelStateTransfer.cs b/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ModelStateTransfer.cs index af96db8d7..7a9cdcf25 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ModelStateTransfer.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ModelStateTransfer.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Filters.PRG +namespace LearningHub.Nhs.AdminUI.Filters.PRG { using Microsoft.AspNetCore.Mvc.Filters; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ModelStateTransferValue.cs b/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ModelStateTransferValue.cs index c6284b230..c4c019c26 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ModelStateTransferValue.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Filters/PRG/ModelStateTransferValue.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Filters.PRG +namespace LearningHub.Nhs.AdminUI.Filters.PRG { using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Handlers/CookieEventHandler.cs b/AdminUI/LearningHub.Nhs.AdminUI/Handlers/CookieEventHandler.cs index 3bb049ec3..fee3b1f2d 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Handlers/CookieEventHandler.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Handlers/CookieEventHandler.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Handlers +namespace LearningHub.Nhs.AdminUI.Handlers { using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Handlers/LogoutUserManager.cs b/AdminUI/LearningHub.Nhs.AdminUI/Handlers/LogoutUserManager.cs index e69eef113..b3fc5d155 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Handlers/LogoutUserManager.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Handlers/LogoutUserManager.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Handlers +namespace LearningHub.Nhs.AdminUI.Handlers { using System.Collections.Generic; using System.Linq; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/ILearningHubApiFacade.cs b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/ILearningHubApiFacade.cs index aef67ac1e..0a653eb9a 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/ILearningHubApiFacade.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/ILearningHubApiFacade.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Helpers +namespace LearningHub.Nhs.AdminUI.Helpers { using System.Threading.Tasks; using LearningHub.Nhs.Models.Common; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/IUserSessionHelper.cs b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/IUserSessionHelper.cs index f630a84bb..57e80c472 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/IUserSessionHelper.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/IUserSessionHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Helpers +namespace LearningHub.Nhs.AdminUI.Helpers { using System.Threading.Tasks; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs index fc22bc3b9..b7646146e 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Helpers +namespace LearningHub.Nhs.AdminUI.Helpers { using System; using System.Collections.Generic; @@ -132,7 +128,7 @@ public static string GetResourceTypeVerb(this MyLearningDetailedItemViewModel my /// The . public static string GetActivityStatusDisplayText(this MyLearningDetailedItemViewModel myLearningDetailedItemViewModel) { - if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched + if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed && (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Article || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.WebLink || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Image @@ -141,7 +137,7 @@ public static string GetActivityStatusDisplayText(this MyLearningDetailedItemVie { return "Completed"; } - else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched + else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed && (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.GenericFile)) { return "Downloaded"; @@ -168,36 +164,33 @@ public static string GetActivityStatusDisplayText(this MyLearningDetailedItemVie /// /// The myLearningDetailedItemViewModel. /// The . - public static ActivityStatusEnum GetActivityStatus(this MyLearningDetailedItemViewModel myLearningDetailedItemViewModel) + public static string GetActivityStatus(this MyLearningDetailedItemViewModel myLearningDetailedItemViewModel) { - if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched + if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed && (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Article - || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.WebLink || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Image || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Html || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Case)) { - return ActivityStatusEnum.Completed; + return "Viewed"; } - else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched - && (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.GenericFile)) + else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed + && (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.WebLink)) { - return ActivityStatusEnum.Downloaded; + return "Launched"; } - else if (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment) + else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed + && (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.GenericFile)) { - if (myLearningDetailedItemViewModel.Complete) - { - return myLearningDetailedItemViewModel.ScorePercentage >= myLearningDetailedItemViewModel.AssessmentDetails.PassMark ? ActivityStatusEnum.Passed : ActivityStatusEnum.Failed; - } - else - { - return myLearningDetailedItemViewModel.ScorePercentage >= myLearningDetailedItemViewModel.AssessmentDetails.PassMark ? ActivityStatusEnum.Passed : ActivityStatusEnum.InProgress; - } + return ActivityStatusEnum.Downloaded.ToString(); + } + else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Incomplete) + { + return ActivityStatusEnum.InProgress.ToString(); } else { - return myLearningDetailedItemViewModel.ActivityStatus; + return myLearningDetailedItemViewModel.ActivityStatus.ToString(); } } diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningHubApiFacade.cs b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningHubApiFacade.cs index 78eb108dc..344fcee20 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningHubApiFacade.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningHubApiFacade.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Helpers +namespace LearningHub.Nhs.AdminUI.Helpers { using System; using System.Net.Http; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/ResourceAccessiblityHelper.cs b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/ResourceAccessiblityHelper.cs index b0ec383f0..c5c06a228 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/ResourceAccessiblityHelper.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/ResourceAccessiblityHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Helpers +namespace LearningHub.Nhs.AdminUI.Helpers { using LearningHub.Nhs.Models.Enums; using Microsoft.AspNetCore.Mvc.Rendering; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/UserRoleHelper.cs b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/UserRoleHelper.cs index 70277bffb..f97668fb4 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/UserRoleHelper.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/UserRoleHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Helpers +namespace LearningHub.Nhs.AdminUI.Helpers { using Microsoft.AspNetCore.Mvc.Rendering; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/UserSessionHelper.cs b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/UserSessionHelper.cs index 977b27fbb..017142501 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Helpers/UserSessionHelper.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Helpers/UserSessionHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Helpers +namespace LearningHub.Nhs.AdminUI.Helpers { using System.Threading.Tasks; using elfhHub.Nhs.Models.Common; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IAzureMediaService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IAzureMediaService.cs index 080d2f6cc..0020359a4 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IAzureMediaService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IAzureMediaService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Threading.Tasks; using Azure.Storage.Blobs.Models; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/ICatalogueService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/ICatalogueService.cs index 1961a1c73..f6bffaec9 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/ICatalogueService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/ICatalogueService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IContentService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IContentService.cs index 5bfad52ed..64e3bf732 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IContentService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IContentService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Threading.Tasks; using LearningHub.Nhs.AdminUI.Models; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IEventService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IEventService.cs index 5cf6ef4d2..82b2d6751 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IEventService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IEventService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Threading.Tasks; using LearningHub.Nhs.Models.Entities.Analytics; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IExternalSystemService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IExternalSystemService.cs index 1432f1072..bd5c5dbd4 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IExternalSystemService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IExternalSystemService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Threading.Tasks; using LearningHub.Nhs.Models.Common; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IFileService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IFileService.cs index 76e9438a2..3d8a80b92 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IFileService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IFileService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.IO; using System.Threading.Tasks; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IHierarchyService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IHierarchyService.cs index 0cb5d1a91..8d5eb7f23 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IHierarchyService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IHierarchyService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IInternalSystemService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IInternalSystemService.cs index b7c9bebd4..10814c967 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IInternalSystemService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IInternalSystemService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/ILearningHubHttpClient.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/ILearningHubHttpClient.cs index 394473a3e..1becee48c 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/ILearningHubHttpClient.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/ILearningHubHttpClient.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Net.Http; using System.Threading.Tasks; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/ILogService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/ILogService.cs index cfe1bf606..7ae5ab3c4 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/ILogService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/ILogService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Threading.Tasks; using LearningHub.Nhs.Models.Common; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/INotificationService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/INotificationService.cs index 0293e4d00..ec2bc84d1 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/INotificationService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/INotificationService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Threading.Tasks; using LearningHub.Nhs.Models.Common; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IProviderService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IProviderService.cs index 53216dcd0..27d2788a1 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IProviderService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IProviderService.cs @@ -1,5 +1,5 @@ -// -// Copyright (c) HEE.nhs.uk. +// +// Copyright (c) NHS England. // namespace LearningHub.Nhs.AdminUI.Interfaces { diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IResourceService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IResourceService.cs index e682b6b5f..826c98b55 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IResourceService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IResourceService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IResourceSyncService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IResourceSyncService.cs index d762b9cd8..467e96528 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IResourceSyncService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IResourceSyncService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IRoadmapService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IRoadmapService.cs index 90e89780e..cb96b6037 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IRoadmapService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IRoadmapService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IRoleService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IRoleService.cs index 988b1fffa..026315c8d 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IRoleService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IRoleService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IUserApiHttpClient.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IUserApiHttpClient.cs index 3ac3cb600..1697093fa 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IUserApiHttpClient.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IUserApiHttpClient.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Net.Http; using System.Threading.Tasks; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IUserGroupService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IUserGroupService.cs index b2aad1f8a..ef3bc08f7 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IUserGroupService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IUserGroupService.cs @@ -1,5 +1,5 @@ -// -// Copyright (c) HEE.nhs.uk. +// +// Copyright (c) NHS England. // namespace LearningHub.Nhs.AdminUI.Interfaces { diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IUserService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IUserService.cs index 581b54e4d..ac7bfc690 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IUserService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IUserService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Interfaces +namespace LearningHub.Nhs.AdminUI.Interfaces { using System.Threading.Tasks; using elfhHub.Nhs.Models.Common; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj index 89241ab9f..cd2e8ab82 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj +++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj @@ -89,7 +89,7 @@ - + diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Middleware/ExceptionMiddleware.cs b/AdminUI/LearningHub.Nhs.AdminUI/Middleware/ExceptionMiddleware.cs index c96934b17..a953e16e5 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Middleware/ExceptionMiddleware.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Middleware/ExceptionMiddleware.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Middleware +namespace LearningHub.Nhs.AdminUI.Middleware { using System; using System.Net; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Middleware/NLogMiddleware.cs b/AdminUI/LearningHub.Nhs.AdminUI/Middleware/NLogMiddleware.cs index cbe57bb15..943be148e 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Middleware/NLogMiddleware.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Middleware/NLogMiddleware.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Middleware +namespace LearningHub.Nhs.AdminUI.Middleware { using System.Threading.Tasks; using LearningHub.Nhs.Models.Extensions; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Middleware/TimezoneInfoMiddleware.cs b/AdminUI/LearningHub.Nhs.AdminUI/Middleware/TimezoneInfoMiddleware.cs index a38ae7b0f..8a7502cb7 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Middleware/TimezoneInfoMiddleware.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Middleware/TimezoneInfoMiddleware.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Middleware +namespace LearningHub.Nhs.AdminUI.Middleware { using System.Threading.Tasks; using LearningHub.Nhs.AdminUI.Extensions; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/CatalogueAdminPageViewModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/CatalogueAdminPageViewModel.cs index dee046a17..b1f2c3244 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/CatalogueAdminPageViewModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/CatalogueAdminPageViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Models +namespace LearningHub.Nhs.AdminUI.Models { using LearningHub.Nhs.Models.Catalogue; using LearningHub.Nhs.Models.Paging; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/CatalogueNavViewModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/CatalogueNavViewModel.cs index 995179de5..502206549 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/CatalogueNavViewModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/CatalogueNavViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Models +namespace LearningHub.Nhs.AdminUI.Models { /// /// Defines the CatalogueNavPage. diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs index bc0d0e15c..377771ff4 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/ContactViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Models +namespace LearningHub.Nhs.AdminUI.Models { using System.ComponentModel.DataAnnotations; using LearningHub.Nhs.Models.Binders; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/ErrorViewModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/ErrorViewModel.cs index ed1f78f43..9259de0b8 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/ErrorViewModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/ErrorViewModel.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.AdminUI.Models { /// diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/FileChunkProcessModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/FileChunkProcessModel.cs index 82bd84a15..b811df071 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/FileChunkProcessModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/FileChunkProcessModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Models +namespace LearningHub.Nhs.AdminUI.Models { /// /// Defines the . diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/FileChunkRegisterModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/FileChunkRegisterModel.cs index 05b79904f..f7581b105 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/FileChunkRegisterModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/FileChunkRegisterModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Models +namespace LearningHub.Nhs.AdminUI.Models { /// /// Defines the . diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/FileChunkUploadResult.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/FileChunkUploadResult.cs index f8be0441c..34d694e86 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/FileChunkUploadResult.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/FileChunkUploadResult.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Models +namespace LearningHub.Nhs.AdminUI.Models { /// /// Defines the . diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/FileUploadResult.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/FileUploadResult.cs index 9c47a93fc..818119922 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/FileUploadResult.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/FileUploadResult.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Models +namespace LearningHub.Nhs.AdminUI.Models { using LearningHub.Nhs.Models.Enums; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/FileUploadTypeEnum.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/FileUploadTypeEnum.cs index f25627137..53ebc94b3 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/FileUploadTypeEnum.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/FileUploadTypeEnum.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Models +namespace LearningHub.Nhs.AdminUI.Models { /// /// Defines the FileUploadTypeEnum. diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/FileUploadValidationModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/FileUploadValidationModel.cs index b9f99b96c..24950d8e8 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/FileUploadValidationModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/FileUploadValidationModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Models +namespace LearningHub.Nhs.AdminUI.Models { using Microsoft.AspNetCore.Http; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/PagingOptionPair.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/PagingOptionPair.cs index fbb6e6bd0..239664ea7 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/PagingOptionPair.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/PagingOptionPair.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Models +namespace LearningHub.Nhs.AdminUI.Models { /// /// Defines the PagingOptionPair. diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/ResourceSyncSingleViewModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/ResourceSyncSingleViewModel.cs index 2ba0a101f..5be62ed4d 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/ResourceSyncSingleViewModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/ResourceSyncSingleViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Models +namespace LearningHub.Nhs.AdminUI.Models { /// /// Defines the . diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/ResourceSyncViewModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/ResourceSyncViewModel.cs index 6f61e50dc..28d69b3bf 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/ResourceSyncViewModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/ResourceSyncViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Models +namespace LearningHub.Nhs.AdminUI.Models { using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/TenantViewModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/TenantViewModel.cs index 4b218a64a..adc04a8fd 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/TenantViewModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/TenantViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Models +namespace LearningHub.Nhs.AdminUI.Models { /// /// Defines the . diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/UpdateViewModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/UpdateViewModel.cs index 00b19682d..1aeb2fd86 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/UpdateViewModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/UpdateViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Models +namespace LearningHub.Nhs.AdminUI.Models { using System; using System.ComponentModel.DataAnnotations; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/UploadSettingsModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/UploadSettingsModel.cs index 0be4341c7..9a9bb4049 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/UploadSettingsModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/UploadSettingsModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Contribute +namespace LearningHub.Nhs.WebUI.Models.Contribute { using LearningHub.Nhs.AdminUI.Configuration; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Models/UserViewModel.cs b/AdminUI/LearningHub.Nhs.AdminUI/Models/UserViewModel.cs index 92a872eb2..0bac79cff 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Models/UserViewModel.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Models/UserViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Models +namespace LearningHub.Nhs.AdminUI.Models { using System; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Program.cs b/AdminUI/LearningHub.Nhs.AdminUI/Program.cs index b4ef6b323..2e14ef9d9 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Program.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Program.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -#pragma warning disable SA1200 // Using directives should be placed correctly +#pragma warning disable SA1200 // Using directives should be placed correctly using System; using LearningHub.Nhs.AdminUI; using LearningHub.Nhs.AdminUI.Middleware; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs b/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs index e4357ca04..3b1cd833f 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI +namespace LearningHub.Nhs.AdminUI { using System; using System.IdentityModel.Tokens.Jwt; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/AzureMediaService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/AzureMediaService.cs index e288d083f..b71e49d68 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/AzureMediaService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/AzureMediaService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System; using System.Globalization; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseHttpClient.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseHttpClient.cs index f4390c842..00cd33837 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseHttpClient.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseHttpClient.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System; using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseService.cs index 71d891521..ab2a377e8 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/BaseService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using LearningHub.Nhs.AdminUI.Interfaces; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/CatalogueService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/CatalogueService.cs index 2f5b4a004..1fa44df2b 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/CatalogueService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/CatalogueService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System.Collections.Generic; using System.Net; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/ContentService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/ContentService.cs index 34b43581e..d49cd8422 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/ContentService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/ContentService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System; using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/EventService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/EventService.cs index 49130cbe2..000fce940 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/EventService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/EventService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System; using System.Net.Http; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/ExternalSystemService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/ExternalSystemService.cs index 93d1fc879..094757b46 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/ExternalSystemService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/ExternalSystemService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System; using System.Net.Http; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/FileService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/FileService.cs index 3da1a0be9..7998020b6 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/FileService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/FileService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System; using System.IO; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/HierarchyService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/HierarchyService.cs index f457caeb0..b408cb637 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/HierarchyService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/HierarchyService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/InternalSystemService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/InternalSystemService.cs index 466a376eb..b4a23a074 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/InternalSystemService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/InternalSystemService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System; using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/LearningHubHttpClient.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/LearningHubHttpClient.cs index d1deeedcc..48ff81cb6 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/LearningHubHttpClient.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/LearningHubHttpClient.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System.Net.Http; using LearningHub.Nhs.AdminUI.Configuration; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/LogService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/LogService.cs index c0d4110b4..8aebbd7a4 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/LogService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/LogService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System; using System.Threading.Tasks; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/NotificationService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/NotificationService.cs index 92d9444de..adf69800c 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/NotificationService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/NotificationService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System; using System.Net.Http; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/OutputSanitizer.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/OutputSanitizer.cs index 44ba2324b..8fc4ebb9f 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/OutputSanitizer.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/OutputSanitizer.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using Ganss.XSS; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/ProviderService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/ProviderService.cs index 1e24ad11f..eeb6976f9 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/ProviderService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/ProviderService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System; using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/ResourceService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/ResourceService.cs index 11f8f8b20..d0d595b52 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/ResourceService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/ResourceService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System; using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/ResourceSyncService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/ResourceSyncService.cs index bf54f6599..1c90f227f 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/ResourceSyncService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/ResourceSyncService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System; using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/RoadmapService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/RoadmapService.cs index 79f4b72ed..bf4878d8b 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/RoadmapService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/RoadmapService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System; using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/RoleService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/RoleService.cs index 5ae57b372..7b435cca0 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/RoleService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/RoleService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System; using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserApiHttpClient.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserApiHttpClient.cs index 5496cf8e5..5af8f9bec 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserApiHttpClient.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserApiHttpClient.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System.Net.Http; using LearningHub.Nhs.AdminUI.Configuration; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs index bcf352698..45dff59de 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserGroupService.cs @@ -1,5 +1,5 @@ -// -// Copyright (c) HEE.nhs.uk. +// +// Copyright (c) NHS England. // namespace LearningHub.Nhs.AdminUI.Services { diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserService.cs index b50b02b78..7c64fd2c0 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Services/UserService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/UserService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.Services +namespace LearningHub.Nhs.AdminUI.Services { using System; using System.Collections.Generic; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/TagHelpers/ImageInputTagHelper.cs b/AdminUI/LearningHub.Nhs.AdminUI/TagHelpers/ImageInputTagHelper.cs index 46acb2207..a651925ef 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/TagHelpers/ImageInputTagHelper.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/TagHelpers/ImageInputTagHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.AdminUI.TagHelpers +namespace LearningHub.Nhs.AdminUI.TagHelpers { using System.Collections.Generic; using System.Linq; diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml index e47a5b66a..7dafcfd9b 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml +++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/User/_UserLearningRecord.cshtml @@ -81,36 +81,48 @@ - @if (LearningActivityHelper.GetActivityStatus(userLearningRecord) == ActivityStatusEnum.Completed) + @if (LearningActivityHelper.GetActivityStatus(userLearningRecord) == ActivityStatusEnum.Completed.ToString()) { Completed } - else if (LearningActivityHelper.GetActivityStatus(userLearningRecord) == ActivityStatusEnum.Passed) + else if (LearningActivityHelper.GetActivityStatus(userLearningRecord) == "Viewed") + { + + Viewed + + } + else if (LearningActivityHelper.GetActivityStatus(userLearningRecord) == ActivityStatusEnum.Passed.ToString()) { Passed } - else if (LearningActivityHelper.GetActivityStatus(userLearningRecord) == ActivityStatusEnum.Downloaded) + else if (LearningActivityHelper.GetActivityStatus(userLearningRecord) == ActivityStatusEnum.Downloaded.ToString()) { - + Downloaded } - else if (LearningActivityHelper.GetActivityStatus(userLearningRecord) == ActivityStatusEnum.InProgress) + else if (LearningActivityHelper.GetActivityStatus(userLearningRecord) == ActivityStatusEnum.InProgress.ToString()) { - Incomplete + In progress } - else if (LearningActivityHelper.GetActivityStatus(userLearningRecord) == ActivityStatusEnum.Failed) + else if (LearningActivityHelper.GetActivityStatus(userLearningRecord) == ActivityStatusEnum.Failed.ToString()) { Failed } + else if (LearningActivityHelper.GetActivityStatus(userLearningRecord) == ActivityStatusEnum.Launched.ToString()) + { + + Launched + + } diff --git a/LearningHub.Nhs.WebUI/Attributes/NoWhitespaceAttribute.cs b/LearningHub.Nhs.WebUI/Attributes/NoWhitespaceAttribute.cs index 492a10429..7e8e18f9f 100644 --- a/LearningHub.Nhs.WebUI/Attributes/NoWhitespaceAttribute.cs +++ b/LearningHub.Nhs.WebUI/Attributes/NoWhitespaceAttribute.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Attributes +namespace LearningHub.Nhs.WebUI.Attributes { using System.ComponentModel.DataAnnotations; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/Configuration/AzureBlobSettings.cs b/LearningHub.Nhs.WebUI/Configuration/AzureBlobSettings.cs index a91d3bb06..6d8a37b8e 100644 --- a/LearningHub.Nhs.WebUI/Configuration/AzureBlobSettings.cs +++ b/LearningHub.Nhs.WebUI/Configuration/AzureBlobSettings.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Configuration +namespace LearningHub.Nhs.WebUI.Configuration { /// /// Config AzureBlobSettings. diff --git a/LearningHub.Nhs.WebUI/Configuration/FindwiseSettings.cs b/LearningHub.Nhs.WebUI/Configuration/FindwiseSettings.cs index da389b90c..dcac6798d 100644 --- a/LearningHub.Nhs.WebUI/Configuration/FindwiseSettings.cs +++ b/LearningHub.Nhs.WebUI/Configuration/FindwiseSettings.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Configuration +namespace LearningHub.Nhs.WebUI.Configuration { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Configuration/LearningHubAuthServiceConfig.cs b/LearningHub.Nhs.WebUI/Configuration/LearningHubAuthServiceConfig.cs index 278cd2523..840291aa3 100644 --- a/LearningHub.Nhs.WebUI/Configuration/LearningHubAuthServiceConfig.cs +++ b/LearningHub.Nhs.WebUI/Configuration/LearningHubAuthServiceConfig.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Configuration +namespace LearningHub.Nhs.WebUI.Configuration { /// /// The learning hub auth service config. diff --git a/LearningHub.Nhs.WebUI/Configuration/OpenAthens.cs b/LearningHub.Nhs.WebUI/Configuration/OpenAthens.cs index dfa06724b..512773ecd 100644 --- a/LearningHub.Nhs.WebUI/Configuration/OpenAthens.cs +++ b/LearningHub.Nhs.WebUI/Configuration/OpenAthens.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Configuration +namespace LearningHub.Nhs.WebUI.Configuration { /// /// The OpenAthens. diff --git a/LearningHub.Nhs.WebUI/Configuration/Settings.cs b/LearningHub.Nhs.WebUI/Configuration/Settings.cs index 5958105a8..0ef2e69af 100644 --- a/LearningHub.Nhs.WebUI/Configuration/Settings.cs +++ b/LearningHub.Nhs.WebUI/Configuration/Settings.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.WebUI.Configuration { using System; diff --git a/LearningHub.Nhs.WebUI/Configuration/SocialMediaSharingUrls.cs b/LearningHub.Nhs.WebUI/Configuration/SocialMediaSharingUrls.cs index ca4d7e025..524673c1b 100644 --- a/LearningHub.Nhs.WebUI/Configuration/SocialMediaSharingUrls.cs +++ b/LearningHub.Nhs.WebUI/Configuration/SocialMediaSharingUrls.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Configuration +namespace LearningHub.Nhs.WebUI.Configuration { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Configuration/SupportUrls.cs b/LearningHub.Nhs.WebUI/Configuration/SupportUrls.cs index 9a35958b0..f6578a67b 100644 --- a/LearningHub.Nhs.WebUI/Configuration/SupportUrls.cs +++ b/LearningHub.Nhs.WebUI/Configuration/SupportUrls.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Configuration +namespace LearningHub.Nhs.WebUI.Configuration { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Configuration/TwitterSettings.cs b/LearningHub.Nhs.WebUI/Configuration/TwitterSettings.cs index 14a487ce6..40f58c8ab 100644 --- a/LearningHub.Nhs.WebUI/Configuration/TwitterSettings.cs +++ b/LearningHub.Nhs.WebUI/Configuration/TwitterSettings.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Configuration +namespace LearningHub.Nhs.WebUI.Configuration { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs index d8c324d1d..2bd4bb997 100644 --- a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs @@ -1,9 +1,6 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { + using System; using System.Collections.Generic; using System.Linq; using System.Net; @@ -1236,7 +1233,17 @@ private async Task GetAccountConfirmationDetails(Ac var employer = await this.locationService.GetByIdAsync(int.TryParse(accountCreationViewModel.LocationId, out int primaryEmploymentId) ? primaryEmploymentId : 0); var region = await this.regionService.GetAllAsync(); var specialty = await this.specialtyService.GetSpecialtiesAsync(); - var role = await this.jobRoleService.GetPagedFilteredAsync(accountCreationViewModel.CurrentRoleName, accountCreationViewModel.CurrentPageIndex, UserRegistrationContentPageSize); + var role = new Tuple>(0, null); + if (!string.IsNullOrEmpty(accountCreationViewModel.CurrentRoleName) && accountCreationViewModel.CurrentRoleName.Contains('/')) + { + string jobrole = accountCreationViewModel.CurrentRoleName.Replace("/", " "); + role = await this.jobRoleService.GetPagedFilteredAsync(jobrole, accountCreationViewModel.CurrentPageIndex, UserRegistrationContentPageSize); + } + else + { + role = await this.jobRoleService.GetPagedFilteredAsync(accountCreationViewModel.CurrentRoleName, accountCreationViewModel.CurrentPageIndex, UserRegistrationContentPageSize); + } + if (role.Item1 > 0) { accountCreationViewModel.CurrentRoleName = role.Item2.FirstOrDefault(x => x.Id == int.Parse(accountCreationViewModel.CurrentRole)).NameWithStaffGroup; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ActivityController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ActivityController.cs index 781c5f321..5bd17f324 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/ActivityController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/ActivityController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using LearningHub.Nhs.Models.Resource.Activity; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/BaseApiController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/BaseApiController.cs index 4bc9336c5..f9f7f06dc 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/BaseApiController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/BaseApiController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using LearningHub.Nhs.Models.Extensions; using Microsoft.AspNetCore.Mvc; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/BookmarkController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/BookmarkController.cs index 135a5b327..961cccc65 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/BookmarkController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/BookmarkController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using LearningHub.Nhs.Models.Bookmark; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/CardController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/CardController.cs index 691a722ac..4a02c3409 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/CardController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/CardController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/CatalogueController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/CatalogueController.cs index 0a6b1b4ce..0bec9e8d3 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/CatalogueController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/CatalogueController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using LearningHub.Nhs.Models.Catalogue; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ContentController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ContentController.cs index 4716b7cce..a0117eb50 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/ContentController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/ContentController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using LearningHub.Nhs.WebUI.Interfaces; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs index e86c053f8..5bacf44d1 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System; using System.Net; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/CountryController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/CountryController.cs index f86b270af..63a69d9dc 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/CountryController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/CountryController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using LearningHub.Nhs.WebUI.Interfaces; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/DashboardController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/DashboardController.cs index a3c4405ce..9566dca64 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/DashboardController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/DashboardController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using LearningHub.Nhs.Models.Enums; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/GradeController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/GradeController.cs index 082307892..507daf566 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/GradeController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/GradeController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using LearningHub.Nhs.WebUI.Interfaces; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/HierarchyController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/HierarchyController.cs index 9cffb43c6..6c0cb5b26 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/HierarchyController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/HierarchyController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Collections.Generic; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/JobRoleController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/JobRoleController.cs index d74dc7191..3900f6aa1 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/JobRoleController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/JobRoleController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using LearningHub.Nhs.WebUI.Interfaces; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/LocationController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/LocationController.cs index 748fe309a..052e83242 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/LocationController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/LocationController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using LearningHub.Nhs.WebUI.Interfaces; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/MediaManifestProxyController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/MediaManifestProxyController.cs index b0012b46c..b8760cbdf 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/MediaManifestProxyController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/MediaManifestProxyController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System; using System.Globalization; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/MyLearningController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/MyLearningController.cs index b25050104..bcd13c08a 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/MyLearningController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/MyLearningController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using LearningHub.Nhs.Models.MyLearning; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ProviderController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ProviderController.cs index 725d60b6a..ae3ccb97d 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/ProviderController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/ProviderController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using LearningHub.Nhs.WebUI.Interfaces; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/RatingController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/RatingController.cs index 19c14e59f..d7c945c99 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/RatingController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/RatingController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using LearningHub.Nhs.Models.Common; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/RegionController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/RegionController.cs index 87b833f03..d224d10c6 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/RegionController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/RegionController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using LearningHub.Nhs.WebUI.Interfaces; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/RegistrationController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/RegistrationController.cs index 3221c4d99..10c0a963f 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/RegistrationController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/RegistrationController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using elfhHub.Nhs.Models.Common; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs index 93c285142..7f0c1feee 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.WebUI.Controllers.Api { using System; @@ -105,7 +101,7 @@ public async Task DownloadResourceAndRecordActivity(int resourceV ResourceVersionId = resourceVersionId, NodePathId = nodePathId, ActivityStart = DateTime.UtcNow, // TODO: What about user's timezone offset when Javascript is disabled? Needs JavaScript. - ActivityStatus = ActivityStatusEnum.Downloaded, + ActivityStatus = ActivityStatusEnum.Completed, }; await this.activityService.CreateResourceActivityAsync(activity); @@ -132,7 +128,7 @@ public async Task NavigateToWeblinkAndRecordActivity(int resource ResourceVersionId = resourceVersionId, NodePathId = nodePathId, ActivityStart = DateTime.UtcNow, // TODO: What about user's timezone offset when Javascript is disabled? Needs JavaScript. - ActivityStatus = ActivityStatusEnum.Launched, + ActivityStatus = ActivityStatusEnum.Completed, }; await this.activityService.CreateResourceActivityAsync(activity); diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/RoadmapController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/RoadmapController.cs index cbab9f66d..71a2c933c 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/RoadmapController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/RoadmapController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using LearningHub.Nhs.WebUI.Interfaces; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs index 64a245608..6f053036c 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/SearchController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/SearchController.cs index 5e9e56c87..1c7eef217 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/SearchController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/SearchController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/SpecialtyController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/SpecialtyController.cs index 4c77417f6..8388b31e2 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/SpecialtyController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/SpecialtyController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Threading.Tasks; using LearningHub.Nhs.WebUI.Interfaces; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/UserController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/UserController.cs index 7e5d42864..fc5c5579a 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/UserController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/UserController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/UserGroupController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/UserGroupController.cs index bc5693663..ccb7b17bc 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/UserGroupController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/UserGroupController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers.Api +namespace LearningHub.Nhs.WebUI.Controllers.Api { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Controllers/BaseController.cs b/LearningHub.Nhs.WebUI/Controllers/BaseController.cs index aba2bc314..8972fa822 100644 --- a/LearningHub.Nhs.WebUI/Controllers/BaseController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/BaseController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System.Net.Http; using LearningHub.Nhs.Models.Extensions; diff --git a/LearningHub.Nhs.WebUI/Controllers/BookmarkController.cs b/LearningHub.Nhs.WebUI/Controllers/BookmarkController.cs index d429a1efa..b38881542 100644 --- a/LearningHub.Nhs.WebUI/Controllers/BookmarkController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/BookmarkController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System.Collections.Generic; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs b/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs index e3bd3b193..67b4a5cb9 100644 --- a/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs @@ -1,7 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Controllers/ContributeController.cs b/LearningHub.Nhs.WebUI/Controllers/ContributeController.cs index ca9604e0b..fc3b7f76a 100644 --- a/LearningHub.Nhs.WebUI/Controllers/ContributeController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/ContributeController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System.Net.Http; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Controllers/ContributeResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/ContributeResourceController.cs index 8d35c681e..cd9ec928c 100644 --- a/LearningHub.Nhs.WebUI/Controllers/ContributeResourceController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/ContributeResourceController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Controllers/CovidTestingController.cs b/LearningHub.Nhs.WebUI/Controllers/CovidTestingController.cs index c90372266..cd8676a1f 100644 --- a/LearningHub.Nhs.WebUI/Controllers/CovidTestingController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/CovidTestingController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; diff --git a/LearningHub.Nhs.WebUI/Controllers/FileController.cs b/LearningHub.Nhs.WebUI/Controllers/FileController.cs index d0f97e748..e314d1525 100644 --- a/LearningHub.Nhs.WebUI/Controllers/FileController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/FileController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System.Net.Http; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Controllers/HomeController.cs b/LearningHub.Nhs.WebUI/Controllers/HomeController.cs index a5d629fed..3d2828b61 100644 --- a/LearningHub.Nhs.WebUI/Controllers/HomeController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/HomeController.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.WebUI.Controllers { using System; diff --git a/LearningHub.Nhs.WebUI/Controllers/LearningSessionsController.cs b/LearningHub.Nhs.WebUI/Controllers/LearningSessionsController.cs index aaecc8c42..a3037a76c 100644 --- a/LearningHub.Nhs.WebUI/Controllers/LearningSessionsController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/LearningSessionsController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System; using System.Diagnostics; diff --git a/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs b/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs index 36bd73f58..fab43e688 100644 --- a/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/LoginWizardController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Controllers/LogoutController.cs b/LearningHub.Nhs.WebUI/Controllers/LogoutController.cs index 3f9374f8d..99244e3ed 100644 --- a/LearningHub.Nhs.WebUI/Controllers/LogoutController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/LogoutController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Controllers/MediaController.cs b/LearningHub.Nhs.WebUI/Controllers/MediaController.cs index 2cb1fc263..547b8e8ef 100644 --- a/LearningHub.Nhs.WebUI/Controllers/MediaController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/MediaController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System; using System.Net.Http; diff --git a/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs b/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs index ba8813502..4494d9463 100644 --- a/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/MyAccountController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs b/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs index 2d77c7df5..c583859bb 100644 --- a/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/MyLearningController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System; using System.Collections.Generic; @@ -133,6 +129,8 @@ public async Task Index(MyLearningViewModel learningRequest = nul Passed = learningRequest.Passed, Failed = learningRequest.Failed, Downloaded = learningRequest.Downloaded, + Viewed = learningRequest.Viewed, + Launched = learningRequest.Launched, CertificateEnabled = learningRequest.CertificateEnabled, }; diff --git a/LearningHub.Nhs.WebUI/Controllers/NotificationController.cs b/LearningHub.Nhs.WebUI/Controllers/NotificationController.cs index abe4e5a78..c5013e07f 100644 --- a/LearningHub.Nhs.WebUI/Controllers/NotificationController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/NotificationController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System; using System.Net.Http; diff --git a/LearningHub.Nhs.WebUI/Controllers/OfflineController.cs b/LearningHub.Nhs.WebUI/Controllers/OfflineController.cs index d9ed7ef0d..178fa5c0b 100644 --- a/LearningHub.Nhs.WebUI/Controllers/OfflineController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/OfflineController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System.Net.Http; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Controllers/OpenAthensController.cs b/LearningHub.Nhs.WebUI/Controllers/OpenAthensController.cs index c47ad5338..31fac8cb2 100644 --- a/LearningHub.Nhs.WebUI/Controllers/OpenAthensController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/OpenAthensController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System; using System.Net.Http; diff --git a/LearningHub.Nhs.WebUI/Controllers/PoliciesController.cs b/LearningHub.Nhs.WebUI/Controllers/PoliciesController.cs index aaacdfdda..4d6a54c4f 100644 --- a/LearningHub.Nhs.WebUI/Controllers/PoliciesController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/PoliciesController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System.Net.Http; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs index 629f61c26..588cbdc6e 100644 --- a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System; using System.Linq; @@ -179,14 +175,14 @@ public async Task Index(int resourceReferenceId, bool? acceptSens } // For article/image resources, immediately record the resource activity for this user. - if ((resource.ResourceTypeEnum == ResourceTypeEnum.Article || resource.ResourceTypeEnum == ResourceTypeEnum.Image) && ((resource.SensitiveContent && acceptSensitiveContent.HasValue && acceptSensitiveContent.Value) || !resource.SensitiveContent) && canAccessResource) + if ((resource.ResourceTypeEnum == ResourceTypeEnum.Article || resource.ResourceTypeEnum == ResourceTypeEnum.Image) && (!resource.SensitiveContent)) { var activity = new CreateResourceActivityViewModel() { ResourceVersionId = resource.ResourceVersionId, NodePathId = resource.NodePathId, ActivityStart = DateTime.UtcNow, // TODO: What about user's timezone offset when Javascript is disabled? Needs JavaScript. - ActivityStatus = ActivityStatusEnum.Launched, + ActivityStatus = ActivityStatusEnum.Completed, }; await this.activityService.CreateResourceActivityAsync(activity); } @@ -484,7 +480,7 @@ public async Task HtmlResourceContent(int resourceReferenceId, st ResourceVersionId = resourceVersionId, NodePathId = nodePathId, ActivityStart = DateTime.UtcNow, // TODO: What about user's timezone offset when Javascript is disabled? Needs JavaScript. - ActivityStatus = ActivityStatusEnum.Launched, + ActivityStatus = ActivityStatusEnum.Completed, }; await this.activityService.CreateResourceActivityAsync(activity); } diff --git a/LearningHub.Nhs.WebUI/Controllers/RoadMapController.cs b/LearningHub.Nhs.WebUI/Controllers/RoadMapController.cs index a6d99da40..b9bcf8a22 100644 --- a/LearningHub.Nhs.WebUI/Controllers/RoadMapController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/RoadMapController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System.Net.Http; using Microsoft.AspNetCore.Hosting; diff --git a/LearningHub.Nhs.WebUI/Controllers/SearchController.cs b/LearningHub.Nhs.WebUI/Controllers/SearchController.cs index 7eda92099..2cebfd11c 100644 --- a/LearningHub.Nhs.WebUI/Controllers/SearchController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/SearchController.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.WebUI.Controllers { using System; diff --git a/LearningHub.Nhs.WebUI/Controllers/TrackingController.cs b/LearningHub.Nhs.WebUI/Controllers/TrackingController.cs index fcc2562af..4463faf73 100644 --- a/LearningHub.Nhs.WebUI/Controllers/TrackingController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/TrackingController.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.WebUI.Controllers { using System.Net.Http; diff --git a/LearningHub.Nhs.WebUI/Controllers/UserController.cs b/LearningHub.Nhs.WebUI/Controllers/UserController.cs index 9d3698c9b..284c2a0b9 100644 --- a/LearningHub.Nhs.WebUI/Controllers/UserController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/UserController.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Controllers +namespace LearningHub.Nhs.WebUI.Controllers { using System.Collections.Generic; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/EventSource/ScormContentEventSource.cs b/LearningHub.Nhs.WebUI/EventSource/ScormContentEventSource.cs index 3f03c7fe8..9f4c2df4c 100644 --- a/LearningHub.Nhs.WebUI/EventSource/ScormContentEventSource.cs +++ b/LearningHub.Nhs.WebUI/EventSource/ScormContentEventSource.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.EventSource +namespace LearningHub.Nhs.WebUI.EventSource { using System; using System.Diagnostics.Tracing; diff --git a/LearningHub.Nhs.WebUI/Extensions/ClaimsPrincipalExtensions.cs b/LearningHub.Nhs.WebUI/Extensions/ClaimsPrincipalExtensions.cs index 6bc3b1b28..30653fcbc 100644 --- a/LearningHub.Nhs.WebUI/Extensions/ClaimsPrincipalExtensions.cs +++ b/LearningHub.Nhs.WebUI/Extensions/ClaimsPrincipalExtensions.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Extensions +namespace LearningHub.Nhs.WebUI.Extensions { using System; using System.Security.Claims; diff --git a/LearningHub.Nhs.WebUI/Extensions/ControllerExtensions.cs b/LearningHub.Nhs.WebUI/Extensions/ControllerExtensions.cs index d431dd8b9..6c6e44aeb 100644 --- a/LearningHub.Nhs.WebUI/Extensions/ControllerExtensions.cs +++ b/LearningHub.Nhs.WebUI/Extensions/ControllerExtensions.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Extensions +namespace LearningHub.Nhs.WebUI.Extensions { using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ViewEngines; diff --git a/LearningHub.Nhs.WebUI/Extensions/HtmlHelperExtensios.cs b/LearningHub.Nhs.WebUI/Extensions/HtmlHelperExtensios.cs index c8407aa0a..cb3166548 100644 --- a/LearningHub.Nhs.WebUI/Extensions/HtmlHelperExtensios.cs +++ b/LearningHub.Nhs.WebUI/Extensions/HtmlHelperExtensios.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Extensions +namespace LearningHub.Nhs.WebUI.Extensions { using System.Collections.Generic; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/Extensions/HttpRequestExtensions.cs b/LearningHub.Nhs.WebUI/Extensions/HttpRequestExtensions.cs index 8b5dfbdcf..de4646ef8 100644 --- a/LearningHub.Nhs.WebUI/Extensions/HttpRequestExtensions.cs +++ b/LearningHub.Nhs.WebUI/Extensions/HttpRequestExtensions.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Extensions +namespace LearningHub.Nhs.WebUI.Extensions { using System; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/Extensions/StringExtensions.cs b/LearningHub.Nhs.WebUI/Extensions/StringExtensions.cs index d2945a865..073e756c0 100644 --- a/LearningHub.Nhs.WebUI/Extensions/StringExtensions.cs +++ b/LearningHub.Nhs.WebUI/Extensions/StringExtensions.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Extensions +namespace LearningHub.Nhs.WebUI.Extensions { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Filters/LoginWizardFilter.cs b/LearningHub.Nhs.WebUI/Filters/LoginWizardFilter.cs index cf521b653..36cbcc9ff 100644 --- a/LearningHub.Nhs.WebUI/Filters/LoginWizardFilter.cs +++ b/LearningHub.Nhs.WebUI/Filters/LoginWizardFilter.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Filters +namespace LearningHub.Nhs.WebUI.Filters { using System.Threading.Tasks; using LearningHub.Nhs.Caching; diff --git a/LearningHub.Nhs.WebUI/Filters/OfflineCheckFilter.cs b/LearningHub.Nhs.WebUI/Filters/OfflineCheckFilter.cs index ef673b8ad..8adaaccf2 100644 --- a/LearningHub.Nhs.WebUI/Filters/OfflineCheckFilter.cs +++ b/LearningHub.Nhs.WebUI/Filters/OfflineCheckFilter.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Filters +namespace LearningHub.Nhs.WebUI.Filters { using System.Threading.Tasks; using LearningHub.Nhs.Caching; @@ -46,18 +42,21 @@ public override async Task OnActionExecutionAsync(ActionExecutingContext context var internalSystem = await this.internalSystemService.GetByIdAsync((int)InternalSystemType.LearningHub); - if (controller != "Offline" - && !(controller == "Home" && action == "Logout") - && internalSystem.IsOffline - && (!user.Identity.IsAuthenticated || !(await this.userGroupService.UserHasPermissionAsync("System_Offline_Bypass")))) + if (internalSystem != null) { - context.Result = new RedirectToRouteResult( - new RouteValueDictionary - { + if (controller != "Offline" + && !(controller == "Home" && action == "Logout") + && internalSystem.IsOffline + && (!user.Identity.IsAuthenticated || !(await this.userGroupService.UserHasPermissionAsync("System_Offline_Bypass")))) + { + context.Result = new RedirectToRouteResult( + new RouteValueDictionary + { { "Controller", "Offline" }, { "Action", "Index" }, - }); - executeNextAction = false; + }); + executeNextAction = false; + } } if (executeNextAction) diff --git a/LearningHub.Nhs.WebUI/Filters/PreventGeneralAccessFilter.cs b/LearningHub.Nhs.WebUI/Filters/PreventGeneralAccessFilter.cs index 34da45c2c..ebf45ca30 100644 --- a/LearningHub.Nhs.WebUI/Filters/PreventGeneralAccessFilter.cs +++ b/LearningHub.Nhs.WebUI/Filters/PreventGeneralAccessFilter.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Filters +namespace LearningHub.Nhs.WebUI.Filters { using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; diff --git a/LearningHub.Nhs.WebUI/Filters/RedirectMissingMultiPageFormData.cs b/LearningHub.Nhs.WebUI/Filters/RedirectMissingMultiPageFormData.cs index b13e7167f..1c7a8b0ad 100644 --- a/LearningHub.Nhs.WebUI/Filters/RedirectMissingMultiPageFormData.cs +++ b/LearningHub.Nhs.WebUI/Filters/RedirectMissingMultiPageFormData.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Filters +namespace LearningHub.Nhs.WebUI.Filters { using System; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Filters/SsoLoginFilterAttribute.cs b/LearningHub.Nhs.WebUI/Filters/SsoLoginFilterAttribute.cs index 2bede46f1..ed4bb1480 100644 --- a/LearningHub.Nhs.WebUI/Filters/SsoLoginFilterAttribute.cs +++ b/LearningHub.Nhs.WebUI/Filters/SsoLoginFilterAttribute.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Filters +namespace LearningHub.Nhs.WebUI.Filters { using System.Collections.Generic; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/GlobalSuppressions.cs b/LearningHub.Nhs.WebUI/GlobalSuppressions.cs index e4d8b74a9..5a3fc9f24 100644 --- a/LearningHub.Nhs.WebUI/GlobalSuppressions.cs +++ b/LearningHub.Nhs.WebUI/GlobalSuppressions.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; [assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "eLearning is a valid name", Scope = "member", Target = "~M:LearningHub.Nhs.WebUI.Controllers.HomeController.elearning~Microsoft.AspNetCore.Mvc.IActionResult")] diff --git a/LearningHub.Nhs.WebUI/Handlers/CookieEventHandler.cs b/LearningHub.Nhs.WebUI/Handlers/CookieEventHandler.cs index 1090c78c4..590d2de7f 100644 --- a/LearningHub.Nhs.WebUI/Handlers/CookieEventHandler.cs +++ b/LearningHub.Nhs.WebUI/Handlers/CookieEventHandler.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Handlers +namespace LearningHub.Nhs.WebUI.Handlers { using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; diff --git a/LearningHub.Nhs.WebUI/Handlers/LogoutUserManager.cs b/LearningHub.Nhs.WebUI/Handlers/LogoutUserManager.cs index 306db53da..f951b6b2b 100644 --- a/LearningHub.Nhs.WebUI/Handlers/LogoutUserManager.cs +++ b/LearningHub.Nhs.WebUI/Handlers/LogoutUserManager.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Handlers +namespace LearningHub.Nhs.WebUI.Handlers { using System.Collections.Generic; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/Helpers/CommonPasswordsAttribute.cs b/LearningHub.Nhs.WebUI/Helpers/CommonPasswordsAttribute.cs index a9ef81b9f..e087f9898 100644 --- a/LearningHub.Nhs.WebUI/Helpers/CommonPasswordsAttribute.cs +++ b/LearningHub.Nhs.WebUI/Helpers/CommonPasswordsAttribute.cs @@ -1,7 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { using System.ComponentModel.DataAnnotations; diff --git a/LearningHub.Nhs.WebUI/Helpers/CommonValidationErrorMessages.cs b/LearningHub.Nhs.WebUI/Helpers/CommonValidationErrorMessages.cs index f4509052c..3e2753448 100644 --- a/LearningHub.Nhs.WebUI/Helpers/CommonValidationErrorMessages.cs +++ b/LearningHub.Nhs.WebUI/Helpers/CommonValidationErrorMessages.cs @@ -1,7 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Helpers/CommonValidationValues.cs b/LearningHub.Nhs.WebUI/Helpers/CommonValidationValues.cs index 8835a8c59..9cabb650a 100644 --- a/LearningHub.Nhs.WebUI/Helpers/CommonValidationValues.cs +++ b/LearningHub.Nhs.WebUI/Helpers/CommonValidationValues.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Helpers/DateValidator.cs b/LearningHub.Nhs.WebUI/Helpers/DateValidator.cs index ef0bae87b..9a19ac3ae 100644 --- a/LearningHub.Nhs.WebUI/Helpers/DateValidator.cs +++ b/LearningHub.Nhs.WebUI/Helpers/DateValidator.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Helpers/FileHelper.cs b/LearningHub.Nhs.WebUI/Helpers/FileHelper.cs index 5fc0e74ec..6d13fa987 100644 --- a/LearningHub.Nhs.WebUI/Helpers/FileHelper.cs +++ b/LearningHub.Nhs.WebUI/Helpers/FileHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { using Microsoft.AspNetCore.StaticFiles; diff --git a/LearningHub.Nhs.WebUI/Helpers/IClockUtility.cs b/LearningHub.Nhs.WebUI/Helpers/IClockUtility.cs index 2e4e33bb5..a0f51cd2a 100644 --- a/LearningHub.Nhs.WebUI/Helpers/IClockUtility.cs +++ b/LearningHub.Nhs.WebUI/Helpers/IClockUtility.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { using System; diff --git a/LearningHub.Nhs.WebUI/Helpers/ILearningHubApiFacade.cs b/LearningHub.Nhs.WebUI/Helpers/ILearningHubApiFacade.cs index c7af02043..bb6316aea 100644 --- a/LearningHub.Nhs.WebUI/Helpers/ILearningHubApiFacade.cs +++ b/LearningHub.Nhs.WebUI/Helpers/ILearningHubApiFacade.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { using System.Threading.Tasks; using LearningHub.Nhs.Models.Common; diff --git a/LearningHub.Nhs.WebUI/Helpers/IUserSessionHelper.cs b/LearningHub.Nhs.WebUI/Helpers/IUserSessionHelper.cs index a6f2d769e..8a7a5818c 100644 --- a/LearningHub.Nhs.WebUI/Helpers/IUserSessionHelper.cs +++ b/LearningHub.Nhs.WebUI/Helpers/IUserSessionHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Helpers/LearningHubApiFacade.cs b/LearningHub.Nhs.WebUI/Helpers/LearningHubApiFacade.cs index 964220afb..adeb102a7 100644 --- a/LearningHub.Nhs.WebUI/Helpers/LearningHubApiFacade.cs +++ b/LearningHub.Nhs.WebUI/Helpers/LearningHubApiFacade.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { using System; using System.Net.Http; diff --git a/LearningHub.Nhs.WebUI/Helpers/OpenAthens/OpenAthensHelpers.cs b/LearningHub.Nhs.WebUI/Helpers/OpenAthens/OpenAthensHelpers.cs index 1970b3ab0..b2b428fde 100644 --- a/LearningHub.Nhs.WebUI/Helpers/OpenAthens/OpenAthensHelpers.cs +++ b/LearningHub.Nhs.WebUI/Helpers/OpenAthens/OpenAthensHelpers.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers.OpenAthens +namespace LearningHub.Nhs.WebUI.Helpers.OpenAthens { using System.Linq; using LearningHub.Nhs.Models.OpenAthens; diff --git a/LearningHub.Nhs.WebUI/Helpers/OpenAthens/OpenAthensOpenIdConnect.cs b/LearningHub.Nhs.WebUI/Helpers/OpenAthens/OpenAthensOpenIdConnect.cs index 73b37b647..35d061062 100644 --- a/LearningHub.Nhs.WebUI/Helpers/OpenAthens/OpenAthensOpenIdConnect.cs +++ b/LearningHub.Nhs.WebUI/Helpers/OpenAthens/OpenAthensOpenIdConnect.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers.OpenAthens +namespace LearningHub.Nhs.WebUI.Helpers.OpenAthens { using System; using System.Web; diff --git a/LearningHub.Nhs.WebUI/Helpers/ProviderHelper.cs b/LearningHub.Nhs.WebUI/Helpers/ProviderHelper.cs index 3f37a7291..c9f3d13cb 100644 --- a/LearningHub.Nhs.WebUI/Helpers/ProviderHelper.cs +++ b/LearningHub.Nhs.WebUI/Helpers/ProviderHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Helpers/QuerystringHelper.cs b/LearningHub.Nhs.WebUI/Helpers/QuerystringHelper.cs index a38ed74b4..8369978c3 100644 --- a/LearningHub.Nhs.WebUI/Helpers/QuerystringHelper.cs +++ b/LearningHub.Nhs.WebUI/Helpers/QuerystringHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Helpers/ResourceAccessLevelHelper.cs b/LearningHub.Nhs.WebUI/Helpers/ResourceAccessLevelHelper.cs index b66dde003..e03200172 100644 --- a/LearningHub.Nhs.WebUI/Helpers/ResourceAccessLevelHelper.cs +++ b/LearningHub.Nhs.WebUI/Helpers/ResourceAccessLevelHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { using LearningHub.Nhs.Models.Enums; using Microsoft.AspNetCore.Mvc.Rendering; diff --git a/LearningHub.Nhs.WebUI/Helpers/SearchHelper.cs b/LearningHub.Nhs.WebUI/Helpers/SearchHelper.cs index 276e0af3c..c94eda513 100644 --- a/LearningHub.Nhs.WebUI/Helpers/SearchHelper.cs +++ b/LearningHub.Nhs.WebUI/Helpers/SearchHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { using System.Collections.Generic; using LearningHub.Nhs.Models.Enums; diff --git a/LearningHub.Nhs.WebUI/Helpers/TenantHelper.cs b/LearningHub.Nhs.WebUI/Helpers/TenantHelper.cs index 5a59c138f..3c90ce909 100644 --- a/LearningHub.Nhs.WebUI/Helpers/TenantHelper.cs +++ b/LearningHub.Nhs.WebUI/Helpers/TenantHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { using System.IO; using LearningHub.Nhs.WebUI.Models; diff --git a/LearningHub.Nhs.WebUI/Helpers/UserSessionHelper.cs b/LearningHub.Nhs.WebUI/Helpers/UserSessionHelper.cs index 599b87a20..033059143 100644 --- a/LearningHub.Nhs.WebUI/Helpers/UserSessionHelper.cs +++ b/LearningHub.Nhs.WebUI/Helpers/UserSessionHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { using System.Threading.Tasks; using elfhHub.Nhs.Models.Common; diff --git a/LearningHub.Nhs.WebUI/Helpers/UtilityHelper.cs b/LearningHub.Nhs.WebUI/Helpers/UtilityHelper.cs index f7963a49e..3f42256e1 100644 --- a/LearningHub.Nhs.WebUI/Helpers/UtilityHelper.cs +++ b/LearningHub.Nhs.WebUI/Helpers/UtilityHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs b/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs index a04b58c4d..810c2eeb4 100644 --- a/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs +++ b/LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Helpers +namespace LearningHub.Nhs.WebUI.Helpers { using System; using System.Collections.Generic; @@ -131,7 +127,7 @@ public static string GetResourceTypeVerb(this ActivityDetailedItemViewModel acti /// The . public static string GetActivityStatusDisplayText(this ActivityDetailedItemViewModel activityDetailedItemViewModel) { - if (activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched + if (activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed && (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Article || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.WebLink || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Image @@ -140,7 +136,7 @@ public static string GetActivityStatusDisplayText(this ActivityDetailedItemViewM { return "Completed"; } - else if (activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched + else if (activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed && (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.GenericFile)) { return "Downloaded"; @@ -167,36 +163,33 @@ public static string GetActivityStatusDisplayText(this ActivityDetailedItemViewM /// /// The activityDetailedItemViewModel. /// The . - public static ActivityStatusEnum GetActivityStatus(this ActivityDetailedItemViewModel activityDetailedItemViewModel) + public static string GetActivityStatus(this ActivityDetailedItemViewModel activityDetailedItemViewModel) { - if (activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched + if (activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed && (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Article - || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.WebLink || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Image || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Html || activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Case)) { - return ActivityStatusEnum.Completed; + return "Viewed"; } - else if (activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched - && (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.GenericFile)) + else if (activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed + && (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.WebLink)) { - return ActivityStatusEnum.Downloaded; + return "Launched"; } - else if (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment) + else if (activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed + && (activityDetailedItemViewModel.ResourceType == ResourceTypeEnum.GenericFile)) { - if (activityDetailedItemViewModel.Complete) - { - return activityDetailedItemViewModel.ScorePercentage >= activityDetailedItemViewModel.AssessmentDetails.PassMark ? ActivityStatusEnum.Passed : ActivityStatusEnum.Failed; - } - else - { - return activityDetailedItemViewModel.ScorePercentage >= activityDetailedItemViewModel.AssessmentDetails.PassMark ? ActivityStatusEnum.Passed : ActivityStatusEnum.InProgress; - } + return ActivityStatusEnum.Downloaded.ToString(); + } + else if (activityDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Incomplete) + { + return ActivityStatusEnum.InProgress.ToString(); } else { - return activityDetailedItemViewModel.ActivityStatus; + return activityDetailedItemViewModel.ActivityStatus.ToString(); } } diff --git a/LearningHub.Nhs.WebUI/Interfaces/IActivityService.cs b/LearningHub.Nhs.WebUI/Interfaces/IActivityService.cs index 6a15facd0..8dff7ae97 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IActivityService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IActivityService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Threading.Tasks; using LearningHub.Nhs.Models.Resource; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IAzureMediaService.cs b/LearningHub.Nhs.WebUI/Interfaces/IAzureMediaService.cs index ca39fb04a..74883804b 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IAzureMediaService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IAzureMediaService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Threading.Tasks; using Microsoft.AspNetCore.Http; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IBookmarkService.cs b/LearningHub.Nhs.WebUI/Interfaces/IBookmarkService.cs index 9f1e8744e..859c5c650 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IBookmarkService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IBookmarkService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/ICardService.cs b/LearningHub.Nhs.WebUI/Interfaces/ICardService.cs index 954fdd95b..d47e32069 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/ICardService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/ICardService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/ICatalogueService.cs b/LearningHub.Nhs.WebUI/Interfaces/ICatalogueService.cs index 094ad4810..30ba46a54 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/ICatalogueService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/ICatalogueService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IContentService.cs b/LearningHub.Nhs.WebUI/Interfaces/IContentService.cs index 484d2e7dc..1c451d804 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IContentService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IContentService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Threading.Tasks; using LearningHub.Nhs.Models.Content; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IContributeService.cs b/LearningHub.Nhs.WebUI/Interfaces/IContributeService.cs index f08da24f9..1f7f4154e 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IContributeService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IContributeService.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.WebUI.Interfaces { using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/ICountryService.cs b/LearningHub.Nhs.WebUI/Interfaces/ICountryService.cs index 1eb61444b..8b5fe7542 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/ICountryService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/ICountryService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IDashboardService.cs b/LearningHub.Nhs.WebUI/Interfaces/IDashboardService.cs index 09d43939d..de8996766 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IDashboardService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IDashboardService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Threading.Tasks; using LearningHub.Nhs.Models.Dashboard; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IDetectJsLogService.cs b/LearningHub.Nhs.WebUI/Interfaces/IDetectJsLogService.cs index 656792636..dee0c6a41 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IDetectJsLogService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IDetectJsLogService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IFileService.cs b/LearningHub.Nhs.WebUI/Interfaces/IFileService.cs index 684e391c1..768463d86 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IFileService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IFileService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.IO; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IGradeService.cs b/LearningHub.Nhs.WebUI/Interfaces/IGradeService.cs index 54790a52c..eb89b6de0 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IGradeService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IGradeService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IHierarchyService.cs b/LearningHub.Nhs.WebUI/Interfaces/IHierarchyService.cs index 90e5b3420..72c1d1af7 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IHierarchyService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IHierarchyService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IInternalSystemService.cs b/LearningHub.Nhs.WebUI/Interfaces/IInternalSystemService.cs index 468d715d1..94f5139f9 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IInternalSystemService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IInternalSystemService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Threading.Tasks; using LearningHub.Nhs.Models.Maintenance; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IJobRoleService.cs b/LearningHub.Nhs.WebUI/Interfaces/IJobRoleService.cs index b18b199e0..dcfa2f768 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IJobRoleService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IJobRoleService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IJsDetectionLogger.cs b/LearningHub.Nhs.WebUI/Interfaces/IJsDetectionLogger.cs index 1dadc3c5b..10970a2bd 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IJsDetectionLogger.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IJsDetectionLogger.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/ILearningHubHttpClient.cs b/LearningHub.Nhs.WebUI/Interfaces/ILearningHubHttpClient.cs index 215b99650..d39113d99 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/ILearningHubHttpClient.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/ILearningHubHttpClient.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Net.Http; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/ILearningHubReportApiClient.cs b/LearningHub.Nhs.WebUI/Interfaces/ILearningHubReportApiClient.cs index e2a217d47..a75277422 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/ILearningHubReportApiClient.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/ILearningHubReportApiClient.cs @@ -1,7 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/ILocationService.cs b/LearningHub.Nhs.WebUI/Interfaces/ILocationService.cs index d52ccb485..630c627ab 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/ILocationService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/ILocationService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Interfaces/ILoginWizardService.cs b/LearningHub.Nhs.WebUI/Interfaces/ILoginWizardService.cs index 1b973678a..3a51e9118 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/ILoginWizardService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/ILoginWizardService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IMyLearningService.cs b/LearningHub.Nhs.WebUI/Interfaces/IMyLearningService.cs index fdfc8a8b2..726f78477 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IMyLearningService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IMyLearningService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Interfaces/INavigationPermissionService.cs b/LearningHub.Nhs.WebUI/Interfaces/INavigationPermissionService.cs index 33995458d..ae0102354 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/INavigationPermissionService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/INavigationPermissionService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Security.Principal; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/INotificationService.cs b/LearningHub.Nhs.WebUI/Interfaces/INotificationService.cs index ca9c1f6f9..e2c5e9c23 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/INotificationService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/INotificationService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Threading.Tasks; using LearningHub.Nhs.Models.Common; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IPDFReportService.cs b/LearningHub.Nhs.WebUI/Interfaces/IPDFReportService.cs index efcc67a1b..88c8e2c0e 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IPDFReportService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IPDFReportService.cs @@ -1,7 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IPartialFileUploadService.cs b/LearningHub.Nhs.WebUI/Interfaces/IPartialFileUploadService.cs index 977f9e565..8212cb9c1 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IPartialFileUploadService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IPartialFileUploadService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Threading.Tasks; using LearningHub.Nhs.Models.Resource.Files; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IProviderService.cs b/LearningHub.Nhs.WebUI/Interfaces/IProviderService.cs index 9a742b448..528b7a4ec 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IProviderService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IProviderService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IRatingService.cs b/LearningHub.Nhs.WebUI/Interfaces/IRatingService.cs index f9955a9a6..b3457648a 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IRatingService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IRatingService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Threading.Tasks; using LearningHub.Nhs.Models.Common; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IRegionService.cs b/LearningHub.Nhs.WebUI/Interfaces/IRegionService.cs index af5c1fca3..8fc2dd6f3 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IRegionService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IRegionService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IResourceService.cs b/LearningHub.Nhs.WebUI/Interfaces/IResourceService.cs index 043deaa83..fb54a2777 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IResourceService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IResourceService.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.WebUI.Interfaces { using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IRoadMapService.cs b/LearningHub.Nhs.WebUI/Interfaces/IRoadMapService.cs index da1b3a200..1704dc903 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IRoadMapService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IRoadMapService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Threading.Tasks; using LearningHub.Nhs.Models.RoadMap; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IRoleService.cs b/LearningHub.Nhs.WebUI/Interfaces/IRoleService.cs index 7a0467f38..885298c77 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IRoleService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IRoleService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/ISearchService.cs b/LearningHub.Nhs.WebUI/Interfaces/ISearchService.cs index 84bc7fdf7..4f8ed36c7 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/ISearchService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/ISearchService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Security.Principal; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/ISpecialtyService.cs b/LearningHub.Nhs.WebUI/Interfaces/ISpecialtyService.cs index 59750f5ad..3cf0b4c97 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/ISpecialtyService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/ISpecialtyService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Interfaces/ITermsAndConditionsService.cs b/LearningHub.Nhs.WebUI/Interfaces/ITermsAndConditionsService.cs index d634a1f3f..6ab5fe577 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/ITermsAndConditionsService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/ITermsAndConditionsService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Threading.Tasks; using elfhHub.Nhs.Models.Entities; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IUserApiHttpClient.cs b/LearningHub.Nhs.WebUI/Interfaces/IUserApiHttpClient.cs index a64922a42..fb65ab6ee 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IUserApiHttpClient.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IUserApiHttpClient.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Net.Http; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IUserGroupService.cs b/LearningHub.Nhs.WebUI/Interfaces/IUserGroupService.cs index 6803f6114..a333e0c89 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IUserGroupService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IUserGroupService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Interfaces/IUserService.cs b/LearningHub.Nhs.WebUI/Interfaces/IUserService.cs index 69e039695..0b9dd4b77 100644 --- a/LearningHub.Nhs.WebUI/Interfaces/IUserService.cs +++ b/LearningHub.Nhs.WebUI/Interfaces/IUserService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Interfaces +namespace LearningHub.Nhs.WebUI.Interfaces { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/JsDetection/JsDetectionLogger.cs b/LearningHub.Nhs.WebUI/JsDetection/JsDetectionLogger.cs index aaace7345..1c44733cd 100644 --- a/LearningHub.Nhs.WebUI/JsDetection/JsDetectionLogger.cs +++ b/LearningHub.Nhs.WebUI/JsDetection/JsDetectionLogger.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.JsDetection +namespace LearningHub.Nhs.WebUI.JsDetection { using System.Threading; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/JsDetection/TimedHostedService.cs b/LearningHub.Nhs.WebUI/JsDetection/TimedHostedService.cs index d46f14118..713de000b 100644 --- a/LearningHub.Nhs.WebUI/JsDetection/TimedHostedService.cs +++ b/LearningHub.Nhs.WebUI/JsDetection/TimedHostedService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.JsDetection +namespace LearningHub.Nhs.WebUI.JsDetection { using System; using System.Threading; diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj index 16161f081..f6b59d3a7 100644 --- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj +++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj @@ -28,10 +28,6 @@ - - - - @@ -112,7 +108,7 @@ - + diff --git a/LearningHub.Nhs.WebUI/Middleware/NLogMiddleware.cs b/LearningHub.Nhs.WebUI/Middleware/NLogMiddleware.cs index c72246f75..f9e5358b8 100644 --- a/LearningHub.Nhs.WebUI/Middleware/NLogMiddleware.cs +++ b/LearningHub.Nhs.WebUI/Middleware/NLogMiddleware.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Middleware +namespace LearningHub.Nhs.WebUI.Middleware { using System; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Models/Account/AccountCreationConfirmation.cs b/LearningHub.Nhs.WebUI/Models/Account/AccountCreationConfirmation.cs index dbc8abc86..0366d5212 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/AccountCreationConfirmation.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/AccountCreationConfirmation.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { /// /// The AccountCreationConfirmation. diff --git a/LearningHub.Nhs.WebUI/Models/Account/AccountCreationDateViewModel.cs b/LearningHub.Nhs.WebUI/Models/Account/AccountCreationDateViewModel.cs index 3773189ce..c17fad8a9 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/AccountCreationDateViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/AccountCreationDateViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Models/Account/AccountCreationListViewModel.cs b/LearningHub.Nhs.WebUI/Models/Account/AccountCreationListViewModel.cs index b9128392c..60790b8d5 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/AccountCreationListViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/AccountCreationListViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { using System.Collections.Generic; using System.Globalization; diff --git a/LearningHub.Nhs.WebUI/Models/Account/AccountCreationPagingEnum.cs b/LearningHub.Nhs.WebUI/Models/Account/AccountCreationPagingEnum.cs index 47f4cc47e..9880361e7 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/AccountCreationPagingEnum.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/AccountCreationPagingEnum.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { /// /// Defines the AccountCreationPagingEnum. diff --git a/LearningHub.Nhs.WebUI/Models/Account/AccountCreationPagingModel.cs b/LearningHub.Nhs.WebUI/Models/Account/AccountCreationPagingModel.cs index 63b18fb8e..e40d74423 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/AccountCreationPagingModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/AccountCreationPagingModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { using LearningHub.Nhs.Models.Paging; diff --git a/LearningHub.Nhs.WebUI/Models/Account/AccountCreationTypeEnum.cs b/LearningHub.Nhs.WebUI/Models/Account/AccountCreationTypeEnum.cs index 716a4220e..67f2ec9f0 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/AccountCreationTypeEnum.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/AccountCreationTypeEnum.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { /// /// The AccountCreationTypeEnum. diff --git a/LearningHub.Nhs.WebUI/Models/Account/AccountCreationViewModel.cs b/LearningHub.Nhs.WebUI/Models/Account/AccountCreationViewModel.cs index 216e39be8..5b41bf6c8 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/AccountCreationViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/AccountCreationViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Models/Account/ChangePasswordViewModel.cs b/LearningHub.Nhs.WebUI/Models/Account/ChangePasswordViewModel.cs index 666893ebe..0338e8524 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/ChangePasswordViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/ChangePasswordViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { using System.ComponentModel.DataAnnotations; using LearningHub.Nhs.WebUI.Helpers; diff --git a/LearningHub.Nhs.WebUI/Models/Account/CountrySearchViewModel.cs b/LearningHub.Nhs.WebUI/Models/Account/CountrySearchViewModel.cs index a6435f868..bd9649edb 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/CountrySearchViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/CountrySearchViewModel.cs @@ -1,7 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { using System.Collections.Generic; using NHSUKViewComponents.Web.ViewModels; diff --git a/LearningHub.Nhs.WebUI/Models/Account/EmailChangeValidateViewModel.cs b/LearningHub.Nhs.WebUI/Models/Account/EmailChangeValidateViewModel.cs index 8ae3b0b74..8cf0f8ad8 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/EmailChangeValidateViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/EmailChangeValidateViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { /// /// EmailChangeValidateViewModel. diff --git a/LearningHub.Nhs.WebUI/Models/Account/EmailValidateViewModel.cs b/LearningHub.Nhs.WebUI/Models/Account/EmailValidateViewModel.cs index b0b4b81ba..1506257b2 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/EmailValidateViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/EmailValidateViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { using System.ComponentModel; using System.ComponentModel.DataAnnotations; diff --git a/LearningHub.Nhs.WebUI/Models/Account/ForgotPasswordViewModel.cs b/LearningHub.Nhs.WebUI/Models/Account/ForgotPasswordViewModel.cs index d693087ad..9037018f0 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/ForgotPasswordViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/ForgotPasswordViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { using System.ComponentModel.DataAnnotations; using LearningHub.Nhs.WebUI.Attributes; diff --git a/LearningHub.Nhs.WebUI/Models/Account/LoginWizardAccountConfirmation.cs b/LearningHub.Nhs.WebUI/Models/Account/LoginWizardAccountConfirmation.cs index c1a0b546d..8d0e99385 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/LoginWizardAccountConfirmation.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/LoginWizardAccountConfirmation.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { using System.Collections.Generic; using elfhHub.Nhs.Models.Entities; diff --git a/LearningHub.Nhs.WebUI/Models/Account/LoginWizardDisplayViewModel.cs b/LearningHub.Nhs.WebUI/Models/Account/LoginWizardDisplayViewModel.cs index 9b9e084f5..9cd02f716 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/LoginWizardDisplayViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/LoginWizardDisplayViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { using elfhHub.Nhs.Models.Common; using elfhHub.Nhs.Models.Entities; diff --git a/LearningHub.Nhs.WebUI/Models/Account/LoginWizardViewModel.cs b/LearningHub.Nhs.WebUI/Models/Account/LoginWizardViewModel.cs index 5f9dfb01c..814351d27 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/LoginWizardViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/LoginWizardViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Models/Account/PasswordValidateViewModel.cs b/LearningHub.Nhs.WebUI/Models/Account/PasswordValidateViewModel.cs index 5acd9660b..36592cd52 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/PasswordValidateViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/PasswordValidateViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/Account/PersonalDetails.cs b/LearningHub.Nhs.WebUI/Models/Account/PersonalDetails.cs index c09469fac..147942c2c 100644 --- a/LearningHub.Nhs.WebUI/Models/Account/PersonalDetails.cs +++ b/LearningHub.Nhs.WebUI/Models/Account/PersonalDetails.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Account +namespace LearningHub.Nhs.WebUI.Models.Account { using System.ComponentModel; using System.ComponentModel.DataAnnotations; diff --git a/LearningHub.Nhs.WebUI/Models/ActivityDetailedItemViewModel.cs b/LearningHub.Nhs.WebUI/Models/ActivityDetailedItemViewModel.cs index 82511153e..3b3f05d4c 100644 --- a/LearningHub.Nhs.WebUI/Models/ActivityDetailedItemViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/ActivityDetailedItemViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using System.Reflection; using LearningHub.Nhs.Models.MyLearning; diff --git a/LearningHub.Nhs.WebUI/Models/Attachment.cs b/LearningHub.Nhs.WebUI/Models/Attachment.cs index d36de39af..d36a50b79 100644 --- a/LearningHub.Nhs.WebUI/Models/Attachment.cs +++ b/LearningHub.Nhs.WebUI/Models/Attachment.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/Bookmark/BookmarkActionViewModel.cs b/LearningHub.Nhs.WebUI/Models/Bookmark/BookmarkActionViewModel.cs index 7b84d8f9f..6d6dda837 100644 --- a/LearningHub.Nhs.WebUI/Models/Bookmark/BookmarkActionViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Bookmark/BookmarkActionViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Bookmark +namespace LearningHub.Nhs.WebUI.Models.Bookmark { using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Models/Bookmark/BookmarkFolderViewModel.cs b/LearningHub.Nhs.WebUI/Models/Bookmark/BookmarkFolderViewModel.cs index 141aaa37a..4f4beb9bf 100644 --- a/LearningHub.Nhs.WebUI/Models/Bookmark/BookmarkFolderViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Bookmark/BookmarkFolderViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Bookmark +namespace LearningHub.Nhs.WebUI.Models.Bookmark { using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Models/Bookmark/BookmarkItemViewModel.cs b/LearningHub.Nhs.WebUI/Models/Bookmark/BookmarkItemViewModel.cs index ad9b72569..ed6cdea93 100644 --- a/LearningHub.Nhs.WebUI/Models/Bookmark/BookmarkItemViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Bookmark/BookmarkItemViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Bookmark +namespace LearningHub.Nhs.WebUI.Models.Bookmark { using LearningHub.Nhs.Models.Bookmark; diff --git a/LearningHub.Nhs.WebUI/Models/Bookmark/EditBookmarkViewModel.cs b/LearningHub.Nhs.WebUI/Models/Bookmark/EditBookmarkViewModel.cs index 812ab1ab5..8472ceb4a 100644 --- a/LearningHub.Nhs.WebUI/Models/Bookmark/EditBookmarkViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Bookmark/EditBookmarkViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Bookmark +namespace LearningHub.Nhs.WebUI.Models.Bookmark { using System.ComponentModel.DataAnnotations; diff --git a/LearningHub.Nhs.WebUI/Models/Bookmark/MoveBookmarkViewModel.cs b/LearningHub.Nhs.WebUI/Models/Bookmark/MoveBookmarkViewModel.cs index e01d6aab8..82f97051a 100644 --- a/LearningHub.Nhs.WebUI/Models/Bookmark/MoveBookmarkViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Bookmark/MoveBookmarkViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Bookmark +namespace LearningHub.Nhs.WebUI.Models.Bookmark { using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/LearningHub.Nhs.WebUI/Models/BreadcrumbViewModel.cs b/LearningHub.Nhs.WebUI/Models/BreadcrumbViewModel.cs index 3bcb6b51d..f428c53ff 100644 --- a/LearningHub.Nhs.WebUI/Models/BreadcrumbViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/BreadcrumbViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Models/Catalogue/CatalogueAccessRequestedViewModel.cs b/LearningHub.Nhs.WebUI/Models/Catalogue/CatalogueAccessRequestedViewModel.cs index 7edc9e45f..ebdcf3c55 100644 --- a/LearningHub.Nhs.WebUI/Models/Catalogue/CatalogueAccessRequestedViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Catalogue/CatalogueAccessRequestedViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Catalogue +namespace LearningHub.Nhs.WebUI.Models.Catalogue { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/Catalogue/CatalogueIndexViewModel.cs b/LearningHub.Nhs.WebUI/Models/Catalogue/CatalogueIndexViewModel.cs index 7e60dcc14..b9fd30dca 100644 --- a/LearningHub.Nhs.WebUI/Models/Catalogue/CatalogueIndexViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Catalogue/CatalogueIndexViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Catalogue +namespace LearningHub.Nhs.WebUI.Models.Catalogue { using System.Collections.Generic; using LearningHub.Nhs.Models.Catalogue; diff --git a/LearningHub.Nhs.WebUI/Models/Catalogue/CatalogueRequestAccessViewModel.cs b/LearningHub.Nhs.WebUI/Models/Catalogue/CatalogueRequestAccessViewModel.cs index 66a2c40de..78c89a174 100644 --- a/LearningHub.Nhs.WebUI/Models/Catalogue/CatalogueRequestAccessViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Catalogue/CatalogueRequestAccessViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Catalogue +namespace LearningHub.Nhs.WebUI.Models.Catalogue { using System.ComponentModel.DataAnnotations; using LearningHub.Nhs.Models.Catalogue; diff --git a/LearningHub.Nhs.WebUI/Models/Contribute/ConfigurationModel.cs b/LearningHub.Nhs.WebUI/Models/Contribute/ConfigurationModel.cs index 8b7fee10b..e92366f24 100644 --- a/LearningHub.Nhs.WebUI/Models/Contribute/ConfigurationModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Contribute/ConfigurationModel.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.WebUI.Models.Contribute { /// diff --git a/LearningHub.Nhs.WebUI/Models/Contribute/ContributeSettingsModel.cs b/LearningHub.Nhs.WebUI/Models/Contribute/ContributeSettingsModel.cs index 284d4d508..db1a57904 100644 --- a/LearningHub.Nhs.WebUI/Models/Contribute/ContributeSettingsModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Contribute/ContributeSettingsModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Contribute +namespace LearningHub.Nhs.WebUI.Models.Contribute { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/Contribute/FileChunkProcessModel.cs b/LearningHub.Nhs.WebUI/Models/Contribute/FileChunkProcessModel.cs index 652674eed..84f730c35 100644 --- a/LearningHub.Nhs.WebUI/Models/Contribute/FileChunkProcessModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Contribute/FileChunkProcessModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Contribute +namespace LearningHub.Nhs.WebUI.Models.Contribute { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/Contribute/FileChunkRegisterModel.cs b/LearningHub.Nhs.WebUI/Models/Contribute/FileChunkRegisterModel.cs index 8c69f0878..4d8da1a6b 100644 --- a/LearningHub.Nhs.WebUI/Models/Contribute/FileChunkRegisterModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Contribute/FileChunkRegisterModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Contribute +namespace LearningHub.Nhs.WebUI.Models.Contribute { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/Contribute/FileChunkUploadResult.cs b/LearningHub.Nhs.WebUI/Models/Contribute/FileChunkUploadResult.cs index 1363c54e7..a5fe922e1 100644 --- a/LearningHub.Nhs.WebUI/Models/Contribute/FileChunkUploadResult.cs +++ b/LearningHub.Nhs.WebUI/Models/Contribute/FileChunkUploadResult.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Contribute +namespace LearningHub.Nhs.WebUI.Models.Contribute { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/Contribute/FileUploadResult.cs b/LearningHub.Nhs.WebUI/Models/Contribute/FileUploadResult.cs index b7ab55d76..5549518b5 100644 --- a/LearningHub.Nhs.WebUI/Models/Contribute/FileUploadResult.cs +++ b/LearningHub.Nhs.WebUI/Models/Contribute/FileUploadResult.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Contribute +namespace LearningHub.Nhs.WebUI.Models.Contribute { using LearningHub.Nhs.Models.Enums; diff --git a/LearningHub.Nhs.WebUI/Models/Contribute/FileUploadSettingsModel.cs b/LearningHub.Nhs.WebUI/Models/Contribute/FileUploadSettingsModel.cs index 9d58681e4..9cf8e1547 100644 --- a/LearningHub.Nhs.WebUI/Models/Contribute/FileUploadSettingsModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Contribute/FileUploadSettingsModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Contribute +namespace LearningHub.Nhs.WebUI.Models.Contribute { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/Contribute/FileUploadTypeEnum.cs b/LearningHub.Nhs.WebUI/Models/Contribute/FileUploadTypeEnum.cs index cf081ff2e..0fdfb91c8 100644 --- a/LearningHub.Nhs.WebUI/Models/Contribute/FileUploadTypeEnum.cs +++ b/LearningHub.Nhs.WebUI/Models/Contribute/FileUploadTypeEnum.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Contribute +namespace LearningHub.Nhs.WebUI.Models.Contribute { /// /// Defines the FileUploadTypeEnum. diff --git a/LearningHub.Nhs.WebUI/Models/Contribute/UrlValidationModel.cs b/LearningHub.Nhs.WebUI/Models/Contribute/UrlValidationModel.cs index c4809bb08..f402a70b6 100644 --- a/LearningHub.Nhs.WebUI/Models/Contribute/UrlValidationModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Contribute/UrlValidationModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Contribute +namespace LearningHub.Nhs.WebUI.Models.Contribute { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/DashBoard/DashBoardPagingViewModel.cs b/LearningHub.Nhs.WebUI/Models/DashBoard/DashBoardPagingViewModel.cs index 50683fbfa..7f29f8f86 100644 --- a/LearningHub.Nhs.WebUI/Models/DashBoard/DashBoardPagingViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/DashBoard/DashBoardPagingViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.DashBoard +namespace LearningHub.Nhs.WebUI.Models.DashBoard { /// /// The DashBoardPagingViewModel. diff --git a/LearningHub.Nhs.WebUI/Models/DashboardEventViewModel.cs b/LearningHub.Nhs.WebUI/Models/DashboardEventViewModel.cs index 8d9c975cf..1bb321574 100644 --- a/LearningHub.Nhs.WebUI/Models/DashboardEventViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/DashboardEventViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using LearningHub.Nhs.Models.Enums; diff --git a/LearningHub.Nhs.WebUI/Models/DashboardViewModel.cs b/LearningHub.Nhs.WebUI/Models/DashboardViewModel.cs index 0d67b9c38..c1358827f 100644 --- a/LearningHub.Nhs.WebUI/Models/DashboardViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/DashboardViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using LearningHub.Nhs.Models.Dashboard; diff --git a/LearningHub.Nhs.WebUI/Models/DisplayConfirmationViewModel.cs b/LearningHub.Nhs.WebUI/Models/DisplayConfirmationViewModel.cs index f60a1c56d..49fd9b36b 100644 --- a/LearningHub.Nhs.WebUI/Models/DisplayConfirmationViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/DisplayConfirmationViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/DisplayMessageViewModel.cs b/LearningHub.Nhs.WebUI/Models/DisplayMessageViewModel.cs index 1a70e959f..b5d9b1ea2 100644 --- a/LearningHub.Nhs.WebUI/Models/DisplayMessageViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/DisplayMessageViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/ErrorViewModel.cs b/LearningHub.Nhs.WebUI/Models/ErrorViewModel.cs index b782e6dcf..05c1faece 100644 --- a/LearningHub.Nhs.WebUI/Models/ErrorViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/ErrorViewModel.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.WebUI.Models { /// diff --git a/LearningHub.Nhs.WebUI/Models/LandingPageViewModel.cs b/LearningHub.Nhs.WebUI/Models/LandingPageViewModel.cs index 10218dda8..1db8f021b 100644 --- a/LearningHub.Nhs.WebUI/Models/LandingPageViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/LandingPageViewModel.cs @@ -1,7 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using System.Collections.Generic; using LearningHub.Nhs.Models.Common; diff --git a/LearningHub.Nhs.WebUI/Models/Learning/ActivityViewProgress.cs b/LearningHub.Nhs.WebUI/Models/Learning/ActivityViewProgress.cs index 56d092418..c466f74d0 100644 --- a/LearningHub.Nhs.WebUI/Models/Learning/ActivityViewProgress.cs +++ b/LearningHub.Nhs.WebUI/Models/Learning/ActivityViewProgress.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Learning +namespace LearningHub.Nhs.WebUI.Models.Learning { using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs b/LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs index d15542a08..f4b74519c 100644 --- a/LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs +++ b/LearningHub.Nhs.WebUI/Models/Learning/CertificateDetails.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Learning +namespace LearningHub.Nhs.WebUI.Models.Learning { using System.Collections.Generic; using System.ComponentModel; diff --git a/LearningHub.Nhs.WebUI/Models/Learning/MyLearningFormActionTypeEnum.cs b/LearningHub.Nhs.WebUI/Models/Learning/MyLearningFormActionTypeEnum.cs index b5ce82045..44b0c7adf 100644 --- a/LearningHub.Nhs.WebUI/Models/Learning/MyLearningFormActionTypeEnum.cs +++ b/LearningHub.Nhs.WebUI/Models/Learning/MyLearningFormActionTypeEnum.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Learning +namespace LearningHub.Nhs.WebUI.Models.Learning { /// /// Defines the MyLearningFormActionTypeEnum. diff --git a/LearningHub.Nhs.WebUI/Models/Learning/MyLearningPagingModel.cs b/LearningHub.Nhs.WebUI/Models/Learning/MyLearningPagingModel.cs index fca227d36..52219be62 100644 --- a/LearningHub.Nhs.WebUI/Models/Learning/MyLearningPagingModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Learning/MyLearningPagingModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Learning +namespace LearningHub.Nhs.WebUI.Models.Learning { using LearningHub.Nhs.Models.Paging; diff --git a/LearningHub.Nhs.WebUI/Models/Learning/ResourcePlayedSegment.cs b/LearningHub.Nhs.WebUI/Models/Learning/ResourcePlayedSegment.cs index 4a9feb8df..4dd3f9640 100644 --- a/LearningHub.Nhs.WebUI/Models/Learning/ResourcePlayedSegment.cs +++ b/LearningHub.Nhs.WebUI/Models/Learning/ResourcePlayedSegment.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Learning +namespace LearningHub.Nhs.WebUI.Models.Learning { using System; diff --git a/LearningHub.Nhs.WebUI/Models/LearningSessions/Interaction.cs b/LearningHub.Nhs.WebUI/Models/LearningSessions/Interaction.cs index cc8982680..4817ed14e 100644 --- a/LearningHub.Nhs.WebUI/Models/LearningSessions/Interaction.cs +++ b/LearningHub.Nhs.WebUI/Models/LearningSessions/Interaction.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.LearningSessions +namespace LearningHub.Nhs.WebUI.Models.LearningSessions { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/LearningSessions/Objective.cs b/LearningHub.Nhs.WebUI/Models/LearningSessions/Objective.cs index 0cd8bbbc7..0d6e6b689 100644 --- a/LearningHub.Nhs.WebUI/Models/LearningSessions/Objective.cs +++ b/LearningHub.Nhs.WebUI/Models/LearningSessions/Objective.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.LearningSessions +namespace LearningHub.Nhs.WebUI.Models.LearningSessions { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/LearningSessions/SCO.cs b/LearningHub.Nhs.WebUI/Models/LearningSessions/SCO.cs index 4566fbf9d..51933620b 100644 --- a/LearningHub.Nhs.WebUI/Models/LearningSessions/SCO.cs +++ b/LearningHub.Nhs.WebUI/Models/LearningSessions/SCO.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.LearningSessions +namespace LearningHub.Nhs.WebUI.Models.LearningSessions { using System.Collections.Generic; using LearningHub.Nhs.Models.Resource.Activity; diff --git a/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormContansts.cs b/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormContansts.cs index b9a345590..c2c7cd737 100644 --- a/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormContansts.cs +++ b/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormContansts.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.LearningSessions +namespace LearningHub.Nhs.WebUI.Models.LearningSessions { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormEntryValue.cs b/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormEntryValue.cs index a3eccaf00..bfa8ac450 100644 --- a/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormEntryValue.cs +++ b/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormEntryValue.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.LearningSessions +namespace LearningHub.Nhs.WebUI.Models.LearningSessions { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormExitValue.cs b/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormExitValue.cs index 0f3660e73..52b819c43 100644 --- a/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormExitValue.cs +++ b/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormExitValue.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.LearningSessions +namespace LearningHub.Nhs.WebUI.Models.LearningSessions { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormLessionStatus.cs b/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormLessionStatus.cs index 6fc52f822..93077dd85 100644 --- a/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormLessionStatus.cs +++ b/LearningHub.Nhs.WebUI/Models/LearningSessions/ScormLessionStatus.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.LearningSessions +namespace LearningHub.Nhs.WebUI.Models.LearningSessions { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/MyLearningViewModel.cs b/LearningHub.Nhs.WebUI/Models/MyLearningViewModel.cs index 14da105e7..6c14f272c 100644 --- a/LearningHub.Nhs.WebUI/Models/MyLearningViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/MyLearningViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using System; using System.Collections.Generic; @@ -189,10 +185,12 @@ public List StatusFilterCheckbox() var checkboxes = new List() { new CheckboxListItemViewModel("Complete", "Complete", null), - new CheckboxListItemViewModel("Incomplete", "Incomplete", null), + new CheckboxListItemViewModel("Incomplete", "InProgress", null), new CheckboxListItemViewModel("Passed", "Passed", null), new CheckboxListItemViewModel("Failed", "Failed", null), new CheckboxListItemViewModel("Downloaded", "Downloaded", null), + new CheckboxListItemViewModel("Viewed", "Viewed", null), + new CheckboxListItemViewModel("Launched", "Launched", null), }; return checkboxes; } diff --git a/LearningHub.Nhs.WebUI/Models/NavigationModel.cs b/LearningHub.Nhs.WebUI/Models/NavigationModel.cs index fa4e0ffea..ca4dee523 100644 --- a/LearningHub.Nhs.WebUI/Models/NavigationModel.cs +++ b/LearningHub.Nhs.WebUI/Models/NavigationModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/NotificationDetailModel.cs b/LearningHub.Nhs.WebUI/Models/NotificationDetailModel.cs index d6f2786e9..491446072 100644 --- a/LearningHub.Nhs.WebUI/Models/NotificationDetailModel.cs +++ b/LearningHub.Nhs.WebUI/Models/NotificationDetailModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using System; diff --git a/LearningHub.Nhs.WebUI/Models/PageReviewModel.cs b/LearningHub.Nhs.WebUI/Models/PageReviewModel.cs index 9952a8e8b..3c6c0ec77 100644 --- a/LearningHub.Nhs.WebUI/Models/PageReviewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/PageReviewModel.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.WebUI.Models { using System; diff --git a/LearningHub.Nhs.WebUI/Models/PaginationViewModel.cs b/LearningHub.Nhs.WebUI/Models/PaginationViewModel.cs index 28d06d967..9c7240baa 100644 --- a/LearningHub.Nhs.WebUI/Models/PaginationViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/PaginationViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/Policies/TermsAndConditionsViewModel.cs b/LearningHub.Nhs.WebUI/Models/Policies/TermsAndConditionsViewModel.cs index f9778ee72..ac4973927 100644 --- a/LearningHub.Nhs.WebUI/Models/Policies/TermsAndConditionsViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Policies/TermsAndConditionsViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Policies +namespace LearningHub.Nhs.WebUI.Models.Policies { using System; diff --git a/LearningHub.Nhs.WebUI/Models/Resource/EsrLinkViewModel.cs b/LearningHub.Nhs.WebUI/Models/Resource/EsrLinkViewModel.cs deleted file mode 100644 index 1ffde6de5..000000000 --- a/LearningHub.Nhs.WebUI/Models/Resource/EsrLinkViewModel.cs +++ /dev/null @@ -1,24 +0,0 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Resource -{ - using LearningHub.Nhs.Models.Resource; - - /// - /// Defines the . - /// - public class EsrLinkViewModel - { - /// - /// Gets or sets the ScormContentDetails. - /// - public ScormContentDetailsViewModel ScormContentDetails { get; set; } - - /// - /// Gets or sets the ReturnUrl. - /// - public string ReturnUrl { get; set; } - } -} diff --git a/LearningHub.Nhs.WebUI/Models/Resource/ResourceEditConfirmViewModel.cs b/LearningHub.Nhs.WebUI/Models/Resource/ResourceEditConfirmViewModel.cs index 94638027e..7e8e9b87f 100644 --- a/LearningHub.Nhs.WebUI/Models/Resource/ResourceEditConfirmViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Resource/ResourceEditConfirmViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Resource +namespace LearningHub.Nhs.WebUI.Models.Resource { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/Resource/ResourceIndexViewModel.cs b/LearningHub.Nhs.WebUI/Models/Resource/ResourceIndexViewModel.cs index c7f98b21f..fd48dc233 100644 --- a/LearningHub.Nhs.WebUI/Models/Resource/ResourceIndexViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Resource/ResourceIndexViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Resource +namespace LearningHub.Nhs.WebUI.Models.Resource { using System.Collections.Generic; using LearningHub.Nhs.Models.Catalogue; diff --git a/LearningHub.Nhs.WebUI/Models/Resource/ResourceUnpublishConfirmViewModel.cs b/LearningHub.Nhs.WebUI/Models/Resource/ResourceUnpublishConfirmViewModel.cs index 9cbc403cc..ad09653aa 100644 --- a/LearningHub.Nhs.WebUI/Models/Resource/ResourceUnpublishConfirmViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Resource/ResourceUnpublishConfirmViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Resource +namespace LearningHub.Nhs.WebUI.Models.Resource { using LearningHub.Nhs.Models.Enums; diff --git a/LearningHub.Nhs.WebUI/Models/Resource/ResourceValidationResultViewModel.cs b/LearningHub.Nhs.WebUI/Models/Resource/ResourceValidationResultViewModel.cs index 1f113a166..cf1af352b 100644 --- a/LearningHub.Nhs.WebUI/Models/Resource/ResourceValidationResultViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Resource/ResourceValidationResultViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Resource +namespace LearningHub.Nhs.WebUI.Models.Resource { using System.Collections.Generic; using LearningHub.Nhs.Models.Catalogue; diff --git a/LearningHub.Nhs.WebUI/Models/ResourceRatingViewModel.cs b/LearningHub.Nhs.WebUI/Models/ResourceRatingViewModel.cs index d59bed1b3..6b4c36c05 100644 --- a/LearningHub.Nhs.WebUI/Models/ResourceRatingViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/ResourceRatingViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using LearningHub.Nhs.Models.Common; diff --git a/LearningHub.Nhs.WebUI/Models/ResourceVersionHistoryViewModel.cs b/LearningHub.Nhs.WebUI/Models/ResourceVersionHistoryViewModel.cs index 0ba0ac8e7..11df0e717 100644 --- a/LearningHub.Nhs.WebUI/Models/ResourceVersionHistoryViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/ResourceVersionHistoryViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/RestrictedAccessBannerViewModel.cs b/LearningHub.Nhs.WebUI/Models/RestrictedAccessBannerViewModel.cs index 38cdead1d..59176251f 100644 --- a/LearningHub.Nhs.WebUI/Models/RestrictedAccessBannerViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/RestrictedAccessBannerViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using LearningHub.Nhs.Models.Catalogue; using LearningHub.Nhs.Models.Entities.Hierarchy; diff --git a/LearningHub.Nhs.WebUI/Models/Search/SearchActionCatalogueClickModel.cs b/LearningHub.Nhs.WebUI/Models/Search/SearchActionCatalogueClickModel.cs index 1aa9f8e62..a85e334d5 100644 --- a/LearningHub.Nhs.WebUI/Models/Search/SearchActionCatalogueClickModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Search/SearchActionCatalogueClickModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using LearningHub.Nhs.Models.Search; diff --git a/LearningHub.Nhs.WebUI/Models/Search/SearchFormActionTypeEnum.cs b/LearningHub.Nhs.WebUI/Models/Search/SearchFormActionTypeEnum.cs index b711f20b9..4fc86ce57 100644 --- a/LearningHub.Nhs.WebUI/Models/Search/SearchFormActionTypeEnum.cs +++ b/LearningHub.Nhs.WebUI/Models/Search/SearchFormActionTypeEnum.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Search +namespace LearningHub.Nhs.WebUI.Models.Search { /// /// Defines the SearchFormActionTypeEnum. diff --git a/LearningHub.Nhs.WebUI/Models/Search/SearchRequestViewModel.cs b/LearningHub.Nhs.WebUI/Models/Search/SearchRequestViewModel.cs index e8b5a2e71..8b4d5de04 100644 --- a/LearningHub.Nhs.WebUI/Models/Search/SearchRequestViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Search/SearchRequestViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Search +namespace LearningHub.Nhs.WebUI.Models.Search { using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/LearningHub.Nhs.WebUI/Models/Search/SearchResultPagingModel.cs b/LearningHub.Nhs.WebUI/Models/Search/SearchResultPagingModel.cs index fbd3bb9fa..9082444d4 100644 --- a/LearningHub.Nhs.WebUI/Models/Search/SearchResultPagingModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Search/SearchResultPagingModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Search +namespace LearningHub.Nhs.WebUI.Models.Search { using LearningHub.Nhs.Models.Paging; diff --git a/LearningHub.Nhs.WebUI/Models/Search/SearchResultViewModel.cs b/LearningHub.Nhs.WebUI/Models/Search/SearchResultViewModel.cs index 59c7c3537..bf8837d01 100644 --- a/LearningHub.Nhs.WebUI/Models/Search/SearchResultViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Search/SearchResultViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Search +namespace LearningHub.Nhs.WebUI.Models.Search { using System; using LearningHub.Nhs.Models.Paging; diff --git a/LearningHub.Nhs.WebUI/Models/SitemapViewModel.cs b/LearningHub.Nhs.WebUI/Models/SitemapViewModel.cs index 3b63d3466..e8dc5f9a4 100644 --- a/LearningHub.Nhs.WebUI/Models/SitemapViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/SitemapViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using System.Collections.Generic; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/Models/StarRatingWithCountViewModel.cs b/LearningHub.Nhs.WebUI/Models/StarRatingWithCountViewModel.cs index e61c3de28..fc49beed6 100644 --- a/LearningHub.Nhs.WebUI/Models/StarRatingWithCountViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/StarRatingWithCountViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using System.Collections.Generic; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/Models/TenantViewModel.cs b/LearningHub.Nhs.WebUI/Models/TenantViewModel.cs index 7689f14d6..545ef4bba 100644 --- a/LearningHub.Nhs.WebUI/Models/TenantViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/TenantViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/Test/FormControlsTestModel.cs b/LearningHub.Nhs.WebUI/Models/Test/FormControlsTestModel.cs index 96ef24e8f..e2d342ca2 100644 --- a/LearningHub.Nhs.WebUI/Models/Test/FormControlsTestModel.cs +++ b/LearningHub.Nhs.WebUI/Models/Test/FormControlsTestModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.Test +namespace LearningHub.Nhs.WebUI.Models.Test { using System; diff --git a/LearningHub.Nhs.WebUI/Models/ToggleBookmarkViewModel.cs b/LearningHub.Nhs.WebUI/Models/ToggleBookmarkViewModel.cs index 70e3864b0..dbcb1772c 100644 --- a/LearningHub.Nhs.WebUI/Models/ToggleBookmarkViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/ToggleBookmarkViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/TrayCard.cs b/LearningHub.Nhs.WebUI/Models/TrayCard.cs index eaaa28397..061c5b74b 100644 --- a/LearningHub.Nhs.WebUI/Models/TrayCard.cs +++ b/LearningHub.Nhs.WebUI/Models/TrayCard.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using LearningHub.Nhs.Models.Enums; diff --git a/LearningHub.Nhs.WebUI/Models/TrayCardExtended.cs b/LearningHub.Nhs.WebUI/Models/TrayCardExtended.cs index aaa1bb154..c7d3ca30b 100644 --- a/LearningHub.Nhs.WebUI/Models/TrayCardExtended.cs +++ b/LearningHub.Nhs.WebUI/Models/TrayCardExtended.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.WebUI.Models { using System; diff --git a/LearningHub.Nhs.WebUI/Models/TrayViewModel.cs b/LearningHub.Nhs.WebUI/Models/TrayViewModel.cs index e36a8815b..6560a2588 100644 --- a/LearningHub.Nhs.WebUI/Models/TrayViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/TrayViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Models/UserBasicViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserBasicViewModel.cs index 21d627333..3ed59d135 100644 --- a/LearningHub.Nhs.WebUI/Models/UserBasicViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserBasicViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using System; diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/ChangePasswordViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/ChangePasswordViewModel.cs index 87a5d86ac..36287a647 100644 --- a/LearningHub.Nhs.WebUI/Models/UserProfile/ChangePasswordViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserProfile/ChangePasswordViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.UserProfile +namespace LearningHub.Nhs.WebUI.Models.UserProfile { using System.ComponentModel.DataAnnotations; using LearningHub.Nhs.WebUI.Helpers; diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/CurrentPasswordViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/CurrentPasswordViewModel.cs index c7edec518..b4b80d3c1 100644 --- a/LearningHub.Nhs.WebUI/Models/UserProfile/CurrentPasswordViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserProfile/CurrentPasswordViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.UserProfile +namespace LearningHub.Nhs.WebUI.Models.UserProfile { using System.ComponentModel.DataAnnotations; diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/SecurityQuestionAnswerViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/SecurityQuestionAnswerViewModel.cs index ec7edc2a8..e471e55a6 100644 --- a/LearningHub.Nhs.WebUI/Models/UserProfile/SecurityQuestionAnswerViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserProfile/SecurityQuestionAnswerViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.UserProfile +namespace LearningHub.Nhs.WebUI.Models.UserProfile { using System.ComponentModel.DataAnnotations; diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/SecurityQuestionSelectViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/SecurityQuestionSelectViewModel.cs index 67ef3eccc..33ab2b517 100644 --- a/LearningHub.Nhs.WebUI/Models/UserProfile/SecurityQuestionSelectViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserProfile/SecurityQuestionSelectViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.UserProfile +namespace LearningHub.Nhs.WebUI.Models.UserProfile { using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/SecurityViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/SecurityViewModel.cs index 41a46f191..adcfe53bf 100644 --- a/LearningHub.Nhs.WebUI/Models/UserProfile/SecurityViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserProfile/SecurityViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.UserProfile +namespace LearningHub.Nhs.WebUI.Models.UserProfile { using System.Collections.Generic; using elfhHub.Nhs.Models.Common; diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/UserEmailDetailsViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/UserEmailDetailsViewModel.cs index 234da485d..536c366d1 100644 --- a/LearningHub.Nhs.WebUI/Models/UserProfile/UserEmailDetailsViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserProfile/UserEmailDetailsViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.UserProfile +namespace LearningHub.Nhs.WebUI.Models.UserProfile { using System.ComponentModel; using System.ComponentModel.DataAnnotations; diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/UserGradeUpdateViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/UserGradeUpdateViewModel.cs index dbd11d40d..af9915c18 100644 --- a/LearningHub.Nhs.WebUI/Models/UserProfile/UserGradeUpdateViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserProfile/UserGradeUpdateViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.UserProfile +namespace LearningHub.Nhs.WebUI.Models.UserProfile { using System.Collections.Generic; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/UserJobRoleUpdateViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/UserJobRoleUpdateViewModel.cs index f4e9222f0..a48170b6c 100644 --- a/LearningHub.Nhs.WebUI/Models/UserProfile/UserJobRoleUpdateViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserProfile/UserJobRoleUpdateViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.UserProfile +namespace LearningHub.Nhs.WebUI.Models.UserProfile { using System.Collections.Generic; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/UserLocationViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/UserLocationViewModel.cs index 234e10aba..ed072b9cf 100644 --- a/LearningHub.Nhs.WebUI/Models/UserProfile/UserLocationViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserProfile/UserLocationViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.UserProfile +namespace LearningHub.Nhs.WebUI.Models.UserProfile { using System.Collections.Generic; using System.ComponentModel; diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/UserMedicalCouncilNoUpdateViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/UserMedicalCouncilNoUpdateViewModel.cs index ec14a3d8a..2fbfa7378 100644 --- a/LearningHub.Nhs.WebUI/Models/UserProfile/UserMedicalCouncilNoUpdateViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserProfile/UserMedicalCouncilNoUpdateViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.UserProfile +namespace LearningHub.Nhs.WebUI.Models.UserProfile { /// /// Defines the . diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/UserPersonalDetailsViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/UserPersonalDetailsViewModel.cs index 9b4156d77..fea39d712 100644 --- a/LearningHub.Nhs.WebUI/Models/UserProfile/UserPersonalDetailsViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserProfile/UserPersonalDetailsViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.UserProfile +namespace LearningHub.Nhs.WebUI.Models.UserProfile { using System.ComponentModel; using System.ComponentModel.DataAnnotations; diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/UserPrimarySpecialtyUpdateViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/UserPrimarySpecialtyUpdateViewModel.cs index 26f930954..8dd1546ed 100644 --- a/LearningHub.Nhs.WebUI/Models/UserProfile/UserPrimarySpecialtyUpdateViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserProfile/UserPrimarySpecialtyUpdateViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.UserProfile +namespace LearningHub.Nhs.WebUI.Models.UserProfile { using System.Collections.Generic; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/UserProfileSummaryViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/UserProfileSummaryViewModel.cs index fd5486a74..38f821c59 100644 --- a/LearningHub.Nhs.WebUI/Models/UserProfile/UserProfileSummaryViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserProfile/UserProfileSummaryViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.UserProfile +namespace LearningHub.Nhs.WebUI.Models.UserProfile { using System; diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/UserStartDateUpdateViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/UserStartDateUpdateViewModel.cs index fab162753..8d45071cd 100644 --- a/LearningHub.Nhs.WebUI/Models/UserProfile/UserStartDateUpdateViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserProfile/UserStartDateUpdateViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.UserProfile +namespace LearningHub.Nhs.WebUI.Models.UserProfile { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Models/UserProfile/UserWorkPlaceUpdateViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserProfile/UserWorkPlaceUpdateViewModel.cs index 2941f2a6e..dd7652194 100644 --- a/LearningHub.Nhs.WebUI/Models/UserProfile/UserWorkPlaceUpdateViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserProfile/UserWorkPlaceUpdateViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models.UserProfile +namespace LearningHub.Nhs.WebUI.Models.UserProfile { using System.Collections.Generic; using System.Globalization; diff --git a/LearningHub.Nhs.WebUI/Models/UserViewModel.cs b/LearningHub.Nhs.WebUI/Models/UserViewModel.cs index a27843fc5..a4f03fd37 100644 --- a/LearningHub.Nhs.WebUI/Models/UserViewModel.cs +++ b/LearningHub.Nhs.WebUI/Models/UserViewModel.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Models +namespace LearningHub.Nhs.WebUI.Models { using System; diff --git a/LearningHub.Nhs.WebUI/Program.cs b/LearningHub.Nhs.WebUI/Program.cs index ec9685f50..8aee50089 100644 --- a/LearningHub.Nhs.WebUI/Program.cs +++ b/LearningHub.Nhs.WebUI/Program.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -#pragma warning disable SA1200 // Using directives should be placed correctly +#pragma warning disable SA1200 // Using directives should be placed correctly using System; using System.Diagnostics; using LearningHub.Nhs.WebUI; diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/activity.ts b/LearningHub.Nhs.WebUI/Scripts/vuesrc/activity.ts index bedfd27c5..bc5a08bbb 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/activity.ts +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/activity.ts @@ -1,13 +1,12 @@ import AxiosWrapper from './axiosWrapper'; -import { ActivityStatus, MediaResourceActivityType } from './constants'; +import { ActivityStatus, MediaResourceActivityType, ResourceType } from './constants'; import { LearningHubValidationResultModel } from './models/learningHubValidationResultModel'; import 'navigator.sendbeacon'; import { AssessmentModel } from './models/contribute-resource/assessmentModel'; -import { QuestionBlockModel } from "./models/contribute-resource/blocks/questionBlockModel"; -import { BlockCollectionModel } from "./models/contribute-resource/blocks/blockCollectionModel"; import { MatchQuestionState } from "./models/mylearning/matchQuestionState"; const recordActivityLaunched = async function ( + resourceType: ResourceType, resourceVersionId: number, nodePathId: number, activityDatetime: Date, @@ -16,7 +15,8 @@ const recordActivityLaunched = async function ( var data = { resourceVersionId: resourceVersionId, nodePathId: nodePathId, - activityStatus: ActivityStatus.Launched, + activityStatus: (resourceType == ResourceType.ASSESSMENT || resourceType == ResourceType.VIDEO || resourceType == ResourceType.AUDIO || + resourceType == ResourceType.SCORM) ? ActivityStatus.Incomplete : ActivityStatus.Completed, activityStart: activityDatetime, extraAttemptReason }; @@ -37,32 +37,6 @@ const recordActivityLaunched = async function ( }); }; - -const recordActivityDownloaded = async function ( - resourceVersionId: number, - nodePathId: number, - activityDatetime: Date): Promise { - - var data = { - resourceVersionId: resourceVersionId, - nodePathId: nodePathId, - activityStatus: ActivityStatus.Downloaded, - activityStart: activityDatetime - }; - - return await AxiosWrapper.axios.post('/api/activity/CreateResourceActivity', data) - .then(response => { - if (!response.data.isValid) { - window.location.pathname = './Home/Error'; - } - return response.data; - }) - .catch(e => { - console.log('recordActivityDownloaded:' + e); - throw e; - }); -}; - const recordActivity = async function ( resourceVersionId: number, nodePathId: number, @@ -243,7 +217,6 @@ const recordAssessmentResourceActivityInteraction = async function ( export const activityRecorder = { recordActivityLaunched, - recordActivityDownloaded, recordActivity, recordMediaResourceActivity, recordMediaResourceActivityInteraction, diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/constants.ts b/LearningHub.Nhs.WebUI/Scripts/vuesrc/constants.ts index 10a8d4486..4f3a44c0a 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/constants.ts +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/constants.ts @@ -60,7 +60,8 @@ export enum ActivityStatus { Completed = 3, Failed = 4, Passed = 5, - Downloaded = 6 + Downloaded = 6, + Incomplete = 7 }; export enum AccessRequestStatus { diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentGenericFile.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentGenericFile.vue index ecc5a2f59..f1380b1ab 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentGenericFile.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentGenericFile.vue @@ -9,13 +9,9 @@
-
+
- + Please choose the resource type as Elearning/HTML for the SCORM/AICC elearning or HTML resources.
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/IconButton.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/IconButton.vue index 2ff2c9110..7e644a318 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/IconButton.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/IconButton.vue @@ -48,7 +48,8 @@ }" v-bind:disabled="disabled"> + v-bind:aria-label="ariaLabel" + v-bind:role="iconRole"> {{ label }} @@ -65,6 +66,7 @@ color: String, shape: String, size: String, + iconRole: String, }, }); diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/models/contribute/contributeResourceModel.ts b/LearningHub.Nhs.WebUI/Scripts/vuesrc/models/contribute/contributeResourceModel.ts index dc93c207a..a50fc6d4c 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/models/contribute/contributeResourceModel.ts +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/models/contribute/contributeResourceModel.ts @@ -41,7 +41,6 @@ export class AttachedFileModel { export class GenericFileResourceModel { resourceVersionId: number = 0; file: ResourceFileModel = new ResourceFileModel(); - scormAiccContent: boolean = false; authoredYear: number = 0; authoredMonth: number = 0; authoredDayOfMonth: number = 0; diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/CaseOrAssessmentResource.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/CaseOrAssessmentResource.vue index e53397927..e3f75c8d8 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/CaseOrAssessmentResource.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/CaseOrAssessmentResource.vue @@ -307,7 +307,7 @@ // Only make a new activity if the latest activity is finished if (typeof latest.userScore === 'number') { - const result = await activityRecorder.recordActivityLaunched(this.resourceItem.resourceVersionId, this.resourceItem.nodePathId, new Date(), reason); + const result = await activityRecorder.recordActivityLaunched(this.resourceItem.resourceTypeEnum, this.resourceItem.resourceVersionId, this.resourceItem.nodePathId, new Date(), reason); this.shuffleMatchQuestionsState(); await activityRecorder.recordAssessmentResourceActivity(result.createdId, this.matchQuestionsState, reason); } diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ResourceContent.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ResourceContent.vue index a1e80d97a..00ce8a124 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ResourceContent.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ResourceContent.vue @@ -205,17 +205,13 @@ methods: { initialise(): void { // record activity on page created for resource article - if (this.userAuthenticated && ( - this.resourceItem.resourceTypeEnum === ResourceType.ARTICLE - || this.resourceItem.resourceTypeEnum === ResourceType.IMAGE - || this.resourceItem.resourceTypeEnum === ResourceType.CASE) && this.hasResourceAccess()) { - + if (this.userAuthenticated && this.resourceItem.resourceTypeEnum === ResourceType.CASE) { this.recordActivityLaunched(); } - else if (this.userAuthenticated && this.resourceItem.resourceTypeEnum === ResourceType.ASSESSMENT && this.hasResourceAccess()) { + else if (this.userAuthenticated && this.resourceItem.resourceTypeEnum === ResourceType.ASSESSMENT) { this.getCurrentAssessmentActivity(); } - if (this.resourceItem.resourceTypeEnum === ResourceType.AUDIO || this.resourceItem.resourceTypeEnum === ResourceType.VIDEO) { + else if (this.resourceItem.resourceTypeEnum === ResourceType.AUDIO || this.resourceItem.resourceTypeEnum === ResourceType.VIDEO) { window.setTimeout(this.handleResize, 100); } }, @@ -252,8 +248,8 @@ if (!this.activityLogged) { this.activityLogged = true; - - await activityRecorder.recordActivityLaunched(this.resourceItem.resourceVersionId, this.resourceItem.nodePathId, new Date()) + await activityRecorder.recordActivityLaunched(this.resourceItem.resourceTypeEnum, this.resourceItem.resourceVersionId, this.resourceItem.nodePathId, new Date()) + // await activityRecorder.recordActivityLaunched(this.resourceItem.resourceVersionId, this.resourceItem.nodePathId, new Date()) .then(response => { this.launchedResourceActivityId = response.createdId; this.checkUserCertificateAvailability(); diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/QuestionBlock.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/QuestionBlock.vue index 6366ec7fe..20945e6f2 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/QuestionBlock.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/QuestionBlock.vue @@ -9,7 +9,8 @@ + :ariaLabel="isOpen ? `hide content` : `reveal content`" + iconRole="img">
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/SingleQuestionAnswerView.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/SingleQuestionAnswerView.vue index 21925aa52..c325b1446 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/SingleQuestionAnswerView.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/SingleQuestionAnswerView.vue @@ -17,7 +17,8 @@ :class="getStyleFromAnswerType(answer.status)"/> + src="/images/medal-icon.svg" + alt="Medal Icon"/> {{ answer.blockCollection.blocks[0].textBlock.content }}
diff --git a/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs b/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs index 1d11fa64e..20582b444 100644 --- a/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs +++ b/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI +namespace LearningHub.Nhs.WebUI { using System; using System.IdentityModel.Tokens.Jwt; diff --git a/LearningHub.Nhs.WebUI/Services/ActivityService.cs b/LearningHub.Nhs.WebUI/Services/ActivityService.cs index 75e73fe4f..a494bea91 100644 --- a/LearningHub.Nhs.WebUI/Services/ActivityService.cs +++ b/LearningHub.Nhs.WebUI/Services/ActivityService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Net.Http; diff --git a/LearningHub.Nhs.WebUI/Services/AzureMediaService.cs b/LearningHub.Nhs.WebUI/Services/AzureMediaService.cs index b5c3d8a93..6068bc067 100644 --- a/LearningHub.Nhs.WebUI/Services/AzureMediaService.cs +++ b/LearningHub.Nhs.WebUI/Services/AzureMediaService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Globalization; diff --git a/LearningHub.Nhs.WebUI/Services/BaseHttpClient.cs b/LearningHub.Nhs.WebUI/Services/BaseHttpClient.cs index 0d151e67e..a8ebda5ef 100644 --- a/LearningHub.Nhs.WebUI/Services/BaseHttpClient.cs +++ b/LearningHub.Nhs.WebUI/Services/BaseHttpClient.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Concurrent; diff --git a/LearningHub.Nhs.WebUI/Services/BaseService.cs b/LearningHub.Nhs.WebUI/Services/BaseService.cs index 4bedd76b7..87d4cfc79 100644 --- a/LearningHub.Nhs.WebUI/Services/BaseService.cs +++ b/LearningHub.Nhs.WebUI/Services/BaseService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using LearningHub.Nhs.WebUI.Interfaces; using Microsoft.Extensions.Logging; diff --git a/LearningHub.Nhs.WebUI/Services/BoomarkService.cs b/LearningHub.Nhs.WebUI/Services/BoomarkService.cs index 03b0e4b0e..5a26148cc 100644 --- a/LearningHub.Nhs.WebUI/Services/BoomarkService.cs +++ b/LearningHub.Nhs.WebUI/Services/BoomarkService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Services/CardService.cs b/LearningHub.Nhs.WebUI/Services/CardService.cs index db3f72d73..d0795c0ad 100644 --- a/LearningHub.Nhs.WebUI/Services/CardService.cs +++ b/LearningHub.Nhs.WebUI/Services/CardService.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.WebUI.Services { using System; diff --git a/LearningHub.Nhs.WebUI/Services/CatalogueService.cs b/LearningHub.Nhs.WebUI/Services/CatalogueService.cs index a96fc887c..fc95fe746 100644 --- a/LearningHub.Nhs.WebUI/Services/CatalogueService.cs +++ b/LearningHub.Nhs.WebUI/Services/CatalogueService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Services/ContentService.cs b/LearningHub.Nhs.WebUI/Services/ContentService.cs index 1afe0ed0e..92fe7a7dd 100644 --- a/LearningHub.Nhs.WebUI/Services/ContentService.cs +++ b/LearningHub.Nhs.WebUI/Services/ContentService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Services/ContributeService.cs b/LearningHub.Nhs.WebUI/Services/ContributeService.cs index 152b66298..0936801ee 100644 --- a/LearningHub.Nhs.WebUI/Services/ContributeService.cs +++ b/LearningHub.Nhs.WebUI/Services/ContributeService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Services/CountryService.cs b/LearningHub.Nhs.WebUI/Services/CountryService.cs index 072be8ba4..2c0c7e120 100644 --- a/LearningHub.Nhs.WebUI/Services/CountryService.cs +++ b/LearningHub.Nhs.WebUI/Services/CountryService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Services/DashboardService.cs b/LearningHub.Nhs.WebUI/Services/DashboardService.cs index f77a57633..f3ffdbc3a 100644 --- a/LearningHub.Nhs.WebUI/Services/DashboardService.cs +++ b/LearningHub.Nhs.WebUI/Services/DashboardService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Text; diff --git a/LearningHub.Nhs.WebUI/Services/DetectJsLogService.cs b/LearningHub.Nhs.WebUI/Services/DetectJsLogService.cs index c32cbce27..da62c5cbd 100644 --- a/LearningHub.Nhs.WebUI/Services/DetectJsLogService.cs +++ b/LearningHub.Nhs.WebUI/Services/DetectJsLogService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Services/FileService.cs b/LearningHub.Nhs.WebUI/Services/FileService.cs index c5661edf5..99354b82f 100644 --- a/LearningHub.Nhs.WebUI/Services/FileService.cs +++ b/LearningHub.Nhs.WebUI/Services/FileService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.IO; diff --git a/LearningHub.Nhs.WebUI/Services/GradeService.cs b/LearningHub.Nhs.WebUI/Services/GradeService.cs index 813e149d0..fb0a42074 100644 --- a/LearningHub.Nhs.WebUI/Services/GradeService.cs +++ b/LearningHub.Nhs.WebUI/Services/GradeService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Services/HierarchyService.cs b/LearningHub.Nhs.WebUI/Services/HierarchyService.cs index 960a6e5c2..4bd8f7734 100644 --- a/LearningHub.Nhs.WebUI/Services/HierarchyService.cs +++ b/LearningHub.Nhs.WebUI/Services/HierarchyService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Services/InternalSystemService.cs b/LearningHub.Nhs.WebUI/Services/InternalSystemService.cs index ac02841f7..d578d9523 100644 --- a/LearningHub.Nhs.WebUI/Services/InternalSystemService.cs +++ b/LearningHub.Nhs.WebUI/Services/InternalSystemService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Services/JobRoleService.cs b/LearningHub.Nhs.WebUI/Services/JobRoleService.cs index 2d2c7e80b..bd4a2e689 100644 --- a/LearningHub.Nhs.WebUI/Services/JobRoleService.cs +++ b/LearningHub.Nhs.WebUI/Services/JobRoleService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Services/LearningHubHttpClient.cs b/LearningHub.Nhs.WebUI/Services/LearningHubHttpClient.cs index 80408b379..460ddabc3 100644 --- a/LearningHub.Nhs.WebUI/Services/LearningHubHttpClient.cs +++ b/LearningHub.Nhs.WebUI/Services/LearningHubHttpClient.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System.Net.Http; using LearningHub.Nhs.Caching; diff --git a/LearningHub.Nhs.WebUI/Services/LearningHubReportApiClient.cs b/LearningHub.Nhs.WebUI/Services/LearningHubReportApiClient.cs index ff03c14e1..1ae378c9b 100644 --- a/LearningHub.Nhs.WebUI/Services/LearningHubReportApiClient.cs +++ b/LearningHub.Nhs.WebUI/Services/LearningHubReportApiClient.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Services/LocationService.cs b/LearningHub.Nhs.WebUI/Services/LocationService.cs index 1af2bda9b..2ba678ab0 100644 --- a/LearningHub.Nhs.WebUI/Services/LocationService.cs +++ b/LearningHub.Nhs.WebUI/Services/LocationService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Services/LoginWizardService.cs b/LearningHub.Nhs.WebUI/Services/LoginWizardService.cs index 36945e10c..306d69304 100644 --- a/LearningHub.Nhs.WebUI/Services/LoginWizardService.cs +++ b/LearningHub.Nhs.WebUI/Services/LoginWizardService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Services/MyLearningService.cs b/LearningHub.Nhs.WebUI/Services/MyLearningService.cs index 9f23ed543..c6f9f2ffb 100644 --- a/LearningHub.Nhs.WebUI/Services/MyLearningService.cs +++ b/LearningHub.Nhs.WebUI/Services/MyLearningService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Services/NavigationPermissionService.cs b/LearningHub.Nhs.WebUI/Services/NavigationPermissionService.cs index 6e9a09e89..954b20ca7 100644 --- a/LearningHub.Nhs.WebUI/Services/NavigationPermissionService.cs +++ b/LearningHub.Nhs.WebUI/Services/NavigationPermissionService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System.Security.Principal; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Services/NotificationService.cs b/LearningHub.Nhs.WebUI/Services/NotificationService.cs index dfa7cd7c8..d41ef30d6 100644 --- a/LearningHub.Nhs.WebUI/Services/NotificationService.cs +++ b/LearningHub.Nhs.WebUI/Services/NotificationService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Net.Http; diff --git a/LearningHub.Nhs.WebUI/Services/PDFReportService.cs b/LearningHub.Nhs.WebUI/Services/PDFReportService.cs index e94ceb93b..bd7dc838a 100644 --- a/LearningHub.Nhs.WebUI/Services/PDFReportService.cs +++ b/LearningHub.Nhs.WebUI/Services/PDFReportService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System.Collections.Generic; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Services/PartialFileUploadService.cs b/LearningHub.Nhs.WebUI/Services/PartialFileUploadService.cs index 25f16c1b5..7a7a33616 100644 --- a/LearningHub.Nhs.WebUI/Services/PartialFileUploadService.cs +++ b/LearningHub.Nhs.WebUI/Services/PartialFileUploadService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.IO; diff --git a/LearningHub.Nhs.WebUI/Services/ProviderService.cs b/LearningHub.Nhs.WebUI/Services/ProviderService.cs index 0d630ddb7..44a91495b 100644 --- a/LearningHub.Nhs.WebUI/Services/ProviderService.cs +++ b/LearningHub.Nhs.WebUI/Services/ProviderService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Services/RatingService.cs b/LearningHub.Nhs.WebUI/Services/RatingService.cs index ce84bfbf2..f08361096 100644 --- a/LearningHub.Nhs.WebUI/Services/RatingService.cs +++ b/LearningHub.Nhs.WebUI/Services/RatingService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Net.Http; diff --git a/LearningHub.Nhs.WebUI/Services/RegionService.cs b/LearningHub.Nhs.WebUI/Services/RegionService.cs index f16b82935..6a48fcf5d 100644 --- a/LearningHub.Nhs.WebUI/Services/RegionService.cs +++ b/LearningHub.Nhs.WebUI/Services/RegionService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Services/ResourceService.cs b/LearningHub.Nhs.WebUI/Services/ResourceService.cs index 0cf0fe1f5..31608b797 100644 --- a/LearningHub.Nhs.WebUI/Services/ResourceService.cs +++ b/LearningHub.Nhs.WebUI/Services/ResourceService.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.WebUI.Services { using System; diff --git a/LearningHub.Nhs.WebUI/Services/RoadMapService.cs b/LearningHub.Nhs.WebUI/Services/RoadMapService.cs index 240a6bc0b..210a06096 100644 --- a/LearningHub.Nhs.WebUI/Services/RoadMapService.cs +++ b/LearningHub.Nhs.WebUI/Services/RoadMapService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Threading.Tasks; diff --git a/LearningHub.Nhs.WebUI/Services/RoleService.cs b/LearningHub.Nhs.WebUI/Services/RoleService.cs index aa74c7055..cfc3c8ff8 100644 --- a/LearningHub.Nhs.WebUI/Services/RoleService.cs +++ b/LearningHub.Nhs.WebUI/Services/RoleService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Services/SearchService.cs b/LearningHub.Nhs.WebUI/Services/SearchService.cs index 1951d1d23..3fc38d8a2 100644 --- a/LearningHub.Nhs.WebUI/Services/SearchService.cs +++ b/LearningHub.Nhs.WebUI/Services/SearchService.cs @@ -1,7 +1,3 @@ -// -// Copyright (c) HEE.nhs.uk. -// - namespace LearningHub.Nhs.WebUI.Services { using System; diff --git a/LearningHub.Nhs.WebUI/Services/SpecialtyService.cs b/LearningHub.Nhs.WebUI/Services/SpecialtyService.cs index caf862ee5..adc3f41bb 100644 --- a/LearningHub.Nhs.WebUI/Services/SpecialtyService.cs +++ b/LearningHub.Nhs.WebUI/Services/SpecialtyService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Services/TermsAndConditionsService.cs b/LearningHub.Nhs.WebUI/Services/TermsAndConditionsService.cs index a85d8873b..db00925e6 100644 --- a/LearningHub.Nhs.WebUI/Services/TermsAndConditionsService.cs +++ b/LearningHub.Nhs.WebUI/Services/TermsAndConditionsService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Net.Http; diff --git a/LearningHub.Nhs.WebUI/Services/UserApiHttpClient.cs b/LearningHub.Nhs.WebUI/Services/UserApiHttpClient.cs index 71953eef8..399ad34cc 100644 --- a/LearningHub.Nhs.WebUI/Services/UserApiHttpClient.cs +++ b/LearningHub.Nhs.WebUI/Services/UserApiHttpClient.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System.Net.Http; using LearningHub.Nhs.Caching; diff --git a/LearningHub.Nhs.WebUI/Services/UserGroupService.cs b/LearningHub.Nhs.WebUI/Services/UserGroupService.cs index 1c285f887..ae5b4dd80 100644 --- a/LearningHub.Nhs.WebUI/Services/UserGroupService.cs +++ b/LearningHub.Nhs.WebUI/Services/UserGroupService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Services/UserService.cs b/LearningHub.Nhs.WebUI/Services/UserService.cs index 92dbcd354..83b8f64d8 100644 --- a/LearningHub.Nhs.WebUI/Services/UserService.cs +++ b/LearningHub.Nhs.WebUI/Services/UserService.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Services +namespace LearningHub.Nhs.WebUI.Services { using System; using System.Collections.Generic; diff --git a/LearningHub.Nhs.WebUI/Startup/AuthenticationConfiguration.cs b/LearningHub.Nhs.WebUI/Startup/AuthenticationConfiguration.cs index 08c675717..40caab241 100644 --- a/LearningHub.Nhs.WebUI/Startup/AuthenticationConfiguration.cs +++ b/LearningHub.Nhs.WebUI/Startup/AuthenticationConfiguration.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Startup +namespace LearningHub.Nhs.WebUI.Startup { using System; using System.Linq; diff --git a/LearningHub.Nhs.WebUI/Startup/CustomHttpsRedirectionMiddleware.cs b/LearningHub.Nhs.WebUI/Startup/CustomHttpsRedirectionMiddleware.cs index a29578b30..dca0963d0 100644 --- a/LearningHub.Nhs.WebUI/Startup/CustomHttpsRedirectionMiddleware.cs +++ b/LearningHub.Nhs.WebUI/Startup/CustomHttpsRedirectionMiddleware.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Startup +namespace LearningHub.Nhs.WebUI.Startup { using System.Threading.Tasks; using Microsoft.AspNetCore.Http; diff --git a/LearningHub.Nhs.WebUI/Startup/CustomHttpsRedirectionMiddlewareExtensions.cs b/LearningHub.Nhs.WebUI/Startup/CustomHttpsRedirectionMiddlewareExtensions.cs index 3d57f04c1..83ae8343f 100644 --- a/LearningHub.Nhs.WebUI/Startup/CustomHttpsRedirectionMiddlewareExtensions.cs +++ b/LearningHub.Nhs.WebUI/Startup/CustomHttpsRedirectionMiddlewareExtensions.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Startup +namespace LearningHub.Nhs.WebUI.Startup { using Microsoft.AspNetCore.Builder; diff --git a/LearningHub.Nhs.WebUI/Startup/ServiceMappings.cs b/LearningHub.Nhs.WebUI/Startup/ServiceMappings.cs index d50c138fb..cf3877a99 100644 --- a/LearningHub.Nhs.WebUI/Startup/ServiceMappings.cs +++ b/LearningHub.Nhs.WebUI/Startup/ServiceMappings.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Startup +namespace LearningHub.Nhs.WebUI.Startup { using System.Net.Http; using GDS.MultiPageFormData; diff --git a/LearningHub.Nhs.WebUI/Startup/TimezoneInfoMiddleware.cs b/LearningHub.Nhs.WebUI/Startup/TimezoneInfoMiddleware.cs index 2690bb063..8284e1cfe 100644 --- a/LearningHub.Nhs.WebUI/Startup/TimezoneInfoMiddleware.cs +++ b/LearningHub.Nhs.WebUI/Startup/TimezoneInfoMiddleware.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Startup +namespace LearningHub.Nhs.WebUI.Startup { using System.Threading.Tasks; using LearningHub.Nhs.Caching; diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/common.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/common.scss index 067b105fe..72d1fe015 100644 --- a/LearningHub.Nhs.WebUI/Styles/nhsuk/common.scss +++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/common.scss @@ -139,9 +139,9 @@ padding-right: px2rem(68); } -#maincontent .search-width-container { +#maincontent { - .nhsuk-search__submit__green span.nhsuk-u-visually-hidden { + button[class^='nhsuk-search__submit'] span.nhsuk-u-visually-hidden { color: #595959; background-color: #fff; } @@ -222,4 +222,4 @@ white-space: nowrap; margin-top: auto !important; margin-bottom: auto !important; -} \ No newline at end of file +} diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss index 03eb2e416..e5c9cb57a 100644 --- a/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss +++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss @@ -108,6 +108,16 @@ } +.nhsuk-header__search { + .nhsuk-search__input { + width: px2rem(260); + } + + #search > label.nhsuk-u-visually-hidden { + background-color: $nhsuk-white; + } +} + .nhsuk-account__login--link, .nhsuk-account__login--link:visited, .nhsuk-account__login--link:hover { @@ -325,6 +335,10 @@ .nhsuk-back-link { padding: 0.5rem 0; } + + .nhsuk-header__menu .nhsuk-header__not-mobile { + display: none; + } } /* mobile */ diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/mylearning.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/mylearning.scss index 0d28c2393..26b854a14 100644 --- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/mylearning.scss +++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/mylearning.scss @@ -2,7 +2,7 @@ .my-learning { - + .downloadbuttonaslink { background: none !important; @@ -101,6 +101,8 @@ .search-filters { + position: relative; + .nhsuk-expander { border-width: 0; @@ -126,31 +128,33 @@ border-width: 12.124px 7px 0 7px; border-top-color: inherit } + } - .filter-summary { - color: $nhsuk-black; + .filter-summary { + color: $nhsuk-black; + display: flex; + line-height: 1.8; + position: absolute; + z-index: 1; + margin-top: 67px; + width: 100%; + + .clear-filter { + justify-content: flex-end; display: flex; - line-height: 1.8; - - .clear-filter { - justify-content: flex-end; - display: flex; - flex: 1 1 auto !important; - } + flex: 1 1 auto !important; + } - @media(max-width: 48.0525em) { - display: initial; + @media(max-width: 48.0525em) { + display: initial; - .clear-filter { - display: block; - margin-top: 12px; - } + .clear-filter { + display: block; + margin-top: 12px; } } } - - .search-filter-items { background-color: $nhsuk-grey-white; } diff --git a/LearningHub.Nhs.WebUI/Validation/NotEqualAttribute.cs b/LearningHub.Nhs.WebUI/Validation/NotEqualAttribute.cs index cd96f486b..73496feb6 100644 --- a/LearningHub.Nhs.WebUI/Validation/NotEqualAttribute.cs +++ b/LearningHub.Nhs.WebUI/Validation/NotEqualAttribute.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Validation +namespace LearningHub.Nhs.WebUI.Validation { using System.ComponentModel.DataAnnotations; diff --git a/LearningHub.Nhs.WebUI/Validation/RequiredIfAttribute.cs b/LearningHub.Nhs.WebUI/Validation/RequiredIfAttribute.cs index 40a804a9c..3a904d685 100644 --- a/LearningHub.Nhs.WebUI/Validation/RequiredIfAttribute.cs +++ b/LearningHub.Nhs.WebUI/Validation/RequiredIfAttribute.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.Validation +namespace LearningHub.Nhs.WebUI.Validation { using System.ComponentModel.DataAnnotations; diff --git a/LearningHub.Nhs.WebUI/ViewComponents/NavigationItemsViewComponent.cs b/LearningHub.Nhs.WebUI/ViewComponents/NavigationItemsViewComponent.cs index e033fac20..6b81891cd 100644 --- a/LearningHub.Nhs.WebUI/ViewComponents/NavigationItemsViewComponent.cs +++ b/LearningHub.Nhs.WebUI/ViewComponents/NavigationItemsViewComponent.cs @@ -1,8 +1,4 @@ -// -// Copyright (c) HEE.nhs.uk. -// - -namespace LearningHub.Nhs.WebUI.ViewComponents +namespace LearningHub.Nhs.WebUI.ViewComponents { using System.Threading.Tasks; using LearningHub.Nhs.Caching; diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml index 76dba2b01..970a38bc5 100644 --- a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml @@ -164,12 +164,13 @@ @* Tab header *@
\ No newline at end of file diff --git a/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml index 07c2caa6e..6e0f806bd 100644 --- a/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml @@ -82,7 +82,7 @@
@if (!string.IsNullOrWhiteSpace(item.CatalogueBadgeUrl) && showCatalogueFieldsInResources) { - + Resource catalog badge } @if (!string.IsNullOrEmpty(item.CatalogueName) && !this.Model.CatalogueId.HasValue && showCatalogueFieldsInResources) diff --git a/LearningHub.Nhs.WebUI/Views/Search/_SubmitFeedback.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_SubmitFeedback.cshtml index 6d220e4f1..dca9f2bce 100644 --- a/LearningHub.Nhs.WebUI/Views/Search/_SubmitFeedback.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Search/_SubmitFeedback.cshtml @@ -34,6 +34,7 @@ +
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml index 0a9862213..129148377 100644 --- a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml @@ -51,7 +51,7 @@