From 01cf6785861158033c9723d11e67af2c8d966c6c Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Fri, 31 May 2024 11:38:06 +0100
Subject: [PATCH 001/143] Fix text exiting box constraints when font size
 changes

---
 LearningHub.Nhs.WebUI/Styles/nhsuk/pages/landing_page.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/landing_page.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/landing_page.scss
index 3fef36177..46035670d 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/landing_page.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/landing_page.scss
@@ -19,7 +19,7 @@
     top: 2rem;
     left: min(50vw - 3.75rem,100vw - 37.5rem);
     width: 37.5rem;
-    height: 14rem;
+    //height: 14rem;
     padding: 2rem;
     font-size: 1.5rem;
 

From 257dc659bf9de0ed89b10ebbc1b1faea27334e37 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Tue, 4 Jun 2024 16:33:21 +0100
Subject: [PATCH 002/143] Remove alternative back button for Role search page

---
 .../Views/Account/CreateAccountSearchRole.cshtml     | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml
index c74b7ee0e..21c3e60b7 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml
@@ -15,16 +15,8 @@
         <div class="nhsuk-width-container app-width-container">
             <div class="nhsuk-grid-row">
             <div class="nhsuk-grid-column-two-thirds nhsuk-u-padding-bottom-9">
-                @if (Model.CountryId == "1")
-                {
-                    <vc:back-link asp-controller="Account" asp-action="CreateAccountRegionSelection" asp-all-route-data="@routeData" link-text="Back to: Select your region" />
-
-                }
-                else
-                {
-                    <vc:back-link asp-controller="Account" asp-action="CreateAccountCountrySelection" asp-all-route-data="@routeData" link-text="Back to: Select your country" />
-
-                }
+                <vc:back-link asp-controller="Account" asp-action="CreateAccountRegionSelection" asp-all-route-data="@routeData" link-text="Back to: Select your region" />
+                
                 @if (errorHasOccurred)
                 {
                     <vc:error-summary order-of-property-names="@(new[] { nameof(Model) })" />

From 3591fd9e3984a9f6d40a21cff617c02ef508c7e6 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Mon, 10 Jun 2024 11:39:09 +0100
Subject: [PATCH 003/143] Add non breaking space symbol to symulate space-bar
 space. Separate names with normal space.

---
 .../Views/MyAccount/Index.cshtml              | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml
index cd3cde3ac..d9677b2d5 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml
@@ -53,7 +53,7 @@
 
                 <dd class="nhsuk-summary-list__actions">
                     <a asp-action="ChangeFirstName">
-                        Change<span class="nhsuk-u-visually-hidden"> firstname</span>
+                        Change <span class="nhsuk-u-visually-hidden">first name</span>
                     </a>
 
                 </dd>
@@ -70,7 +70,7 @@
                 <dd class="nhsuk-summary-list__actions">
 
                     <a asp-action="ChangeLastName">
-                        Change<span class="nhsuk-u-visually-hidden"> lastname</span>
+                        Change<span class="nhsuk-u-visually-hidden">&nbsp;last name</span>
                     </a>
 
                 </dd>
@@ -86,7 +86,7 @@
 
                 <dd class="nhsuk-summary-list__actions">
                     <a asp-action="ChangePreferredName">
-                        Change<span class="nhsuk-u-visually-hidden"> preferredname</span>
+                        Change<span class="nhsuk-u-visually-hidden">&nbsp;preferred name</span>
                     </a>
 
                 </dd>
@@ -108,7 +108,7 @@
                 <dd class="nhsuk-summary-list__actions">
 
                     <a asp-action="ChangeCountry">
-                        Change<span class="nhsuk-u-visually-hidden"> country</span>
+                        Change<span class="nhsuk-u-visually-hidden">&nbsp;country</span>
                     </a>
 
                 </dd>
@@ -127,7 +127,7 @@
                     <dd class="nhsuk-summary-list__actions">
 
                         <a asp-action="ChangeRegion">
-                            Change<span class="nhsuk-u-visually-hidden"> region</span>
+                            Change<span class="nhsuk-u-visually-hidden">&nbsp;region</span>
                         </a>
 
                     </dd>
@@ -159,7 +159,7 @@
                 <dd class="nhsuk-summary-list__actions">
 
                     <a asp-action="ChangePrimaryEmail">
-                        Change<span class="nhsuk-u-visually-hidden"> primaryemail</span>
+                        Change<span class="nhsuk-u-visually-hidden">&nbsp;primary email</span>
                     </a>
 
                 </dd>
@@ -177,7 +177,7 @@
                 <dd class="nhsuk-summary-list__actions">
 
                     <a asp-action="ChangeSecondaryEmail">
-                        Change<span class="nhsuk-u-visually-hidden"> secondryemail</span>
+                        Change<span class="nhsuk-u-visually-hidden">&nbsp;secondry email</span>
                     </a>
 
                 </dd>
@@ -209,7 +209,7 @@
                 <dd class="nhsuk-summary-list__actions">
 
                     <a asp-action="ConfirmPassword">
-                        Change<span class="nhsuk-u-visually-hidden"> password</span>
+                        Change<span class="nhsuk-u-visually-hidden">&nbsp;password</span>
                     </a>
 
                 </dd>
@@ -227,7 +227,7 @@
                 <dd class="nhsuk-summary-list__actions">
 
                     <a asp-action="SecurityQuestionsDetails" asp-route-questionIndex="0">
-                        Change<span class="nhsuk-u-visually-hidden"> security question 1</span>
+                        Change<span class="nhsuk-u-visually-hidden">&nbsp;security question 1</span>
                     </a>
 
                 </dd>
@@ -244,7 +244,7 @@
                 <dd class="nhsuk-summary-list__actions">
 
                     <a asp-action="SecurityQuestionsDetails" asp-route-questionIndex="1">
-                        Change<span class="nhsuk-u-visually-hidden"> security question 2</span>
+                        Change<span class="nhsuk-u-visually-hidden">&nbsp;security question 2</span>
                     </a>
 
                 </dd>
@@ -260,7 +260,7 @@
                 <dd class="nhsuk-summary-list__value">@Model.JobRole</dd>
                 <dd class="nhsuk-summary-list__actions">
                     <a asp-action="ChangeCurrentRole">
-                        Change<span class="nhsuk-u-visually-hidden"> current role</span>
+                        Change<span class="nhsuk-u-visually-hidden">&nbsp;current role</span>
                     </a>
                 </dd>
             </div>
@@ -272,7 +272,7 @@
                     <dd class="nhsuk-summary-list__value">@Model.MedicalCouncilNo</dd>
                     <dd class="nhsuk-summary-list__actions">
                         <a asp-action="ChangeMedicalCouncilNo" asp-route-selectedJobRoleId="@Model.JobRoleId" asp-route-direct="true">
-                            Change<span class="nhsuk-u-visually-hidden"> professional registration number</span>
+                            Change<span class="nhsuk-u-visually-hidden">&nbsp;professional registration number</span>
                         </a>
                     </dd>
                 </div>
@@ -284,7 +284,7 @@
                     <dd class="nhsuk-summary-list__value">@Model.Grade</dd>
                     <dd class="nhsuk-summary-list__actions">
                         <a asp-action="ChangeGrade" asp-route-selectedJobRoleId="@Model.JobRoleId" asp-route-direct="true">
-                            Change<span class="nhsuk-u-visually-hidden"> grade</span>
+                            Change<span class="nhsuk-u-visually-hidden">&nbsp;grade</span>
                         </a>
                     </dd>
                 </div>
@@ -294,7 +294,7 @@
                     <dd class="nhsuk-summary-list__value">@Model.PrimarySpecialty</dd>
                     <dd class="nhsuk-summary-list__actions">
                         <a asp-action="ChangePrimarySpecialty">
-                            Change<span class="nhsuk-u-visually-hidden"> primary specialty</span>
+                            Change<span class="nhsuk-u-visually-hidden">&nbsp;primary specialty</span>
                         </a>
                     </dd>
                 </div>
@@ -304,7 +304,7 @@
                     <dd class="nhsuk-summary-list__value">@Model.JobStartDate?.ToString("dd MMMM yyyy")</dd>
                     <dd class="nhsuk-summary-list__actions">
                         <a asp-action="ChangeStartDate">
-                            Change<span class="nhsuk-u-visually-hidden"> start date</span>
+                            Change<span class="nhsuk-u-visually-hidden">&nbsp;start date</span>
                         </a>
                     </dd>
                 </div>
@@ -314,7 +314,7 @@
                 <dd class="nhsuk-summary-list__value">@Html.Raw(Model.PlaceOfWork)</dd>
                 <dd class="nhsuk-summary-list__actions">
                     <a asp-action="ChangeWorkPlace">
-                        Change<span class="nhsuk-u-visually-hidden"> place of work</span>
+                        Change<span class="nhsuk-u-visually-hidden">&nbsp;place of work</span>
                     </a>
                 </dd>
             </div>

From 1752d7e772f8e93bd0b95b1af987a97b3aa343cb Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Mon, 10 Jun 2024 12:42:56 +0100
Subject: [PATCH 004/143] Remove external footer tag

---
 .../Views/Shared/Tenant/LearningHub/_Layout.cshtml           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
index dbacc093d..881907ad9 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
@@ -96,9 +96,8 @@
         @* Inject form here *@
     </div>
 
-    <footer role="contentinfo">
-        <partial name="~/Views/Shared/_FooterPartial.cshtml" />
-    </footer>
+    <!-- footer -->
+    <partial name="~/Views/Shared/_FooterPartial.cshtml" />
 
     <script>
         if (!window.process) { window.process = {}; }

From 87b2111f507598e2eafee726645328ebb3f2bac8 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Tue, 11 Jun 2024 15:57:53 +0100
Subject: [PATCH 005/143] Replace Notification page Delete anchor with button

---
 .../Scripts/vuesrc/notification/notification.vue     |  3 +--
 LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss       | 12 ++++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notification.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notification.vue
index ba448902d..6c0481a25 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notification.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notification.vue
@@ -45,8 +45,7 @@
                             </td>
                             <td class="px-sm-3 py-sm-3">
                                 <div class="d-flex justify-content-between" v-if="notification.userDismissable">
-                                    <a href="#deleteModal" data-toggle="modal" @click="selectNotification(notification)">Delete</a>
-                                    &nbsp;<i class="fa-solid fa-trash-can-alt pt-1"></i>
+                                    <button data-target="#deleteModal" data-toggle="modal" @click="selectNotification(notification)">Delete <i class="fa-solid fa-trash-can-alt pt-1"></i></button>
                                 </div>
                             </td>
                         </tr>
diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss
index 3bd13c109..8e30ca18b 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss
@@ -183,6 +183,18 @@
     }
 }
 
+button[data-toggle="modal"] {
+    color: #005eb8;
+    padding: 0;
+    border: none;
+    background: none;
+
+    &:focus {
+        background: yellow;
+        border-bottom: 4px solid;
+    }
+}
+
 /* large desktop */
 @media (min-width: px2rem(990)) {
 

From c27c2a7a488c2b9d746e98625f4b6a385130fc8c Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Wed, 12 Jun 2024 09:05:53 +0100
Subject: [PATCH 006/143] Add alternative hidden text to be displayed when
 certificate is not available in My Learning page

---
 LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTable.cshtml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTable.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTable.cshtml
index 9df2b40fa..017c2bac7 100644
--- a/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTable.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTable.cshtml
@@ -108,6 +108,9 @@
                   <a target="_blank" asp-controller="mylearning" asp-action="certificate" asp-route-resourceReferenceId="@activity.ResourceReferenceId" asp-route-majorVersion="@activity.MajorVersion" asp-route-minorVersion="@activity.MinorVersion">View certificate</a>
                 }
               }
+              else {
+                  <span class="nhsuk-u-visually-hidden">Certificate unavailable</span>
+              }
             </span>
           </td>
           <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">

From c75cc9782847eb62be922ffbb04dc29f82d5a18c Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Fri, 21 Jun 2024 15:59:52 +0100
Subject: [PATCH 007/143] Contain video play button centered within parent
 boundaries

---
 LearningHub.Nhs.WebUI/Styles/nhsuk/pages/resource.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/resource.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/resource.scss
index 437e6d46a..a8f1154fc 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/resource.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/resource.scss
@@ -17,6 +17,11 @@
 // Resource content section -----------------------------------------
 #mediacontainer .azuremediaplayer {
     border: 1px solid $nhsuk-grey-light;
+
+    button.vjs-big-play-button:before {
+        width: 60%;
+    }
+
 }
 
 .image-container {

From aa0bb30f632b4198e260a96a3a95f61c9e686d06 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Wed, 26 Jun 2024 09:06:06 +0100
Subject: [PATCH 008/143] Display pagination landmark only when pagination show
 is enabled

---
 .../_AccountCreationGradePaging.cshtml        |  4 +-
 .../_AccountCreationJobRolePaging.cshtml      |  4 +-
 .../_AccountCreationRegionPaging.cshtml       |  8 +-
 .../_AccountCreationSpecialtyPaging.cshtml    |  5 +-
 .../_AccountCreationWorkPlacePaging.cshtml    |  5 +-
 .../Views/MyAccount/_UserJobRolePaging.cshtml | 85 ++++++++++---------
 .../_UserPrimarySpecialtyPaging.cshtml        | 84 +++++++++---------
 .../MyAccount/_UserWorkPlacePaging.cshtml     | 85 ++++++++++---------
 .../MyLearning/_ActivityTablePaging.cshtml    | 83 +++++++++---------
 .../Views/Search/_SubmitFeedback.cshtml       |  2 +-
 10 files changed, 190 insertions(+), 175 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml
index 71714fb5e..003a78163 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml
@@ -24,7 +24,8 @@
     }
 }
 
-
+@if (showPaging == true)
+{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -68,4 +69,5 @@
             }
         </ul>
     </nav>
+}
 
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml
index 37c56f917..9232336fb 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml
@@ -24,7 +24,8 @@
     }
 }
 
-
+@if (showPaging == true)
+{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -68,4 +69,5 @@
             }
         </ul>
     </nav>
+}
 
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml
index 81eccb142..3a3ea02f8 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml
@@ -24,10 +24,11 @@
     }
 }
 
-
+@if (showPaging == true)
+{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
-    <ul class="nhsuk-list nhsuk-pagination__list">
-            
+        <ul class="nhsuk-list nhsuk-pagination__list">
+
             @if (pagingModel.CurrentPage <= 1)
             {
                 <li class="nhsuk-pagination-item--previous">
@@ -68,4 +69,5 @@
             }
         </ul>
     </nav>
+}
 
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml
index 78df5e67f..0c5f04028 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml
@@ -24,7 +24,8 @@
     }
 }
 
-
+@if (showPaging == true)
+{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -68,4 +69,4 @@
             }
         </ul>
     </nav>
-
+}
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml
index d46d0c3dd..ac9518fe8 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml
@@ -24,7 +24,8 @@
     }
 }
 
-
+@if (showPaging == true)
+{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -68,4 +69,4 @@
             }
         </ul>
     </nav>
-
+}
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserJobRolePaging.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserJobRolePaging.cshtml
index f07ce1500..9f5a28e14 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserJobRolePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserJobRolePaging.cshtml
@@ -22,48 +22,49 @@
     }
 }
 
+@if (showPaging == true)
+{
+    <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
+        <ul class="nhsuk-list nhsuk-pagination__list">
 
-<nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
-    <ul class="nhsuk-list nhsuk-pagination__list">
+            @if (pagingModel.CurrentPage <= 1)
+            {
+                <li class="nhsuk-pagination-item--previous">
 
-        @if (pagingModel.CurrentPage <= 1)
-        {
-            <li class="nhsuk-pagination-item--previous">
-
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--previous">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="ChangeCurrentRole" asp-route-currentPage="@(CurrentPageIndex - 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
-                    <span class="nhsuk-pagination__title">Previous</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@previousMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-        @if (pagingModel.CurrentPage == pagingModel.TotalPages)
-        {
-            <li class="nhsuk-pagination-item--next">
-
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--next">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="ChangeCurrentRole" asp-route-currentPage="@(CurrentPageIndex + 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
-                    <span class="nhsuk-pagination__title">Next</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@nextMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-    </ul>
-</nav>
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--previous">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="ChangeCurrentRole" asp-route-currentPage="@(CurrentPageIndex - 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
+                        <span class="nhsuk-pagination__title">Previous</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@previousMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+            @if (pagingModel.CurrentPage == pagingModel.TotalPages)
+            {
+                <li class="nhsuk-pagination-item--next">
 
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--next">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="ChangeCurrentRole" asp-route-currentPage="@(CurrentPageIndex + 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
+                        <span class="nhsuk-pagination__title">Next</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@nextMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+        </ul>
+    </nav>
+}
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserPrimarySpecialtyPaging.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserPrimarySpecialtyPaging.cshtml
index 137e6072b..f7513314d 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserPrimarySpecialtyPaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserPrimarySpecialtyPaging.cshtml
@@ -22,48 +22,50 @@
     }
 }
 
+@if (showPaging == true)
+{
+    <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
+        <ul class="nhsuk-list nhsuk-pagination__list">
 
-<nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
-    <ul class="nhsuk-list nhsuk-pagination__list">
+            @if (pagingModel.CurrentPage <= 1)
+            {
+                <li class="nhsuk-pagination-item--previous">
 
-        @if (pagingModel.CurrentPage <= 1)
-        {
-            <li class="nhsuk-pagination-item--previous">
-
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--previous">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="ChangePrimarySpecialty" asp-route-currentPage="@(CurrentPageIndex - 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
-                    <span class="nhsuk-pagination__title">Previous</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@previousMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-        @if (pagingModel.CurrentPage == pagingModel.TotalPages)
-        {
-            <li class="nhsuk-pagination-item--next">
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--previous">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="ChangePrimarySpecialty" asp-route-currentPage="@(CurrentPageIndex - 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
+                        <span class="nhsuk-pagination__title">Previous</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@previousMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+            @if (pagingModel.CurrentPage == pagingModel.TotalPages)
+            {
+                <li class="nhsuk-pagination-item--next">
 
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--next">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="ChangePrimarySpecialty" asp-route-currentPage="@(CurrentPageIndex + 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
-                    <span class="nhsuk-pagination__title">Next</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@nextMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-    </ul>
-</nav>
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--next">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="ChangePrimarySpecialty" asp-route-currentPage="@(CurrentPageIndex + 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
+                        <span class="nhsuk-pagination__title">Next</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@nextMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+        </ul>
+    </nav>
+}
 
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserWorkPlacePaging.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserWorkPlacePaging.cshtml
index 04f149fbf..fb6fb7e5a 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserWorkPlacePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserWorkPlacePaging.cshtml
@@ -22,48 +22,49 @@
     }
 }
 
+@if (showPaging == true)
+{
+    <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
+        <ul class="nhsuk-list nhsuk-pagination__list">
 
-<nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
-    <ul class="nhsuk-list nhsuk-pagination__list">
+            @if (pagingModel.CurrentPage <= 1)
+            {
+                <li class="nhsuk-pagination-item--previous">
 
-        @if (pagingModel.CurrentPage <= 1)
-        {
-            <li class="nhsuk-pagination-item--previous">
-
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--previous">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="ChangeWorkPlace" asp-route-currentPage="@(CurrentPageIndex - 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
-                    <span class="nhsuk-pagination__title">Previous</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@previousMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-        @if (pagingModel.CurrentPage == pagingModel.TotalPages)
-        {
-            <li class="nhsuk-pagination-item--next">
-
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--next">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="ChangeWorkPlace" asp-route-currentPage="@(CurrentPageIndex + 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
-                    <span class="nhsuk-pagination__title">Next</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@nextMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-    </ul>
-</nav>
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--previous">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="ChangeWorkPlace" asp-route-currentPage="@(CurrentPageIndex - 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
+                        <span class="nhsuk-pagination__title">Previous</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@previousMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+            @if (pagingModel.CurrentPage == pagingModel.TotalPages)
+            {
+                <li class="nhsuk-pagination-item--next">
 
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--next">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="ChangeWorkPlace" asp-route-currentPage="@(CurrentPageIndex + 1)" asp-route-filterText="@Context.Request.Query["filterText"]">
+                        <span class="nhsuk-pagination__title">Next</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@nextMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+        </ul>
+    </nav>
+}
diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTablePaging.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTablePaging.cshtml
index 9d0e60544..7ff229639 100644
--- a/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTablePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTablePaging.cshtml
@@ -28,46 +28,49 @@
     previousRouteData["MyLearningFormActionType"] = MyLearningFormActionTypeEnum.PreviousPageChange.ToString();
 }
 
-<nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
-    <ul class="nhsuk-list nhsuk-pagination__list">
+@if (showPaging == true)
+{
+    <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
+        <ul class="nhsuk-list nhsuk-pagination__list">
 
-        @if (pagingModel.CurrentPage <= 0)
-        {
-            <li class="nhsuk-pagination-item--previous">
+            @if (pagingModel.CurrentPage <= 0)
+            {
+                <li class="nhsuk-pagination-item--previous">
 
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--previous">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="Index" asp-all-route-data="@previousRouteData">
-                    <span class="nhsuk-pagination__title">Previous</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@previousMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-        @if (pagingModel.CurrentPage >= pagingModel.TotalPages - 1)
-        {
-            <li class="nhsuk-pagination-item--next">
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--previous">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--prev" asp-action="Index" asp-all-route-data="@previousRouteData">
+                        <span class="nhsuk-pagination__title">Previous</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@previousMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M4.1 12.3l2.7 3c.2.2.5.2.7 0 .1-.1.1-.2.1-.3v-2h11c.6 0 1-.4 1-1s-.4-1-1-1h-11V9c0-.2-.1-.4-.3-.5h-.2c-.1 0-.3.1-.4.2l-2.7 3c0 .2 0 .4.1.6z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+            @if (pagingModel.CurrentPage >= pagingModel.TotalPages - 1)
+            {
+                <li class="nhsuk-pagination-item--next">
 
-            </li>
-        }
-        else
-        {
-            <li class="nhsuk-pagination-item--next">
-                <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="Index" asp-all-route-data="@nextRouteData">
-                    <span class="nhsuk-pagination__title">Next</span>
-                    <span class="nhsuk-u-visually-hidden">:</span>
-                    <span class="nhsuk-pagination__page">@nextMessage</span>
-                    <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
-                        <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
-                    </svg>
-                </a>
-            </li>
-        }
-    </ul>
-</nav>
\ No newline at end of file
+                </li>
+            }
+            else
+            {
+                <li class="nhsuk-pagination-item--next">
+                    <a class="nhsuk-pagination__link nhsuk-pagination__link--next" asp-action="Index" asp-all-route-data="@nextRouteData">
+                        <span class="nhsuk-pagination__title">Next</span>
+                        <span class="nhsuk-u-visually-hidden">:</span>
+                        <span class="nhsuk-pagination__page">@nextMessage</span>
+                        <svg class="nhsuk-icon nhsuk-icon__arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" width="34" height="34">
+                            <path d="M19.6 11.66l-2.73-3A.51.51 0 0 0 16 9v2H5a1 1 0 0 0 0 2h11v2a.5.5 0 0 0 .32.46.39.39 0 0 0 .18 0 .52.52 0 0 0 .37-.16l2.73-3a.5.5 0 0 0 0-.64z"></path>
+                        </svg>
+                    </a>
+                </li>
+            }
+        </ul>
+    </nav>
+}
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_SubmitFeedback.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_SubmitFeedback.cshtml
index dca9f2bce..a1ab36e1a 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_SubmitFeedback.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_SubmitFeedback.cshtml
@@ -21,7 +21,7 @@
 
                 @if (this.ViewBag.EmptyFeedbackError == true)
                 {
-                    <span class="nhsuk-error-message nhsuk-u-padding-bottom-2">
+                    <span class="nhsuk-error-message nhsuk-u-padding-bottom-2" role="status">
                         <span class="nhsuk-u-visually-hidden">Error:</span> You must provide feedback
                     </span>
                 }

From 91561452910c624937edcaa891b18c9c0c3a87d9 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Fri, 28 Jun 2024 14:26:27 +0100
Subject: [PATCH 009/143] Associate error label with target input

---
 .../Views/Account/CreateAccountCountrySearch.cshtml             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml
index 21d55c2e8..18d419953 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml
@@ -24,7 +24,7 @@
                     <input type="hidden" name="formSubmission" value="true">
                     <label for="FilterText" class="nhsuk-body-l nhsuk-u-font-size-19 nhsuk-u-margin-bottom-3">Search for example, England</label>
                     <div class="nhsuk-form-group search-box-container" style="white-space:nowrap">
-                        <input class="nhsuk-input nhsuk-search__input" type="search" autocomplete="off" id="FilterText" name="FilterText" placeholder="" value="@Model.FilterText">
+                        <input class="nhsuk-input nhsuk-search__input" type="search" autocomplete="off" id="FilterText" name="FilterText" placeholder="" value="@Model.FilterText" @if(errorHasOccurred){<text>aria-describedby="error-summary-title"</text>}>
                         <button class="nhsuk-search__submit" type="submit">
                             <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
                                 <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>

From ff76d8f48bd1062c40fd5ef9bc97acfd91fb90e5 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Fri, 5 Jul 2024 11:03:20 +0100
Subject: [PATCH 010/143] pulled from scorpius and added openapicontrollerbase

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 4119589ad..04baa838f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,5 @@ obj
 /WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Database/LearningHub.Nhs.Migration.Staging.Database.dbmdl
 /WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Database/LearningHub.Nhs.Migration.Staging.Database.jfm
 /LearningHub.Nhs.WebUI.AutomatedUiTests/appsettings.Development.json
+/OpenAPI/LearningHub.Nhs.OpenApi/appsettings.Development.json
+/OpenAPI/LearningHub.Nhs.OpenApi/web.config

From 1b3d60dcfbc87cdc376589d8e5c810601adbe621 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Fri, 5 Jul 2024 13:21:17 +0100
Subject: [PATCH 011/143] current userid into controller

---
 .../Services/IResourceService.cs              |  4 +-
 .../Services/ISearchService.cs                |  2 +-
 .../Services/ResourceService.cs               |  5 ++-
 .../Services/SearchService.cs                 |  6 +--
 .../Controllers/OpenApiControllerBase.cs      | 41 +++++++++++++++++++
 .../Controllers/ResourceController.cs         | 10 ++---
 6 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 OpenAPI/LearningHub.Nhs.OpenApi/Controllers/OpenApiControllerBase.cs

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IResourceService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IResourceService.cs
index 8b2e46dee..795ddbf42 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IResourceService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IResourceService.cs
@@ -15,13 +15,13 @@ public interface IResourceService
         /// </summary>
         /// <param name="originalResourceReferenceId">The original resource reference id.</param>
         /// <returns>The <see cref="Task"/>the resourceMetaDataViewModel corresponding to the resource reference.</returns>
-        Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceReferenceByOriginalId(int originalResourceReferenceId);
+        Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceReferenceByOriginalId(int originalResourceReferenceId, int? currentUserId);
 
         /// <summary>
         /// The get resources by Ids endpoint.
         /// </summary>
         /// <param name="originalResourceReferenceIds">The original resource reference Ids.</param>
         /// <returns><see cref="Task"/>The resourceReferenceMetaDataViewModel.</returns>
-        Task<BulkResourceReferenceViewModel> GetResourceReferencesByOriginalIds(List<int> originalResourceReferenceIds);
+        Task<BulkResourceReferenceViewModel> GetResourceReferencesByOriginalIds(List<int> originalResourceReferenceIds, int? currentUserId);
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/ISearchService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/ISearchService.cs
index 63155c5eb..c9b6e3031 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/ISearchService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/ISearchService.cs
@@ -14,6 +14,6 @@ public interface ISearchService
         /// </summary>
         /// <param name="query"><see cref="LearningHub.Nhs.OpenApi.Models.ServiceModels.Resource.ResourceSearchRequest"/>.</param>
         /// <returns><see cref="ResourceSearchResultViewModel"/>.</returns>
-        Task<ResourceSearchResultModel> Search(ResourceSearchRequest query);
+        Task<ResourceSearchResultModel> Search(ResourceSearchRequest query, int? currentUserId);
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
index 1e3f4e563..ab154888e 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
@@ -47,8 +47,9 @@ public ResourceService(ILearningHubService learningHubService, IResourceReposito
         /// the get by id async.
         /// </summary>
         /// <param name="originalResourceReferenceId">the id.</param>
+        /// <param name="currentUserId"></param>
         /// <returns>the resource.</returns>
-        public async Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceReferenceByOriginalId(int originalResourceReferenceId)
+        public async Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceReferenceByOriginalId(int originalResourceReferenceId, int? currentUserId)
         {
             var list = new List<int>() { originalResourceReferenceId };
 
@@ -102,7 +103,7 @@ public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOrigina
             return new BulkResourceReferenceViewModel(matchedResources, unmatchedIds);
         }
 
-        private ResourceReferenceWithResourceDetailsViewModel GetResourceReferenceWithResourceDetailsViewModel(ResourceReference resourceReference)
+        private ResourceReferenceWithResourceDetailsViewModel GetResourceReferenceWithResourceDetailsViewModel(ResourceReference resourceReference, int? currentUserIdint? currentUserId)
         {
             var hasCurrentResourceVersion = resourceReference.Resource.CurrentResourceVersion != null;
             var hasRating = resourceReference.Resource.CurrentResourceVersion?.ResourceVersionRatingSummary != null;
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs
index 656a8cb14..4c36da24a 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs
@@ -57,7 +57,7 @@ public SearchService(
         }
 
         /// <inheritdoc />
-        public async Task<ResourceSearchResultModel> Search(ResourceSearchRequest query)
+        public async Task<ResourceSearchResultModel> Search(ResourceSearchRequest query, int? currentUserId)
         {
             var findwiseResultModel = await this.findwiseClient.Search(query);
 
@@ -66,7 +66,7 @@ public async Task<ResourceSearchResultModel> Search(ResourceSearchRequest query)
                 return ResourceSearchResultModel.FailedWithStatus(findwiseResultModel.FindwiseRequestStatus);
             }
 
-            var resourceMetadataViewModels = await this.GetResourceMetadataViewModels(findwiseResultModel);
+            var resourceMetadataViewModels = await this.GetResourceMetadataViewModels(findwiseResultModel, currentUserId);
 
             var totalHits = findwiseResultModel.SearchResults?.Stats.TotalHits;
 
@@ -77,7 +77,7 @@ public async Task<ResourceSearchResultModel> Search(ResourceSearchRequest query)
         }
 
         private async Task<List<ResourceMetadataViewModel>> GetResourceMetadataViewModels(
-            FindwiseResultModel findwiseResultModel)
+            FindwiseResultModel findwiseResultModel, int? currentUserId)
         {
             var documentsFound = findwiseResultModel.SearchResults?.DocumentList.Documents?.ToList() ??
                                  new List<Document>();
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/OpenApiControllerBase.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/OpenApiControllerBase.cs
new file mode 100644
index 000000000..863a8bb22
--- /dev/null
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/OpenApiControllerBase.cs
@@ -0,0 +1,41 @@
+namespace LearningHub.NHS.OpenAPI.Controllers
+{
+    using System.Net;
+    using System.Security.Claims;
+    using LearningHub.Nhs.OpenApi.Models.Exceptions;
+    using Microsoft.AspNetCore.Mvc;
+
+    /// <summary>
+    /// The base class for API controllers.
+    /// </summary>
+    public abstract class OpenApiControllerBase : ControllerBase
+    {
+        /// <summary>
+        /// Gets the current user's ID.
+        /// </summary>
+        public int? CurrentUserId
+        {
+            get
+            {
+                if ((this.User?.Identity?.AuthenticationType ?? null) == "AuthenticationTypes.Federation")
+                {
+                    int userId;
+                    if (int.TryParse(User.FindFirst(ClaimTypes.NameIdentifier).Value, out userId))
+                    {
+                        return userId;
+                    }
+                    else
+                    {
+                        // If parsing fails, return null - for apikey this will be the name
+                        return null;
+                    }
+                }
+                else
+                {
+                    // When authorizing by ApiKey we do not have a user for example
+                    return null;
+                }
+            }
+        }
+    }
+}
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs
index 95591961f..a92463d20 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs
@@ -21,7 +21,7 @@ namespace LearningHub.NHS.OpenAPI.Controllers
     /// </summary>
     [Route("Resource")]
     [Authorize]
-    public class ResourceController : Controller
+    public class ResourceController : OpenApiControllerBase
     {
         private const int MaxNumberOfReferenceIds = 1000;
         private readonly ISearchService searchService;
@@ -75,7 +75,7 @@ await this.searchService.Search(
                         offset,
                         limit ?? this.findwiseConfig.DefaultItemLimitForSearch,
                         catalogueId,
-                        resourceTypes));
+                        resourceTypes), this.CurrentUserId);
 
             switch (resourceSearchResult.FindwiseRequestStatus)
             {
@@ -109,7 +109,7 @@ await this.searchService.Search(
         [HttpGet("{originalResourceReferenceId}")]
         public async Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceReferenceByOriginalId(int originalResourceReferenceId)
         {
-            return await this.resourceService.GetResourceReferenceByOriginalId(originalResourceReferenceId);
+            return await this.resourceService.GetResourceReferenceByOriginalId(originalResourceReferenceId, this.CurrentUserId);
         }
 
         /// <summary>
@@ -125,7 +125,7 @@ public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOrigina
                 throw new HttpResponseException($"Too many resources requested. The maximum is {MaxNumberOfReferenceIds}", HttpStatusCode.BadRequest);
             }
 
-            return await this.resourceService.GetResourceReferencesByOriginalIds(resourceReferenceIds.ToList());
+            return await this.resourceService.GetResourceReferencesByOriginalIds(resourceReferenceIds.ToList(), this.CurrentUserId);
         }
 
         /// <summary>
@@ -148,7 +148,7 @@ public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOrigina
                 throw new HttpResponseException($"Too many resources requested. The maximum is {MaxNumberOfReferenceIds}", HttpStatusCode.BadRequest);
             }
 
-            return await this.resourceService.GetResourceReferencesByOriginalIds(bulkResourceReferences.ResourceReferenceIds);
+            return await this.resourceService.GetResourceReferencesByOriginalIds(bulkResourceReferences.ResourceReferenceIds, this.CurrentUserId);
         }
     }
 }

From 645c2b3e8e7b8af3cc910f73138f2a9502e9d845 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Fri, 5 Jul 2024 14:07:36 +0100
Subject: [PATCH 012/143] update models

---
 .../LearningHub.Nhs.OpenApi.Models.csproj          |  2 +-
 .../EntityFramework/LearningHubDbContext.cs        | 12 ++++++------
 .../EntityFramework/ServiceMappings.cs             |  4 ++--
 .../Map/Content/PageSectionDetailMap.cs            |  4 +---
 .../Map/LogMap.cs                                  |  4 ----
 .../Blocks/WholeSlideImageAnnotationMap.cs         | 10 +++++-----
 .../Blocks/WholeSlideImageAnnotationMarkMap.cs     | 14 +++++++-------
 ...arningHub.Nhs.OpenApi.Services.Interface.csproj |  2 +-
 .../LearningHub.Nhs.OpenApi.Services.csproj        |  3 ++-
 .../Services/ResourceService.cs                    |  4 ++--
 10 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
index 0047f4483..d47af75fc 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="2.1.1" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
       <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
     </ItemGroup>
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/LearningHubDbContext.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/LearningHubDbContext.cs
index 020a4f1f5..9cbbcc3f0 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/LearningHubDbContext.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/LearningHubDbContext.cs
@@ -312,14 +312,14 @@ public LearningHubDbContext(LearningHubDbContextOptions options)
         public virtual DbSet<DashboardResourceDto> DashboardResourceDto { get; set; }
 
         /// <summary>
-        /// Gets or sets the ScormContentDetailsViewModel.
+        /// Gets or sets the ExternalContentDetailsViewModel.
         /// </summary>
-        public virtual DbSet<ScormContentDetailsViewModel> ScormContentDetailsViewModel { get; set; }
+        public virtual DbSet<ExternalContentDetailsViewModel> ExternalContentDetailsViewModel { get; set; }
 
         /// <summary>
-        /// Gets or sets the ScormContentServerViewModel.
+        /// Gets or sets the ContentServerViewModel.
         /// </summary>
-        public virtual DbSet<ScormContentServerViewModel> ScormContentServerViewModel { get; set; }
+        public virtual DbSet<ContentServerViewModel> ContentServerViewModel { get; set; }
 
         /// <summary>
         /// Gets or sets the DashboardCatalogueDto
@@ -520,12 +520,12 @@ public LearningHubDbContext(LearningHubDbContextOptions options)
         /// <summary>
         /// Gets or sets the whole slide image annotation.
         /// </summary>
-        public virtual DbSet<WholeSlideImageAnnotation> WholeSlideImageAnnotation { get; set; }
+        public virtual DbSet<ImageAnnotation> ImageAnnotation { get; set; }
 
         /// <summary>
         /// Gets or sets the whole slide image annotation mark.
         /// </summary>
-        public virtual DbSet<WholeSlideImageAnnotationMark> WholeSlideImageAnnotationMark { get; set; }
+        public virtual DbSet<ImageAnnotationMark> ImageAnnotationMark { get; set; }
 
         /// <summary>
         /// Gets or sets the media block.
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/ServiceMappings.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/ServiceMappings.cs
index 668d318b1..8db1cd876 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/ServiceMappings.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/ServiceMappings.cs
@@ -110,8 +110,8 @@ public static void AddLearningHubMappings(this IServiceCollection services, ICon
             services.AddSingleton<IEntityTypeMap, WholeSlideImageBlockMap>();
             services.AddSingleton<IEntityTypeMap, WholeSlideImageBlockItemMap>();
             services.AddSingleton<IEntityTypeMap, WholeSlideImageMap>();
-            services.AddSingleton<IEntityTypeMap, WholeSlideImageAnnotationMap>();
-            services.AddSingleton<IEntityTypeMap, WholeSlideImageAnnotationMarkMap>();
+            services.AddSingleton<IEntityTypeMap, ImageAnnotationMap>();
+            services.AddSingleton<IEntityTypeMap, ImageAnnotationMarkMap>();
             services.AddSingleton<IEntityTypeMap, WholeSlideImageFileMap>();
             services.AddSingleton<IEntityTypeMap, UrlRewritingMap>();
             services.AddSingleton<IEntityTypeMap, ResourceSyncMap>();
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Content/PageSectionDetailMap.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Content/PageSectionDetailMap.cs
index 1bdbb69c8..42d2e309f 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Content/PageSectionDetailMap.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Content/PageSectionDetailMap.cs
@@ -17,8 +17,6 @@ protected override void InternalMap(EntityTypeBuilder<PageSectionDetail> entity)
         {
             entity.ToTable("PageSectionDetail", "content");
 
-            entity.Property(e => e.AssetPositionId).HasDefaultValueSql("((2))");
-
             entity.Property(e => e.BackgroundColour).HasMaxLength(20);
 
             entity.Property(e => e.Description).HasMaxLength(512);
@@ -31,7 +29,7 @@ protected override void InternalMap(EntityTypeBuilder<PageSectionDetail> entity)
 
             entity.Property(e => e.TextColour).HasMaxLength(20);
 
-            entity.Property(e => e.Title).HasMaxLength(128);
+            entity.Property(e => e.SectionTitle).HasMaxLength(128);
 
             entity.Property(e => e.DeletePending).IsRequired(false);
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/LogMap.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/LogMap.cs
index 62ebffd0c..0b8bb7428 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/LogMap.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/LogMap.cs
@@ -68,10 +68,6 @@ protected void InternalMap(EntityTypeBuilder<Log> modelBuilder)
             modelBuilder.Property(e => e.UserId)
                 .HasColumnName("UserId");
 
-            modelBuilder.HasOne(d => d.User)
-                .WithMany(p => p.Logs)
-                .HasForeignKey(d => d.UserId)
-                .OnDelete(DeleteBehavior.ClientSetNull);
         }
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Resources/Blocks/WholeSlideImageAnnotationMap.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Resources/Blocks/WholeSlideImageAnnotationMap.cs
index 18a94369a..00f7f46cb 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Resources/Blocks/WholeSlideImageAnnotationMap.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Resources/Blocks/WholeSlideImageAnnotationMap.cs
@@ -7,7 +7,7 @@
     /// <summary>
     /// The whole slide image annotation map.
     /// </summary>
-    public class WholeSlideImageAnnotationMap : BaseEntityMap<WholeSlideImageAnnotation>
+    public class ImageAnnotationMap : BaseEntityMap<ImageAnnotation>
     {
         /// <summary>
         /// The internal map.
@@ -15,15 +15,15 @@ public class WholeSlideImageAnnotationMap : BaseEntityMap<WholeSlideImageAnnotat
         /// <param name="modelBuilder">
         /// The model builder.
         /// </param>
-        protected override void InternalMap(EntityTypeBuilder<WholeSlideImageAnnotation> modelBuilder)
+        protected override void InternalMap(EntityTypeBuilder<ImageAnnotation> modelBuilder)
         {
-            modelBuilder.ToTable("WholeSlideImageAnnotation", "resources");
+            modelBuilder.ToTable("ImageAnnotation", "resources");
 
             modelBuilder.HasOne(a => a.WholeSlideImage)
-                .WithMany(i => i.WholeSlideImageAnnotations)
+                .WithMany(i => i.ImageAnnotations)
                 .HasForeignKey(a => a.WholeSlideImageId)
                 .OnDelete(DeleteBehavior.Cascade)
-                .HasConstraintName("FK_WholeSlideImageAnnotation_WholeSlideImageId");
+                .HasConstraintName("FK_ImageAnnotation_WholeSlideImageId");
         }
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Resources/Blocks/WholeSlideImageAnnotationMarkMap.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Resources/Blocks/WholeSlideImageAnnotationMarkMap.cs
index 2720b23db..9db0a6db6 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Resources/Blocks/WholeSlideImageAnnotationMarkMap.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Resources/Blocks/WholeSlideImageAnnotationMarkMap.cs
@@ -7,7 +7,7 @@
     /// <summary>
     /// The whole slide image annotation map.
     /// </summary>
-    public class WholeSlideImageAnnotationMarkMap : BaseEntityMap<WholeSlideImageAnnotationMark>
+    public class ImageAnnotationMarkMap : BaseEntityMap<ImageAnnotationMark>
     {
         /// <summary>
         /// The internal map.
@@ -15,15 +15,15 @@ public class WholeSlideImageAnnotationMarkMap : BaseEntityMap<WholeSlideImageAnn
         /// <param name="modelBuilder">
         /// The model builder.
         /// </param>
-        protected override void InternalMap(EntityTypeBuilder<WholeSlideImageAnnotationMark> modelBuilder)
+        protected override void InternalMap(EntityTypeBuilder<ImageAnnotationMark> modelBuilder)
         {
-            modelBuilder.ToTable("WholeSlideImageAnnotationMark", "resources");
+            modelBuilder.ToTable("ImageAnnotationMark", "resources");
 
-            modelBuilder.HasOne(a => a.WholeSlideImageAnnotation)
-                .WithMany(i => i.WholeSlideImageAnnotationMarks)
-                .HasForeignKey(a => a.WholeSlideImageAnnotationId)
+            modelBuilder.HasOne(a => a.ImageAnnotation)
+                .WithMany(i => i.ImageAnnotationMarks)
+                .HasForeignKey(a => a.ImageAnnotationId)
                 .OnDelete(DeleteBehavior.Cascade)
-                .HasConstraintName("FK_WholeSlideImageAnnotationMark_WholeSlideImageAnnotationId");
+                .HasConstraintName("FK_ImageAnnotationMark_ImageAnnotationId");
         }
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
index 6372c89b6..8309db600 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="2.1.4" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
index 2207dfdd4..a639e5f26 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
@@ -24,6 +24,7 @@
     <ItemGroup>
       <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
       <PackageReference Include="IdentityModel" Version="4.3.0" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
index ab154888e..d9d4fa40b 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
@@ -79,7 +79,7 @@ public async Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceRefe
         /// </summary>
         /// <param name="originalResourceReferenceIds">the resource reference ids.</param>
         /// <returns>the resource.</returns>
-        public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOriginalIds(List<int> originalResourceReferenceIds)
+        public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOriginalIds(List<int> originalResourceReferenceIds, int? currentUserId)
         {
             var resourceReferences = await this.resourceRepository.GetResourceReferencesByOriginalResourceReferenceIds(originalResourceReferenceIds);
             var resourceReferencesList = resourceReferences.ToList();
@@ -103,7 +103,7 @@ public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOrigina
             return new BulkResourceReferenceViewModel(matchedResources, unmatchedIds);
         }
 
-        private ResourceReferenceWithResourceDetailsViewModel GetResourceReferenceWithResourceDetailsViewModel(ResourceReference resourceReference, int? currentUserIdint? currentUserId)
+        private ResourceReferenceWithResourceDetailsViewModel GetResourceReferenceWithResourceDetailsViewModel(ResourceReference resourceReference)
         {
             var hasCurrentResourceVersion = resourceReference.Resource.CurrentResourceVersion != null;
             var hasRating = resourceReference.Resource.CurrentResourceVersion?.ResourceVersionRatingSummary != null;

From 7105627878cdd2d715d82baf13a1ae05e359aa15 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Fri, 5 Jul 2024 14:47:24 +0100
Subject: [PATCH 013/143] Updating models

---
 .../LearningHub.Nhs.OpenApi.Models.csproj     |  2 +-
 .../ViewModels/ResourceMetadataViewModel.cs   | 13 +++++++-
 .../Repositories/IResourceRepository.cs       |  9 +++++
 .../EntityFramework/LearningHubDbContext.cs   |  5 +++
 .../Repositories/ResourceRepository.cs        | 33 +++++++++++++++++++
 ...gHub.Nhs.OpenApi.Services.Interface.csproj |  2 +-
 .../LearningHub.Nhs.OpenApi.Services.csproj   |  2 +-
 .../Services/ResourceService.cs               | 11 +++++++
 .../Services/SearchService.cs                 | 18 ++++++++--
 9 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
index d47af75fc..2c87ba2cb 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
       <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
     </ItemGroup>
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceMetadataViewModel.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceMetadataViewModel.cs
index 3675959a6..404ef92af 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceMetadataViewModel.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceMetadataViewModel.cs
@@ -1,7 +1,9 @@
 namespace LearningHub.Nhs.OpenApi.Models.ViewModels
 {
+    using LearningHub.Nhs.Models.Entities.Activity;
     using System.Collections.Generic;
 
+
     /// <summary>
     /// Class.
     /// </summary>
@@ -23,13 +25,15 @@ public ResourceMetadataViewModel()
         /// <param name="references"><see cref="References"/>.</param>
         /// <param name="resourceType"><see cref="ResourceType"/>.</param>
         /// <param name="rating"><see cref="Rating"/>.</param>
+        /// <param name="userSummaryActivityStatuses"><see cref="UserSummaryActivityStatuses"/>.</param>
         public ResourceMetadataViewModel(
             int resourceId,
             string title,
             string description,
             List<ResourceReferenceViewModel> references,
             string resourceType,
-            decimal rating)
+            decimal rating,
+            List<MajorVersionIdActivityStatusDescription>? userSummaryActivityStatuses)
         {
             this.ResourceId = resourceId;
             this.Title = title;
@@ -37,6 +41,7 @@ public ResourceMetadataViewModel(
             this.References = references;
             this.ResourceType = resourceType;
             this.Rating = rating;
+            this.UserSummaryActivityStatuses = userSummaryActivityStatuses;
         }
 
         /// <summary>
@@ -64,9 +69,15 @@ public ResourceMetadataViewModel(
         /// </summary>
         public string ResourceType { get; set; }
 
+
         /// <summary>
         /// Gets or sets <see cref="Rating"/>.
         /// </summary>
         public decimal Rating { get; set; }
+
+        /// <summary>
+        /// Gets or sets <see cref="UserSummaryActivityStatuses"/>.
+        /// </summary>
+        public List<MajorVersionIdActivityStatusDescription>? UserSummaryActivityStatuses { get; set; }
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs
index 50eff71f6..d3a1856e4 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs
@@ -2,6 +2,7 @@ namespace LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories
 {
     using System.Collections.Generic;
     using System.Threading.Tasks;
+    using LearningHub.Nhs.Models.Entities.Activity;
     using LearningHub.Nhs.Models.Entities.Resource;
 
     /// <summary>
@@ -23,5 +24,13 @@ public interface IResourceRepository
         /// <returns>Resource references.</returns>
         public Task<IEnumerable<ResourceReference>> GetResourceReferencesByOriginalResourceReferenceIds(
             IEnumerable<int> originalResourceReferenceIds);
+
+        /// <summary>
+        /// Gets resource activity for resourceReferenceIds and userIds.
+        /// </summary>
+        /// <param name="resourceReferenceIds"><see cref="resourceReferenceIds"/>.</param>
+        /// <param name="userIds"></param>
+        /// <returns>ResourceActivityDTO.</returns>
+        Task<IEnumerable<ResourceActivityDTO>> GetResourceActivityPerResourceMajorVersion(IEnumerable<int>? resourceReferenceIds, IEnumerable<int>? userIds);
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/LearningHubDbContext.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/LearningHubDbContext.cs
index 9cbbcc3f0..c1ebf721b 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/LearningHubDbContext.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/LearningHubDbContext.cs
@@ -295,6 +295,11 @@ public LearningHubDbContext(LearningHubDbContextOptions options)
         /// </summary>
         public virtual DbSet<FileChunkDetail> FileChunkDetail { get; set; }
 
+        /// <summary>
+        /// Gets or sets the ResourceActivityDto. These are not entities. They are returned from the [activity].[GetResourceActivityPerResourceMajorVersion] stored proc..
+        /// </summary>
+        public virtual DbSet<ResourceActivityDTO> ResourceActivityDTO { get; set; }
+
         /// <summary>
         /// Gets or sets the RecentlyAddedResources. These are not entities. They are returned from the [resources].[GetRecentlyAddedResources] stored proc..
         /// </summary>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
index a826c627e..7ffb3c6fa 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
@@ -1,11 +1,14 @@
 namespace LearningHub.Nhs.OpenApi.Repositories.Repositories
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
+    using LearningHub.Nhs.Models.Entities.Activity;
     using LearningHub.Nhs.Models.Entities.Resource;
     using LearningHub.Nhs.OpenApi.Repositories.EntityFramework;
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories;
+    using Microsoft.Data.SqlClient;
     using Microsoft.EntityFrameworkCore;
 
     /// <inheritdoc />
@@ -69,5 +72,35 @@ public async Task<IEnumerable<ResourceReference>> GetResourceReferencesByOrigina
                 .ThenInclude(r => r.ResourceVersionRatingSummary)
                 .ToListAsync();
         }
+
+        /// </summary>
+        /// <param name="resourceReferenceIds"></param>
+        /// <param name="userIds"></param>
+        /// <param name="originalResourceReferenceIds">.</param>
+        /// <returns>A <see cref="Task{ResourceReference}"/> representing the result of the asynchronous operation.</returns>
+        public async Task<IEnumerable<ResourceActivityDTO>> GetResourceActivityPerResourceMajorVersion(
+          IEnumerable<int>? resourceReferenceIds, IEnumerable<int>? userIds)
+        {
+            var resourceIdsParam = resourceReferenceIds != null
+                ? string.Join(",", resourceReferenceIds)
+                : null;
+
+            var userIdsParam = userIds != null
+                ? string.Join(",", userIds)
+                : null;
+
+            var resourceIdsParameter = new SqlParameter("@p0", resourceIdsParam ?? (object)DBNull.Value);
+            var userIdsParameter = new SqlParameter("@p1", userIdsParam ?? (object)DBNull.Value);
+
+            List<ResourceActivityDTO> resourceActivityDTOs = await dbContext.ResourceActivityDTO
+                .FromSqlRaw(
+                    "[activity].[GetResourceActivityPerResourceMajorVersion] @p0, @p1",
+                    resourceIdsParameter,
+                    userIdsParameter)
+                .AsNoTracking()
+                .ToListAsync<ResourceActivityDTO>();
+
+            return resourceActivityDTOs;
+        }
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
index 8309db600..108c74355 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
index a639e5f26..ce9034d03 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
@@ -24,7 +24,7 @@
     <ItemGroup>
       <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
       <PackageReference Include="IdentityModel" Version="4.3.0" />
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.32" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
index d9d4fa40b..8d4f0826f 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
@@ -2,9 +2,11 @@ namespace LearningHub.Nhs.OpenApi.Services.Services
 {
     using System;
     using System.Collections.Generic;
+    using System.Data;
     using System.Linq;
     using System.Net;
     using System.Threading.Tasks;
+    using LearningHub.Nhs.Models.Entities.Activity;
     using LearningHub.Nhs.Models.Entities.Resource;
     using LearningHub.Nhs.OpenApi.Models.Exceptions;
     using LearningHub.Nhs.OpenApi.Models.ViewModels;
@@ -51,6 +53,7 @@ public ResourceService(ILearningHubService learningHubService, IResourceReposito
         /// <returns>the resource.</returns>
         public async Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceReferenceByOriginalId(int originalResourceReferenceId, int? currentUserId)
         {
+            List<ResourceActivityDTO> resourceActivities = new List<ResourceActivityDTO>() { };
             var list = new List<int>() { originalResourceReferenceId };
 
             var resourceReferences = await this.resourceRepository.GetResourceReferencesByOriginalResourceReferenceIds(list);
@@ -65,6 +68,14 @@ public async Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceRefe
                     throw new HttpResponseException("No matching resource reference", HttpStatusCode.NotFound);
                 }
 
+                if (currentUserId.HasValue)
+                {
+                    List<int> resourceIds = new List<int>() { resourceReference.ResourceId };
+                    List<int> userIds = new List<int>() { currentUserId.Value };
+
+                    resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(resourceIds, userIds))?.ToList() ?? new List<ResourceActivityDTO>() { };
+                }
+
                 return this.GetResourceReferenceWithResourceDetailsViewModel(resourceReference);
             }
             catch (InvalidOperationException exception)
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs
index 4c36da24a..1db1d142f 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs
@@ -3,8 +3,11 @@ namespace LearningHub.Nhs.OpenApi.Services.Services
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
+    using LearningHub.Nhs.Models.Entities.Activity;
     using LearningHub.Nhs.Models.Entities.Resource;
+    using LearningHub.Nhs.Models.Resource;
     using LearningHub.Nhs.Models.Search;
+    using LearningHub.Nhs.Models.ViewModels.Helpers;
     using LearningHub.Nhs.OpenApi.Models.ServiceModels.Findwise;
     using LearningHub.Nhs.OpenApi.Models.ServiceModels.Resource;
     using LearningHub.Nhs.OpenApi.Models.ViewModels;
@@ -108,11 +111,19 @@ private async Task<List<ResourceMetadataViewModel>> GetResourceMetadataViewModel
             return resourceMetadataViewModels;
         }
 
-        private ResourceMetadataViewModel MapToViewModel(Resource resource)
+        private ResourceMetadataViewModel MapToViewModel(Resource resource, List<ResourceActivityDTO> resourceActivities)
         {
             var hasCurrentResourceVersion = resource.CurrentResourceVersion != null;
             var hasRating = resource.CurrentResourceVersion?.ResourceVersionRatingSummary != null;
 
+            List<MajorVersionIdActivityStatusDescription> majorVersionIdActivityStatusDescription = new List<MajorVersionIdActivityStatusDescription>() { };
+
+            if (resourceActivities != null && resourceActivities.Count != 0)
+            {
+                majorVersionIdActivityStatusDescription = ActivityStatusHelper.GetMajorVersionIdActivityStatusDescriptionLSPerResource(resource, resourceActivities)
+                    .ToList();
+            }
+
             if (!hasCurrentResourceVersion)
             {
                 this.logger.LogInformation(
@@ -131,13 +142,16 @@ private ResourceMetadataViewModel MapToViewModel(Resource resource)
                 this.logger.LogError($"Resource has unrecognised type: {resource.ResourceTypeEnum}");
             }
 
+
             return new ResourceMetadataViewModel(
                 resource.Id,
                 resource.CurrentResourceVersion?.Title ?? ResourceHelpers.NoResourceVersionText,
                 resource.CurrentResourceVersion?.Description ?? string.Empty,
                 resource.ResourceReference.Select(this.GetResourceReferenceViewModel).ToList(),
                 resourceTypeNameOrEmpty,
-                resource.CurrentResourceVersion?.ResourceVersionRatingSummary?.AverageRating ?? 0.0m);
+                resource.CurrentResourceVersion?.ResourceVersionRatingSummary?.AverageRating ?? 0.0m,
+                majorVersionIdActivityStatusDescription
+                );
         }
 
         private ResourceReferenceViewModel GetResourceReferenceViewModel(

From bc43f7462d82356af2ec4f65d676788b79861486 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Fri, 5 Jul 2024 16:13:19 +0100
Subject: [PATCH 014/143] End points major version

---
 .../ViewModels/ResourceMetadataViewModel.cs   |  7 ++++
 ...ceReferenceWithResourceDetailsViewModel.cs | 24 ++++++++++++--
 .../Map/Resources/ResourceVersionMap.cs       |  3 ++
 .../Services/ResourceService.cs               | 33 +++++++++++++++----
 .../Services/SearchService.cs                 | 11 ++++++-
 5 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceMetadataViewModel.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceMetadataViewModel.cs
index 404ef92af..89f19f50b 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceMetadataViewModel.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceMetadataViewModel.cs
@@ -32,6 +32,7 @@ public ResourceMetadataViewModel(
             string description,
             List<ResourceReferenceViewModel> references,
             string resourceType,
+            int? majorVersion,
             decimal rating,
             List<MajorVersionIdActivityStatusDescription>? userSummaryActivityStatuses)
         {
@@ -40,6 +41,7 @@ public ResourceMetadataViewModel(
             this.Description = description;
             this.References = references;
             this.ResourceType = resourceType;
+            this.MajorVersion = majorVersion;
             this.Rating = rating;
             this.UserSummaryActivityStatuses = userSummaryActivityStatuses;
         }
@@ -69,6 +71,11 @@ public ResourceMetadataViewModel(
         /// </summary>
         public string ResourceType { get; set; }
 
+        /// <summary>
+        /// Gets or sets <see cref="MajorVersion"/>.
+        /// </summary>
+        public int? MajorVersion { get; set; }
+
 
         /// <summary>
         /// Gets or sets <see cref="Rating"/>.
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceReferenceWithResourceDetailsViewModel.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceReferenceWithResourceDetailsViewModel.cs
index cf31bdf54..26ee89e06 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceReferenceWithResourceDetailsViewModel.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceReferenceWithResourceDetailsViewModel.cs
@@ -1,3 +1,6 @@
+using LearningHub.Nhs.Models.Entities.Activity;
+using System.Collections.Generic;
+
 namespace LearningHub.Nhs.OpenApi.Models.ViewModels
 {
     /// <summary>
@@ -16,24 +19,28 @@ public class ResourceReferenceWithResourceDetailsViewModel
         /// <param name="resourceType"><see cref="ResourceType"/>.</param>
         /// <param name="rating"><see cref="Rating"/>.</param>
         /// <param name="link"><see cref="Link"/>.</param>
-        public ResourceReferenceWithResourceDetailsViewModel(
+        public ResourceReferenceWithResourceDetailsViewModel( // qqqq may need major version id adding
             int resourceId,
             int refId,
             string title,
             string description,
             CatalogueViewModel catalogueViewModel,
             string resourceType,
+            int? majorVersion,
             decimal rating,
-            string link)
+            string link,
+            List<MajorVersionIdActivityStatusDescription>? userSummaryActivityStatuses)
         {
             this.ResourceId = resourceId;
             this.RefId = refId;
             this.Title = title;
             this.Description = description;
             this.Catalogue = catalogueViewModel;
+            this.MajorVersion = majorVersion;
             this.ResourceType = resourceType;
             this.Rating = rating;
             this.Link = link;
+            this.UserSummaryActivityStatuses = userSummaryActivityStatuses;
         }
 
         /// <summary>
@@ -66,14 +73,27 @@ public ResourceReferenceWithResourceDetailsViewModel(
         /// </summary>
         public string ResourceType { get; }
 
+
+        /// <summary>
+        /// Gets <see cref="MajorVersion"/>.
+        /// </summary>
+        public int? MajorVersion { get; }
+
         /// <summary>
         /// Gets <see cref="Rating"/>.
         /// </summary>
+        /// 
+
         public decimal Rating { get; }
 
         /// <summary>
         /// Gets <see cref="Link"/>.
         /// </summary>
         public string Link { get; }
+
+        /// <summary>
+        /// Gets <see cref="UserSummaryActivityStatuses"/>.
+        /// </summary>
+        public List<MajorVersionIdActivityStatusDescription>? UserSummaryActivityStatuses { get; }
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Resources/ResourceVersionMap.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Resources/ResourceVersionMap.cs
index a87bee808..d96c3b4fe 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Resources/ResourceVersionMap.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Map/Resources/ResourceVersionMap.cs
@@ -39,6 +39,9 @@ protected override void InternalMap(EntityTypeBuilder<ResourceVersion> modelBuil
                     .OnDelete(DeleteBehavior.ClientSetNull)
                     .HasConstraintName("FK_ResourceVersion_Resource");
 
+            modelBuilder.Property(e => e.ResourceAccessibilityEnum).HasColumnName("ResourceAccessibilityId")
+            .HasConversion<int>();
+
             modelBuilder.Property(e => e.VersionStatusEnum).HasColumnName("VersionStatusId")
                .HasConversion<int>();
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
index 8d4f0826f..3212b0b37 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
@@ -8,6 +8,7 @@ namespace LearningHub.Nhs.OpenApi.Services.Services
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Entities.Activity;
     using LearningHub.Nhs.Models.Entities.Resource;
+    using LearningHub.Nhs.Models.ViewModels.Helpers;
     using LearningHub.Nhs.OpenApi.Models.Exceptions;
     using LearningHub.Nhs.OpenApi.Models.ViewModels;
     using LearningHub.Nhs.OpenApi.Repositories.Interface.Repositories;
@@ -76,7 +77,7 @@ public async Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceRefe
                     resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(resourceIds, userIds))?.ToList() ?? new List<ResourceActivityDTO>() { };
                 }
 
-                return this.GetResourceReferenceWithResourceDetailsViewModel(resourceReference);
+                return this.GetResourceReferenceWithResourceDetailsViewModel(resourceReference, resourceActivities);
             }
             catch (InvalidOperationException exception)
             {
@@ -92,6 +93,9 @@ public async Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceRefe
         /// <returns>the resource.</returns>
         public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOriginalIds(List<int> originalResourceReferenceIds, int? currentUserId)
         {
+            List<ResourceActivityDTO> resourceActivities = new List<ResourceActivityDTO>() { };
+            List<MajorVersionIdActivityStatusDescription> majorVersionIdActivityStatusDescription = new List<MajorVersionIdActivityStatusDescription>() { };
+
             var resourceReferences = await this.resourceRepository.GetResourceReferencesByOriginalResourceReferenceIds(originalResourceReferenceIds);
             var resourceReferencesList = resourceReferences.ToList();
             var matchedIds = resourceReferencesList.Select(r => r.OriginalResourceReferenceId).ToList();
@@ -107,18 +111,33 @@ public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOrigina
                 this.logger.LogWarning($"Multiple resource references found with OriginalResourceReferenceId {duplicateIds.First()}");
             }
 
-            var matchedResources = resourceReferencesList
-                .Select(this.GetResourceReferenceWithResourceDetailsViewModel)
-                .ToList();
+            if (currentUserId.HasValue)
+            {
+                List<int> resourceIds = resourceReferencesList.Select(rrl => rrl.ResourceId).ToList();
+                List<int> userIds = new List<int>() { currentUserId.Value };
+
+                resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(resourceIds, userIds))?.ToList() ?? new List<ResourceActivityDTO>() { };
+            }
+
+            List<ResourceReferenceWithResourceDetailsViewModel> matchedResources = resourceReferencesList
+            .Select(rr => this.GetResourceReferenceWithResourceDetailsViewModel(rr, resourceActivities.Where(ra => ra.ResourceId == rr.ResourceId).ToList()))
+            .ToList<ResourceReferenceWithResourceDetailsViewModel>();
 
             return new BulkResourceReferenceViewModel(matchedResources, unmatchedIds);
         }
 
-        private ResourceReferenceWithResourceDetailsViewModel GetResourceReferenceWithResourceDetailsViewModel(ResourceReference resourceReference)
+        private ResourceReferenceWithResourceDetailsViewModel GetResourceReferenceWithResourceDetailsViewModel(ResourceReference resourceReference, List<ResourceActivityDTO> resourceActivities)
         {
             var hasCurrentResourceVersion = resourceReference.Resource.CurrentResourceVersion != null;
             var hasRating = resourceReference.Resource.CurrentResourceVersion?.ResourceVersionRatingSummary != null;
 
+            List<MajorVersionIdActivityStatusDescription> majorVersionIdActivityStatusDescription = new List<MajorVersionIdActivityStatusDescription>() { };
+
+            if (resourceActivities != null && resourceActivities.Count != 0)
+            {
+                majorVersionIdActivityStatusDescription = ActivityStatusHelper.GetMajorVersionIdActivityStatusDescriptionLSPerResource(resourceReference.Resource, resourceActivities).ToList();
+            }
+
             if (resourceReference.Resource == null)
             {
                 throw new Exception("No matching resource");
@@ -147,8 +166,10 @@ private ResourceReferenceWithResourceDetailsViewModel GetResourceReferenceWithRe
                 resourceReference.Resource.CurrentResourceVersion?.Description ?? string.Empty,
                 resourceReference.GetCatalogue(),
                 resourceTypeNameOrEmpty,
+                resourceReference.Resource?.CurrentResourceVersion?.MajorVersion ?? 0,
                 resourceReference.Resource?.CurrentResourceVersion?.ResourceVersionRatingSummary?.AverageRating ?? 0,
-                this.learningHubService.GetResourceLaunchUrl(resourceReference.OriginalResourceReferenceId));
+                this.learningHubService.GetResourceLaunchUrl(resourceReference.OriginalResourceReferenceId),
+                majorVersionIdActivityStatusDescription);
         }
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs
index 1db1d142f..c5ede76fb 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/SearchService.cs
@@ -82,6 +82,7 @@ public async Task<ResourceSearchResultModel> Search(ResourceSearchRequest query,
         private async Task<List<ResourceMetadataViewModel>> GetResourceMetadataViewModels(
             FindwiseResultModel findwiseResultModel, int? currentUserId)
         {
+            List<ResourceActivityDTO> resourceActivities = new List<ResourceActivityDTO>() { };
             var documentsFound = findwiseResultModel.SearchResults?.DocumentList.Documents?.ToList() ??
                                  new List<Document>();
             var findwiseResourceIds = documentsFound.Select(d => int.Parse(d.Id)).ToList();
@@ -93,7 +94,7 @@ private async Task<List<ResourceMetadataViewModel>> GetResourceMetadataViewModel
 
             var resourcesFound = await this.resourceRepository.GetResourcesFromIds(findwiseResourceIds);
 
-            var resourceMetadataViewModels = resourcesFound.Select(this.MapToViewModel)
+            List<ResourceMetadataViewModel> resourceMetadataViewModels = resourcesFound.Select(resource => MapToViewModel(resource, resourceActivities.Where(x => x.ResourceId == resource.Id).ToList()))
                 .OrderBySequence(findwiseResourceIds)
                 .ToList();
 
@@ -108,6 +109,13 @@ private async Task<List<ResourceMetadataViewModel>> GetResourceMetadataViewModel
                     unmatchedResourcesIdsString);
             }
 
+            if (currentUserId.HasValue)
+            {
+                List<int> resourceIds = resourcesFound.Select(x => x.Id).ToList();
+                List<int> userIds = new List<int>() { currentUserId.Value };
+
+                resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(resourceIds, userIds))?.ToList() ?? new List<ResourceActivityDTO>() { };
+            }
             return resourceMetadataViewModels;
         }
 
@@ -149,6 +157,7 @@ private ResourceMetadataViewModel MapToViewModel(Resource resource, List<Resourc
                 resource.CurrentResourceVersion?.Description ?? string.Empty,
                 resource.ResourceReference.Select(this.GetResourceReferenceViewModel).ToList(),
                 resourceTypeNameOrEmpty,
+                resource.CurrentResourceVersion?.MajorVersion ?? 0,
                 resource.CurrentResourceVersion?.ResourceVersionRatingSummary?.AverageRating ?? 0.0m,
                 majorVersionIdActivityStatusDescription
                 );

From 20ffea77959c62fb91c671a4ced92f7c1501a21a Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Fri, 5 Jul 2024 16:32:53 +0100
Subject: [PATCH 015/143] Not nullable should be empty list

---
 .../ViewModels/ResourceMetadataViewModel.cs               | 4 ++--
 .../ResourceReferenceWithResourceDetailsViewModel.cs      | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceMetadataViewModel.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceMetadataViewModel.cs
index 89f19f50b..a4c1fbf4c 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceMetadataViewModel.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceMetadataViewModel.cs
@@ -34,7 +34,7 @@ public ResourceMetadataViewModel(
             string resourceType,
             int? majorVersion,
             decimal rating,
-            List<MajorVersionIdActivityStatusDescription>? userSummaryActivityStatuses)
+            List<MajorVersionIdActivityStatusDescription> userSummaryActivityStatuses)
         {
             this.ResourceId = resourceId;
             this.Title = title;
@@ -85,6 +85,6 @@ public ResourceMetadataViewModel(
         /// <summary>
         /// Gets or sets <see cref="UserSummaryActivityStatuses"/>.
         /// </summary>
-        public List<MajorVersionIdActivityStatusDescription>? UserSummaryActivityStatuses { get; set; }
+        public List<MajorVersionIdActivityStatusDescription> UserSummaryActivityStatuses { get; set; }
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceReferenceWithResourceDetailsViewModel.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceReferenceWithResourceDetailsViewModel.cs
index 26ee89e06..41d1b197b 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceReferenceWithResourceDetailsViewModel.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/ViewModels/ResourceReferenceWithResourceDetailsViewModel.cs
@@ -17,9 +17,11 @@ public class ResourceReferenceWithResourceDetailsViewModel
         /// <param name="description"><see cref="Description"/>.</param>
         /// <param name="catalogueViewModel"><see cref="Catalogue"/>.</param>
         /// <param name="resourceType"><see cref="ResourceType"/>.</param>
+        /// <param name="majorVersion"></param>
         /// <param name="rating"><see cref="Rating"/>.</param>
         /// <param name="link"><see cref="Link"/>.</param>
-        public ResourceReferenceWithResourceDetailsViewModel( // qqqq may need major version id adding
+        /// <param name="userSummaryActivityStatuses"></param>
+        public ResourceReferenceWithResourceDetailsViewModel(
             int resourceId,
             int refId,
             string title,
@@ -29,7 +31,7 @@ public ResourceReferenceWithResourceDetailsViewModel( // qqqq may need major ver
             int? majorVersion,
             decimal rating,
             string link,
-            List<MajorVersionIdActivityStatusDescription>? userSummaryActivityStatuses)
+            List<MajorVersionIdActivityStatusDescription> userSummaryActivityStatuses)
         {
             this.ResourceId = resourceId;
             this.RefId = refId;
@@ -94,6 +96,6 @@ public ResourceReferenceWithResourceDetailsViewModel( // qqqq may need major ver
         /// <summary>
         /// Gets <see cref="UserSummaryActivityStatuses"/>.
         /// </summary>
-        public List<MajorVersionIdActivityStatusDescription>? UserSummaryActivityStatuses { get; }
+        public List<MajorVersionIdActivityStatusDescription> UserSummaryActivityStatuses { get; }
     }
 }

From 66df1d0ce9a9296e6cead368989054024a242049 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Fri, 5 Jul 2024 17:12:15 +0100
Subject: [PATCH 016/143] Updating tests

---
 .../Controllers/ResourceControllerTests.cs    | 58 +++++++++++++++----
 .../Services/Services/ResourceServiceTests.cs | 38 ++++++------
 .../Services/Services/SearchServiceTests.cs   | 16 ++---
 3 files changed, 78 insertions(+), 34 deletions(-)

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs
index 49f901c72..acde1d3ef 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs
@@ -18,8 +18,11 @@ namespace LearningHub.Nhs.OpenApi.Tests.Controllers
     using Moq;
     using Newtonsoft.Json;
     using Xunit;
+    using Microsoft.AspNetCore.Http;
+    using Microsoft.AspNetCore.Mvc;
+    using System.Security.Claims;
 
-    public sealed class ResourceControllerTests : IDisposable
+    public sealed class ResourceControllerTests
     {
         private readonly Mock<ISearchService> searchService;
         private readonly Mock<IResourceService> resourceService;
@@ -87,6 +90,7 @@ await Assert.ThrowsAsync<HttpResponseException>(
         public async Task SearchEndpointUsesDefaultLimitGivenInConfig()
         {
             // Given
+            int? currentUserId = null; //E.g if hitting endpoint with ApiKey auth
             this.GivenSearchServiceSucceedsButFindsNoItems();
             this.GivenDefaultLimitForFindwiseSearchIs(12);
             this.resourceController = new ResourceController(
@@ -99,7 +103,7 @@ public async Task SearchEndpointUsesDefaultLimitGivenInConfig()
 
             // Then
             this.searchService.Verify(
-                service => service.Search(It.Is<ResourceSearchRequest>(request => request.Limit == 12)));
+                service => service.Search(It.Is<ResourceSearchRequest>(request => request.Limit == 12), currentUserId));
         }
 
         [Fact]
@@ -177,6 +181,41 @@ await Assert.ThrowsAsync<HttpResponseException>(
             exception.StatusCode.Should().Be(HttpStatusCode.BadRequest);
         }
 
+        [Fact]
+        public void CurrentUserIdSetByAuth()
+        {
+            // Arrange
+            ResourceController resourceController = new ResourceController(
+                this.searchService.Object,
+                this.resourceService.Object,
+                this.findwiseConfigOptions.Object
+            );
+
+
+            // This Id is the development accountId
+            int currentUserId = 57541;
+
+            // Create claims identity with the specified user id
+            var claims = new List<Claim>
+            {
+                new Claim(ClaimTypes.NameIdentifier, currentUserId.ToString()),
+            };
+            var identity = new ClaimsIdentity(claims, "AuthenticationTypes.Federation"); // Set the authentication type to "Federation"
+
+            // Create claims principal with the claims identity
+            var claimsPrincipal = new ClaimsPrincipal(identity);
+
+            // Create a mock HttpContext and set it to the ControllerContext
+            var httpContext = new DefaultHttpContext { User = claimsPrincipal };
+            var controllerContext = new ControllerContext { HttpContext = httpContext };
+            resourceController.ControllerContext = controllerContext;
+
+            // Act
+
+            // Assert that the CurrentUserId property of the resourceController matches the currentUserId
+            Assert.Equal(currentUserId, resourceController.CurrentUserId);
+        }
+
         [Theory]
         [InlineData(1)]
         [InlineData(20)]
@@ -184,6 +223,7 @@ await Assert.ThrowsAsync<HttpResponseException>(
         public async Task SearchEndpointUsesPassedInLimitIfGiven(int limit)
         {
             // Given
+            int? currentUserId = null; //E.g if hitting endpoint with ApiKey auth
             this.GivenSearchServiceSucceedsButFindsNoItems();
             this.GivenDefaultLimitForFindwiseSearchIs(20);
             this.resourceController = new ResourceController(
@@ -196,12 +236,7 @@ public async Task SearchEndpointUsesPassedInLimitIfGiven(int limit)
 
             // Then
             this.searchService.Verify(
-                service => service.Search(It.Is<ResourceSearchRequest>(request => request.Limit == limit)));
-        }
-
-        public void Dispose()
-        {
-            this.resourceController?.Dispose();
+                service => service.Search(It.Is<ResourceSearchRequest>(request => request.Limit == limit), currentUserId));
         }
 
         private void GivenDefaultLimitForFindwiseSearchIs(int limit)
@@ -212,14 +247,17 @@ private void GivenDefaultLimitForFindwiseSearchIs(int limit)
 
         private void GivenSearchServiceFailsWithStatus(FindwiseRequestStatus status)
         {
-            this.searchService.Setup(ss => ss.Search(It.IsAny<ResourceSearchRequest>())).ReturnsAsync(
+            int? currentUserId = null; //E.g if hitting endpoint with ApiKey auth
+            this.searchService.Setup(ss => ss.Search(It.IsAny<ResourceSearchRequest>(), currentUserId)).ReturnsAsync(
                 new ResourceSearchResultModel(new List<ResourceMetadataViewModel>(), status, 0));
         }
 
         private void GivenSearchServiceSucceedsButFindsNoItems()
         {
-            this.searchService.Setup(ss => ss.Search(It.IsAny<ResourceSearchRequest>())).ReturnsAsync(
+            int? currentUserId = null; //E.g if hitting endpoint with ApiKey auth
+            this.searchService.Setup(ss => ss.Search(It.IsAny<ResourceSearchRequest>(), currentUserId)).ReturnsAsync(
                 new ResourceSearchResultModel(new List<ResourceMetadataViewModel>(), FindwiseRequestStatus.Success, 0));
         }
+
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs
index d6ae8f3db..2751d2254 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs
@@ -22,9 +22,13 @@ public class ResourceServiceTests
         private readonly Mock<ILearningHubService> learningHubService;
         private readonly ResourceService resourceService;
         private readonly Mock<IResourceRepository> resourceRepository;
+        private readonly int currentUserId;
 
         public ResourceServiceTests()
         {
+            //This Id is the development accountId
+            this.currentUserId = 57541;
+
             this.learningHubService = new Mock<ILearningHubService>();
             this.resourceRepository = new Mock<IResourceRepository>();
             this.resourceService = new ResourceService(this.learningHubService.Object, this.resourceRepository.Object, new NullLogger<ResourceService>());
@@ -63,7 +67,7 @@ public async Task SingleResourceEndpointReturnsTheCorrectInformationIfThereIsAMa
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(0, 1));
 
             // When
-            var x = await this.resourceService.GetResourceReferenceByOriginalId(1);
+            var x = await this.resourceService.GetResourceReferenceByOriginalId(1, null);
 
             // Then
             x.Rating.Should().Be(3);
@@ -80,7 +84,7 @@ public async Task SingleResourceReturnsA404IfTheresNoResourceReferenceWithAMatch
                 .ReturnsAsync(new List<ResourceReference>());
 
             // When / Then
-            var exception = await Assert.ThrowsAsync<HttpResponseException>(async () => await this.resourceService.GetResourceReferenceByOriginalId(999));
+            var exception = await Assert.ThrowsAsync<HttpResponseException>(async () => await this.resourceService.GetResourceReferenceByOriginalId(999, null));
             exception.StatusCode.Should().Be(HttpStatusCode.NotFound);
             exception.ResponseBody.Should().Be("No matching resource reference");
         }
@@ -93,7 +97,7 @@ public async Task SingleResourceEndpointReturnsAResourceMetadataViewModelObjectW
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(1, 1));
 
             // When
-            var x = await this.resourceService.GetResourceReferenceByOriginalId(2);
+            var x = await this.resourceService.GetResourceReferenceByOriginalId(2, null);
 
             // Then
             x.Title.Should().Be("No current resource version");
@@ -108,7 +112,7 @@ public async Task SingleResourceEndpointReturnsAMessageSayingNoCatalogueIfThereI
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(2, 1));
 
             // When
-            var x = await this.resourceService.GetResourceReferenceByOriginalId(3);
+            var x = await this.resourceService.GetResourceReferenceByOriginalId(3, null);
 
             // Then
             x.Catalogue.Name.Should().Be("No catalogue for resource reference");
@@ -122,7 +126,7 @@ public async Task SingleResourceEndpointReturnsAMessageSayingNoCatalogueIfThereI
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(3, 1));
 
             // When
-            var x = await this.resourceService.GetResourceReferenceByOriginalId(4);
+            var x = await this.resourceService.GetResourceReferenceByOriginalId(4, null);
 
             // Then
             x.Catalogue.Name.Should().Be("No catalogue for resource reference");
@@ -136,7 +140,7 @@ public async Task SingleResourceEndpointReturnsAMessageSayingNoCatalogueIfThereI
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(5, 1));
 
             // When
-            var x = await this.resourceService.GetResourceReferenceByOriginalId(6);
+            var x = await this.resourceService.GetResourceReferenceByOriginalId(6, null);
 
             // Then
             x.Catalogue.Name.Should().Be("No catalogue for resource reference");
@@ -150,7 +154,7 @@ public async Task SingleResourceEndpointReturnsAZeroForRatingIfTheresNoRatingSum
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(7, 1));
 
             // When
-            var x = await this.resourceService.GetResourceReferenceByOriginalId(8);
+            var x = await this.resourceService.GetResourceReferenceByOriginalId(8, null);
 
             // Then
             x.Catalogue.Name.Should().Be("catalogue3");
@@ -165,7 +169,7 @@ public async Task SingleResourceEndpointThrowsAnErrorAndReturnsABlankStringIfThe
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(8, 1));
 
             // When
-            var x = await this.resourceService.GetResourceReferenceByOriginalId(9);
+            var x = await this.resourceService.GetResourceReferenceByOriginalId(9, null);
 
             // Then
             x.ResourceType.Should().Be(string.Empty);
@@ -179,7 +183,7 @@ public async Task SingleResourceEndpointThrowsAnErrorIfThereIsMoreThanOneResourc
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(9, 2));
 
             // When / Then
-            await Assert.ThrowsAsync<InvalidOperationException>(async () => await this.resourceService.GetResourceReferenceByOriginalId(10));
+            await Assert.ThrowsAsync<InvalidOperationException>(async () => await this.resourceService.GetResourceReferenceByOriginalId(10, null));
         }
 
         /*[Fact]
@@ -198,7 +202,7 @@ public async Task BulkEndpointReturnsAllMatchingResources()
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(0, 2));
 
             // When
-            var x = await this.resourceService.GetResourceReferencesByOriginalIds(idsToLookUp);
+            var x = await this.resourceService.GetResourceReferencesByOriginalIds(idsToLookUp, null);
 
             // Then
             x.ResourceReferences.Count.Should().Be(2);
@@ -220,7 +224,7 @@ public async Task BulkEndpointReturnsA404IfThereAreNoMatchingResources()
                 .ReturnsAsync(new List<ResourceReference>());
 
             // When
-            var x = await this.resourceService.GetResourceReferencesByOriginalIds(idsToLookUp);
+            var x = await this.resourceService.GetResourceReferencesByOriginalIds(idsToLookUp, null);
 
             // Then
             x.UnmatchedResourceReferenceIds.Count.Should().Be(2);
@@ -237,7 +241,7 @@ public async Task BulkEndpointReturnsResourcesWithIncompleteInformation()
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(0, 4));
 
             // When
-            var x = await this.resourceService.GetResourceReferencesByOriginalIds(idsToLookUp);
+            var x = await this.resourceService.GetResourceReferencesByOriginalIds(idsToLookUp, null);
 
             // Then
             x.ResourceReferences.Count.Should().Be(4);
@@ -257,7 +261,7 @@ public async Task BulkEndpointReturnsUnmatchedResourcesWithMatchedResources()
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(0, 1));
 
             // When
-            var x = await this.resourceService.GetResourceReferencesByOriginalIds(idsToLookUp);
+            var x = await this.resourceService.GetResourceReferencesByOriginalIds(idsToLookUp, null);
 
             // Then
             x.ResourceReferences.Count.Should().Be(1);
@@ -277,7 +281,7 @@ public async Task ResourceServiceReturnsTheOriginalResourceReferenceIdAsTheRefId
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(5, 2));
 
             // When
-            var x = await this.resourceService.GetResourceReferencesByOriginalIds(list);
+            var x = await this.resourceService.GetResourceReferencesByOriginalIds(list, null);
 
             // Then
             x.ResourceReferences[0].RefId.Should().Be(6);
@@ -293,7 +297,7 @@ public async Task ResourceServiceReturnsTheOriginalResourceReferenceIdAsTheRefId
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(5, 1));
 
              // When
-            var x = await this.resourceService.GetResourceReferenceByOriginalId(6);
+            var x = await this.resourceService.GetResourceReferenceByOriginalId(6, null);
 
              // Then
             x.RefId.Should().Be(6);
@@ -308,7 +312,7 @@ public async Task ResourceServiceReturnsThatARestrictedCatalogueIsRestricted()
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(8, 1));
 
             // When
-            var x = await this.resourceService.GetResourceReferenceByOriginalId(9);
+            var x = await this.resourceService.GetResourceReferenceByOriginalId(9, null);
 
             // Then
             x.Catalogue.IsRestricted.Should().BeTrue();
@@ -323,7 +327,7 @@ public async Task ResourceServiceReturnsThatAnUnrestrictedCatalogueIsUnrestricte
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(7, 1));
 
             // When
-            var x = await this.resourceService.GetResourceReferenceByOriginalId(8);
+            var x = await this.resourceService.GetResourceReferenceByOriginalId(8, null);
 
             // Then
             x.Catalogue.IsRestricted.Should().BeFalse();
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/SearchServiceTests.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/SearchServiceTests.cs
index d393ce59d..ee84c1c51 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/SearchServiceTests.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/SearchServiceTests.cs
@@ -6,6 +6,7 @@ namespace LearningHub.Nhs.OpenApi.Tests.Services.Services
     using FizzWare.NBuilder;
     using FluentAssertions;
     using FluentAssertions.Execution;
+    using LearningHub.Nhs.Models.Entities.Activity;
     using LearningHub.Nhs.Models.Entities.Resource;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Search;
@@ -73,7 +74,7 @@ public async Task SearchPassesQueryOnToFindwise()
                 .ReturnsAsync(FindwiseResultModel.Failure(FindwiseRequestStatus.Timeout));
 
             // When
-            await this.searchService.Search(searchRequest);
+            await this.searchService.Search(searchRequest, null);
 
             // Then
             this.findwiseClient.Verify(fc => fc.Search(searchRequest));
@@ -90,7 +91,7 @@ public async Task SearchReturnsTotalHitsAndSearchResult()
             this.GivenFindwiseReturnsSuccessfulResponse(74, Enumerable.Range(1, 34));
 
             // When
-            var searchResult = await this.searchService.Search(searchRequest);
+            var searchResult = await this.searchService.Search(searchRequest, null);
 
             // Then
             searchResult.Resources.Count.Should().Be(34);
@@ -137,7 +138,7 @@ public async Task SearchResultsReturnExpectedValues()
             this.GivenFindwiseReturnsSuccessfulResponse(2, new[] { 1, 2, 3 });
 
             // When
-            var searchResult = await this.searchService.Search(searchRequest);
+            var searchResult = await this.searchService.Search(searchRequest, null);
 
             // Then
             searchResult.Resources.Count.Should().Be(2);
@@ -180,7 +181,7 @@ public async Task SearchReturnsResourcesInOrderMatchingFindwise()
                 .ReturnsAsync(resources);
 
             // When
-            var searchResultModel = await this.searchService.Search(new ResourceSearchRequest("text", 0, 10));
+            var searchResultModel = await this.searchService.Search(new ResourceSearchRequest("text", 0, 10), null);
 
             // Then
             searchResultModel.Resources.Select(r => r.ResourceId).Should().ContainInOrder(new[] { 1, 3, 2 });
@@ -194,7 +195,6 @@ public async Task SearchReplacesNullPropertiesOfResourceWithDefaultValues()
             {
                 Builder<Resource>.CreateNew()
                     .With(r => r.Id = 1)
-                    .With(r => r.CurrentResourceVersion = null)
                     .With(
                         r => r.ResourceReference = new[]
                         {
@@ -212,7 +212,7 @@ public async Task SearchReplacesNullPropertiesOfResourceWithDefaultValues()
             this.GivenFindwiseReturnsSuccessfulResponse(1, new[] { 1 });
 
             // When
-            var searchResult = await this.searchService.Search(new ResourceSearchRequest("text", 0, 10));
+            var searchResult = await this.searchService.Search(new ResourceSearchRequest("text", 0, 10), null);
 
             // Then
             using var scope = new AssertionScope();
@@ -233,7 +233,9 @@ public async Task SearchReplacesNullPropertiesOfResourceWithDefaultValues()
                     string.Empty,
                     expectedResourceReferences,
                     "Article",
-                    0));
+                    0,
+                    0,
+                    new List<MajorVersionIdActivityStatusDescription>(){ }));
         }
 
         private void GivenFindwiseReturnsSuccessfulResponse(int totalHits, IEnumerable<int> resourceIds)

From ebce59083ba576da06a0f6065477823e15e6c8d5 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Mon, 8 Jul 2024 09:50:42 +0100
Subject: [PATCH 017/143] Add stored procedure
 GetResourceActivityPErResource<ajorVersion

---
 .../LearningHub.Nhs.Database.sqlproj          |   1 +
 ...esourceActivityPerResourceMajorVersion.sql | 147 ++++++++++++++++++
 2 files changed, 148 insertions(+)
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetResourceActivityPerResourceMajorVersion.sql

diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
index e49a6e8a2..ee9f4c0ad 100644
--- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
+++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
@@ -515,6 +515,7 @@
     <None Include="Scripts\Post-Deploy\Scripts\TD-2929_ActivityStatusUpdates.sql" />
     <Build Include="Stored Procedures\Resources\BlockCollectionFileSearch.sql" />
     <None Include="Scripts\Post-Deploy\Scripts\TD-4031_AMStoMKIOMigration.sql" />
+    <Build Include="Stored Procedures\Activity\GetResourceActivityPerResourceMajorVersion.sql" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetResourceActivityPerResourceMajorVersion.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetResourceActivityPerResourceMajorVersion.sql
new file mode 100644
index 000000000..0c8fb4358
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetResourceActivityPerResourceMajorVersion.sql	
@@ -0,0 +1,147 @@
+
+-------------------------------------------------------------------------------
+-- Author       Phil T
+-- Created      04-07-24
+-- Purpose      Return resource activity for each major version for user
+
+
+-- Description
+/*
+		This procedure returns a single entry per resource Id, selecting the most important one for that major version.
+		This is so users can still have a resourceActivity history following a majorVersion change
+
+		UserIds is nullable so that general resource activity can be searched for
+		ResourceIds is nullable so that all a users history can be searched for
+
+		When determining the resourceActivity statusDescription in the front end resourceTypeId is also required for changing completed statuses to resourceType specific ones
+
+		Currently if multiple rows meet the case criteria we retrieve the one with the highest Id which is also expected to be the ActivityEnd part of the activityStatus pair.
+
+*/
+-- Future Considerations
+/*
+		Because the activityResource should come in pairs one with ActivityStart populated and one with ActivityEnd populated 
+		it could be desireable to join via LaunchResourceActivityId and coalesce the data in future.
+		Or/And coalesce where the case returns multiple rows.
+
+*/
+-- Notes
+   --  resourceId is used not originalResourceId
+
+	
+-------------------------------------------------------------------------------
+
+
+
+  -- Split the comma-separated list into a table of integers
+    DECLARE @ResourceIdTable TABLE (ResourceId INT);
+
+    IF @ResourceIds IS NOT NULL AND @ResourceIds <> ''
+    BEGIN
+        INSERT INTO @ResourceIdTable (ResourceId)
+        SELECT CAST(value AS INT)
+        FROM STRING_SPLIT(@ResourceIds, ',');
+    END;
+
+    -- Split the comma-separated list of UserIds into a table
+    DECLARE @UserIdTable TABLE (UserId INT);
+
+    IF @UserIds IS NOT NULL AND @UserIds <> ''
+    BEGIN
+        INSERT INTO @UserIdTable (UserId)
+        SELECT CAST(value AS INT)
+        FROM STRING_SPLIT(@UserIds, ',');
+    END;
+
+    WITH FilteredResourceActivities AS (
+        SELECT 
+            ars.[Id],
+            ars.[UserId],
+            ars.[LaunchResourceActivityId],
+            ars.[ResourceId],
+            ars.[ResourceVersionId],
+            ars.[MajorVersion],
+            ars.[MinorVersion],
+            ars.[NodePathId],
+            ars.[ActivityStatusId],
+            ars.[ActivityStart],
+            ars.[ActivityEnd],
+            ars.[DurationSeconds],
+            ars.[Score],
+            ars.[Deleted],
+            ars.[CreateUserID],
+            ars.[CreateDate],
+            ars.[AmendUserID],
+            ars.[AmendDate]
+        FROM 
+            [activity].[resourceactivity] ars
+        WHERE 
+            (@UserIds IS NULL OR ars.userId IN (SELECT UserId FROM @UserIdTable) OR NOT EXISTS (SELECT 1 FROM @UserIdTable))
+            AND (@ResourceIds IS NULL OR @ResourceIds = '' OR ars.resourceId IN (SELECT ResourceId FROM @ResourceIdTable) OR NOT EXISTS (SELECT 1 FROM @ResourceIdTable))
+            AND ars.Deleted = 0
+            AND ars.ActivityStatusId NOT IN (1, 6, 2) -- These Ids are not in use - Launched, Downloaded, In Progress (stored as completed and incomplete then renamed in the application)
+    ),
+    RankedActivities AS (
+        SELECT 
+            ra.[Id],
+            ra.[UserId],
+            ra.[LaunchResourceActivityId],
+            ra.[ResourceId],
+            ra.[ResourceVersionId],
+            ra.[MajorVersion],
+            ra.[MinorVersion],
+            ra.[NodePathId],
+            ra.[ActivityStatusId],
+            ra.[ActivityStart],
+            ra.[ActivityEnd],
+            ra.[DurationSeconds],
+            ra.[Score],
+            ra.[Deleted],
+            ra.[CreateUserID],
+            ra.[CreateDate],
+            ra.[AmendUserID],
+            ra.[AmendDate],
+            ROW_NUMBER() OVER (
+                PARTITION BY resourceId, userId, MajorVersion 
+                ORDER BY 
+                    CASE 
+                        WHEN ActivityStatusId = 5 THEN 1    -- Passed
+                        WHEN ActivityStatusId = 3 THEN 2    -- Completed
+                        WHEN ActivityStatusId = 4 THEN 3    -- Failed
+                        WHEN ActivityStatusId = 7 THEN 4    -- Incomplete
+                        ELSE 5 -- shouldn't be any
+                    END,
+					Id DESC -- we have two entries per interacting with a resource the start and the end, we are just returning the last entry made
+					-- there is the option of instead coalescing LaunchResourceActivityId, ActivityStart,ActivityEnd potentially via joining LaunchResourceActivityId and UserId
+            ) AS RowNum
+        FROM 
+            FilteredResourceActivities ra
+    )
+    SELECT 
+        ra.[Id],
+        ra.[UserId],
+        ra.[LaunchResourceActivityId],
+        ra.[ResourceId],
+        ra.[ResourceVersionId],
+        ra.[MajorVersion],
+        ra.[MinorVersion],
+        ra.[NodePathId],
+        ra.[ActivityStatusId],
+        ra.[ActivityStart],
+        ra.[ActivityEnd],
+        ra.[DurationSeconds],
+        ra.[Score],
+        ra.[Deleted],
+        ra.[CreateUserID],
+        ra.[CreateDate],
+        ra.[AmendUserID],
+        ra.[AmendDate]
+    FROM 
+        RankedActivities ra
+    WHERE 
+        RowNum = 1
+	order by MajorVersion desc;
+END;
+GO
+
+

From 8f1765ba7c3197241f3043ae1b270fa4b33a3742 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Mon, 8 Jul 2024 09:59:16 +0100
Subject: [PATCH 018/143] fix stored proc

---
 .../GetResourceActivityPerResourceMajorVersion.sql         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetResourceActivityPerResourceMajorVersion.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetResourceActivityPerResourceMajorVersion.sql
index 0c8fb4358..063110343 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetResourceActivityPerResourceMajorVersion.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetResourceActivityPerResourceMajorVersion.sql	
@@ -31,7 +31,12 @@
 	
 -------------------------------------------------------------------------------
 
-
+-- Create the new stored procedure
+CREATE PROCEDURE [activity].[GetResourceActivityPerResourceMajorVersion]
+    @ResourceIds VARCHAR(MAX) = NULL,
+    @UserIds VARCHAR(MAX) = NULL
+AS
+BEGIN
 
   -- Split the comma-separated list into a table of integers
     DECLARE @ResourceIdTable TABLE (ResourceId INT);

From d3df951d3da5a28e90af3143294d6d488536fa53 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Mon, 8 Jul 2024 13:03:48 +0100
Subject: [PATCH 019/143] Added tests

---
 .../Services/Services/ResourceServiceTests.cs | 59 ++++++++++++++++++-
 .../LearningHub.NHS.OpenAPI.csproj.user       |  9 +++
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 OpenAPI/LearningHub.Nhs.OpenApi/LearningHub.NHS.OpenAPI.csproj.user

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs
index 2751d2254..1f791a353 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs
@@ -2,10 +2,12 @@ namespace LearningHub.Nhs.OpenApi.Tests.Services.Services
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
     using System.Net;
     using System.Threading.Tasks;
     using FizzWare.NBuilder;
     using FluentAssertions;
+    using LearningHub.Nhs.Models.Entities.Activity;
     using LearningHub.Nhs.Models.Entities.Resource;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.OpenApi.Models.Exceptions;
@@ -33,7 +35,14 @@ public ResourceServiceTests()
             this.resourceRepository = new Mock<IResourceRepository>();
             this.resourceService = new ResourceService(this.learningHubService.Object, this.resourceRepository.Object, new NullLogger<ResourceService>());
         }
-
+        private List<ResourceActivityDTO> ResourceActivityDTOList => new List<ResourceActivityDTO>()
+        {
+            new ResourceActivityDTO{ ResourceId = 1, ActivityStatusId = 5, MajorVersion = 5 },
+            new ResourceActivityDTO{ ResourceId = 1, ActivityStatusId = 7, MajorVersion = 4 },
+            new ResourceActivityDTO{ ResourceId = 1, ActivityStatusId = 3, MajorVersion = 3 },
+            new ResourceActivityDTO{ ResourceId = 1, ActivityStatusId = 7, MajorVersion = 2 },
+            new ResourceActivityDTO{ ResourceId = 1, ActivityStatusId = 3, MajorVersion = 1 },
+        };
         private List<Resource> ResourceList => new List<Resource>()
         {
             ResourceTestHelper.CreateResourceWithDetails(id: 1, title: "title1", description: "description1", rating: 3m, resourceType: ResourceTypeEnum.Article),
@@ -332,5 +341,53 @@ public async Task ResourceServiceReturnsThatAnUnrestrictedCatalogueIsUnrestricte
             // Then
             x.Catalogue.IsRestricted.Should().BeFalse();
         }
+
+        [Fact]
+        public async Task SingleResourceEndpointReturnsActivitySummaryWhenCurrentUserIdProvided()
+        {
+            // Given
+            this.resourceRepository.Setup(rr => rr.GetResourceReferencesByOriginalResourceReferenceIds(new List<int>() { 1 }))
+                .ReturnsAsync(this.ResourceReferenceList.GetRange(0, 1));
+
+            this.resourceRepository.Setup(rr => rr.GetResourceActivityPerResourceMajorVersion(new List<int>() { 1 }, new List<int>() { currentUserId }))
+                .ReturnsAsync(this.ResourceActivityDTOList.ToList());
+
+            // When
+            var x = await this.resourceService.GetResourceReferenceByOriginalId(1, currentUserId);
+
+            // Then
+            x.UserSummaryActivityStatuses.Should().NotBeNull();
+            x.UserSummaryActivityStatuses[0].MajorVersionId.Should().Be(5);
+            x.UserSummaryActivityStatuses[1].MajorVersionId.Should().Be(4);
+            x.UserSummaryActivityStatuses[2].MajorVersionId.Should().Be(3);
+            x.UserSummaryActivityStatuses[3].MajorVersionId.Should().Be(2);
+            x.UserSummaryActivityStatuses[4].MajorVersionId.Should().Be(1);
+
+            x.UserSummaryActivityStatuses[0].ActivityStatusDescription.Should().Be("Passed");
+            x.UserSummaryActivityStatuses[1].ActivityStatusDescription.Should().Be("In progress");
+            x.UserSummaryActivityStatuses[2].ActivityStatusDescription.Should().Be("Viewed");
+            x.UserSummaryActivityStatuses[3].ActivityStatusDescription.Should().Be("In progress");
+            x.UserSummaryActivityStatuses[4].ActivityStatusDescription.Should().Be("Viewed");
+
+        }
+
+        [Fact]
+        public async Task SingleResourceEndpointReturnsEmptyActivitySummaryWhenNoCurrentUserIdProvided()
+        {
+            // Given
+            this.resourceRepository.Setup(rr => rr.GetResourceReferencesByOriginalResourceReferenceIds(new List<int>() { 1 }))
+                .ReturnsAsync(this.ResourceReferenceList.GetRange(0, 1));
+
+            // This should not be hit
+            this.resourceRepository.Setup(rr => rr.GetResourceActivityPerResourceMajorVersion(new List<int>() { 1 }, new List<int>() { currentUserId }))
+                .ReturnsAsync(this.ResourceActivityDTOList.ToList());
+
+            // When
+            var x = await this.resourceService.GetResourceReferenceByOriginalId(1, null);
+
+            // Then
+            x.UserSummaryActivityStatuses.Should().BeEmpty();
+
+        }
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/LearningHub.NHS.OpenAPI.csproj.user b/OpenAPI/LearningHub.Nhs.OpenApi/LearningHub.NHS.OpenAPI.csproj.user
new file mode 100644
index 000000000..b17387f00
--- /dev/null
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/LearningHub.NHS.OpenAPI.csproj.user
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ActiveDebugProfile>IIS Local</ActiveDebugProfile>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

From 888a2bf3014cb55121d313c729583ced1f7212f6 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Tue, 9 Jul 2024 17:12:47 +0100
Subject: [PATCH 020/143] Branched from td-2895 virgo to avoid clashes with
 td-2895, catalogue

---
 .../LearningHub.Nhs.OpenApi.Models.csproj     |   4 +-
 .../Repositories/IResourceRepository.cs       |   9 ++
 .../Repositories/ResourceRepository.cs        |  18 +++
 ...gHub.Nhs.OpenApi.Services.Interface.csproj |   4 +-
 .../Services/IResourceService.cs              |  15 +++
 .../LearningHub.Nhs.OpenApi.Services.csproj   |   2 +-
 .../Services/ResourceService.cs               |  59 ++++++++++
 .../Controllers/ResourceControllerTests.cs    |  39 +++++++
 .../Services/Services/ResourceServiceTests.cs | 108 ++++++++++++++++++
 .../Controllers/ResourceController.cs         |  38 ++++++
 .../MyLearningService.cs                      |   2 +-
 11 files changed, 292 insertions(+), 6 deletions(-)

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
index 2c87ba2cb..fb5e83461 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.34" />
       <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
     </ItemGroup>
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs
index d3a1856e4..d0294a8a6 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs
@@ -32,5 +32,14 @@ public Task<IEnumerable<ResourceReference>> GetResourceReferencesByOriginalResou
         /// <param name="userIds"></param>
         /// <returns>ResourceActivityDTO.</returns>
         Task<IEnumerable<ResourceActivityDTO>> GetResourceActivityPerResourceMajorVersion(IEnumerable<int>? resourceReferenceIds, IEnumerable<int>? userIds);
+
+        /// <summary>
+        /// GetResourceReferencesForAssessments
+        /// </summary>
+        /// <param name="resourceIds"><see cref="resourceIds"/>.</param>
+        /// <returns>ResourceActivityDTO.</returns>
+        public Task<IEnumerable<ResourceReference>> GetResourceReferencesForAssessments(List<int> resourceIds);
+
+
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
index 7ffb3c6fa..7669d754c 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
@@ -73,6 +73,24 @@ public async Task<IEnumerable<ResourceReference>> GetResourceReferencesByOrigina
                 .ToListAsync();
         }
 
+        public async Task<IEnumerable<ResourceReference>> GetResourceReferencesForAssessments(List<int> resourceIds)
+        {
+
+            return await this.dbContext.ResourceReference
+                .Where(rr => resourceIds.Contains(rr.ResourceId))
+                .Where(rr => !rr.Deleted)
+                .Where(rr => (int)rr.NodePath.Node.NodeTypeEnum != 4)
+                .Include(rr => rr.NodePath)
+                .ThenInclude(np => np.CatalogueNode)
+                .ThenInclude(n => n.CurrentNodeVersion)
+                .ThenInclude(n => n.CatalogueNodeVersion)
+                .Include(rr => rr.Resource)
+                .ThenInclude(r => r.CurrentResourceVersion)
+                .ThenInclude(r => r.ResourceVersionRatingSummary)
+                .Where(r => r.Resource.ResourceTypeEnum == Nhs.Models.Enums.ResourceTypeEnum.Assessment)
+                .ToListAsync();
+        }
+
         /// </summary>
         /// <param name="resourceReferenceIds"></param>
         /// <param name="userIds"></param>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
index 108c74355..b569a4100 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.34" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IResourceService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IResourceService.cs
index 795ddbf42..3c397bb78 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IResourceService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IResourceService.cs
@@ -10,6 +10,14 @@ namespace LearningHub.Nhs.OpenApi.Services.Interface.Services
     /// </summary>
     public interface IResourceService
     {
+        /// <summary>
+        /// The get resource by activityStatusIds async.
+        /// </summary>
+        /// <param name="activityStatusIds">activityStatusIds.</param>
+        /// <param name="currentUserId">c.</param>
+        /// <returns>The <see cref="Task"/>the resourceMetaDataViewModel corresponding to the resource reference.</returns>
+        Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferenceByActivityStatus(List<int> activityStatusIds, int currentUserId);
+
         /// <summary>
         /// The get resource by id async.
         /// </summary>
@@ -17,6 +25,13 @@ public interface IResourceService
         /// <returns>The <see cref="Task"/>the resourceMetaDataViewModel corresponding to the resource reference.</returns>
         Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceReferenceByOriginalId(int originalResourceReferenceId, int? currentUserId);
 
+        /// <summary>
+        /// The get resource references for certificates
+        /// </summary>
+        /// <param name="currentUserId">currentUserId.</param>
+        /// <returns>The ResourceReferenceWithResourceDetailsViewModel<see cref="Task"/>the resourceMetaDataViewModel corresponding to the resource reference.</returns>
+        Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesForCertificates(int currentUserId);
+
         /// <summary>
         /// The get resources by Ids endpoint.
         /// </summary>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
index ce9034d03..2d89a8ced 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
@@ -24,7 +24,7 @@
     <ItemGroup>
       <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
       <PackageReference Include="IdentityModel" Version="4.3.0" />
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.34" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
index 3212b0b37..6c9d703ec 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
@@ -8,6 +8,7 @@ namespace LearningHub.Nhs.OpenApi.Services.Services
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Entities.Activity;
     using LearningHub.Nhs.Models.Entities.Resource;
+    using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.ViewModels.Helpers;
     using LearningHub.Nhs.OpenApi.Models.Exceptions;
     using LearningHub.Nhs.OpenApi.Models.ViewModels;
@@ -126,6 +127,64 @@ public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOrigina
             return new BulkResourceReferenceViewModel(matchedResources, unmatchedIds);
         }
 
+
+        /// <summary>
+        /// the get by id async.
+        /// </summary>
+        /// <param name="originalResourceReferenceId">the id.</param>
+        /// <param name="currentUserId"></param>
+        /// <returns>list resource ViewModel.</returns>
+        public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferenceByActivityStatus(List<int> activityStatusIds, int currentUserId)
+        {
+            List<ResourceActivityDTO> resourceActivities = new List<ResourceActivityDTO>() { };
+            List<ResourceReferenceWithResourceDetailsViewModel> ResourceReferenceWithResourceDetailsViewModelLS = new List<ResourceReferenceWithResourceDetailsViewModel>() { };
+
+            resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(new List<int>(){ }, new List<int>(){ currentUserId }))?.ToList() ?? new List<ResourceActivityDTO>() { };
+
+            // Removing resources that have no major versions with the required activitystatus
+            List<int> resourceIds = resourceActivities
+                .GroupBy(ra => ra.ResourceId)
+                .Where(group => group.Any(g => activityStatusIds.Contains(g.ActivityStatusId)))
+                .Select(group => group.Key)
+                .Distinct()
+                .ToList();
+
+            var resourceReferencesList = (await this.resourceRepository.GetResourcesFromIds(resourceIds)).SelectMany(r => r.ResourceReference).ToList();
+
+            ResourceReferenceWithResourceDetailsViewModelLS = resourceReferencesList.Select(rr => this.GetResourceReferenceWithResourceDetailsViewModel(rr, resourceActivities)).ToList();
+
+            return ResourceReferenceWithResourceDetailsViewModelLS;
+        }
+
+        /// <summary>
+        /// Gets ResourceReferences ForCertificates using the ResourceReferenceWithResourceDetailsViewModel .
+        /// </summary>
+        /// <param name="currentUserId">user Id.</param>
+        /// <returns>list resource reference ViewModel.</returns>
+        public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesForCertificates(int currentUserId)
+        {
+            //qqqq can some of this go into a helper
+            List<int> activityStatusesForCertificates = new List<int>() { (int)ActivityStatusEnum.Completed, (int)ActivityStatusEnum.Passed }; // qqqq maybe drop completed
+            List<ResourceActivityDTO> resourceActivities = new List<ResourceActivityDTO>() { };
+            List<ResourceReferenceWithResourceDetailsViewModel> ResourceReferenceWithResourceDetailsViewModelLS = new List<ResourceReferenceWithResourceDetailsViewModel>() { };
+
+            resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(new List<int>() { }, new List<int>() { currentUserId }))?.ToList() ?? new List<ResourceActivityDTO>() { };
+
+            // Removing resources that have no major versions with the required activitystatus
+            List<int> resourceIds = resourceActivities
+                .GroupBy(ra => ra.ResourceId)
+                .Where(group => group.Any(g => activityStatusesForCertificates.Contains(g.ActivityStatusId)))
+                .Select(group => group.Key)
+                .Distinct()
+                .ToList();
+
+            var resourceReferencesList = (await this.resourceRepository.GetResourceReferencesForAssessments(resourceIds)).ToList();
+
+            ResourceReferenceWithResourceDetailsViewModelLS = resourceReferencesList.Select(rr => this.GetResourceReferenceWithResourceDetailsViewModel(rr, resourceActivities)).ToList();
+
+            return ResourceReferenceWithResourceDetailsViewModelLS;
+        }
+
         private ResourceReferenceWithResourceDetailsViewModel GetResourceReferenceWithResourceDetailsViewModel(ResourceReference resourceReference, List<ResourceActivityDTO> resourceActivities)
         {
             var hasCurrentResourceVersion = resourceReference.Resource.CurrentResourceVersion != null;
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs
index acde1d3ef..254103a5b 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs
@@ -239,6 +239,45 @@ public async Task SearchEndpointUsesPassedInLimitIfGiven(int limit)
                 service => service.Search(It.Is<ResourceSearchRequest>(request => request.Limit == limit), currentUserId));
         }
 
+        [Fact]
+        public async Task GetResourceReferencesByCompleteThrowsErrorWhenNoUserId()
+        {
+            // When
+            var exception = await Assert.ThrowsAsync<UnauthorizedAccessException>(async () =>
+            {
+                await this.resourceController.GetResourceReferencesByComplete();
+            });
+
+            // Then
+            Assert.Equal("User Id is required.", exception.Message);
+        }
+
+        [Fact]
+        public async Task GetResourceReferencesByInProgressThrowsErrorWhenNoUserId()
+        {
+            // When
+            var exception = await Assert.ThrowsAsync<UnauthorizedAccessException>(async () =>
+            {
+                await this.resourceController.GetResourceReferencesByInProgress();
+            });
+
+            // Then
+            Assert.Equal("User Id is required.", exception.Message);
+        }
+
+        [Fact]
+        public async Task GetResourceReferencesByCertficatesThrowsErrorWhenNoUserId()
+        {
+            // When
+            var exception = await Assert.ThrowsAsync<UnauthorizedAccessException>(async () =>
+            {
+                await this.resourceController.GetResourceReferencesByCertificates();
+            });
+
+            // Then
+            Assert.Equal("User Id is required.", exception.Message);
+        }
+
         private void GivenDefaultLimitForFindwiseSearchIs(int limit)
         {
             this.findwiseConfigOptions.Setup(options => options.Value)
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs
index 1f791a353..d89ae6c6e 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs
@@ -42,6 +42,14 @@ public ResourceServiceTests()
             new ResourceActivityDTO{ ResourceId = 1, ActivityStatusId = 3, MajorVersion = 3 },
             new ResourceActivityDTO{ ResourceId = 1, ActivityStatusId = 7, MajorVersion = 2 },
             new ResourceActivityDTO{ ResourceId = 1, ActivityStatusId = 3, MajorVersion = 1 },
+
+            new ResourceActivityDTO{ ResourceId = 2, ActivityStatusId = 5, MajorVersion = 5 }, // Passed
+            new ResourceActivityDTO{ ResourceId = 2, ActivityStatusId = 4, MajorVersion = 4 }, // Failed
+            new ResourceActivityDTO{ ResourceId = 2, ActivityStatusId = 3, MajorVersion = 3 }, // complete
+
+            new ResourceActivityDTO{ ResourceId = 3, ActivityStatusId = 4, MajorVersion = 2 }, // Failed
+            new ResourceActivityDTO{ ResourceId = 3, ActivityStatusId = 4, MajorVersion = 1 }, // Failed
+            new ResourceActivityDTO{ ResourceId = 3, ActivityStatusId = 7, MajorVersion = 4 }, // In complete
         };
         private List<Resource> ResourceList => new List<Resource>()
         {
@@ -389,5 +397,105 @@ public async Task SingleResourceEndpointReturnsEmptyActivitySummaryWhenNoCurrent
             x.UserSummaryActivityStatuses.Should().BeEmpty();
 
         }
+
+        [Fact]
+        public async Task GetResourceReferencesByCompleteReturnsCorrectInformation()
+        {
+
+            // Given
+            List<int> resourceIds = new List<int>() { 1, 2 };
+            List<Resource> resources = this.ResourceList.GetRange(0,2);
+            resources[0].ResourceReference.ToList()[0].Resource = ResourceTestHelper.CreateResourceWithDetails(id: 1, title: "title1", description: "description1", rating: 3m, resourceType: ResourceTypeEnum.Article);
+            resources[1].ResourceReference.ToList()[0].Resource = ResourceTestHelper.CreateResourceWithDetails(id: 2, hasCurrentResourceVersion: false, hasNodePath: false, resourceType: ResourceTypeEnum.Assessment);
+
+            this.resourceRepository.Setup(rr => rr.GetResourceActivityPerResourceMajorVersion(It.IsAny<List<int>>(), It.IsAny<List<int>>()))
+                .ReturnsAsync(this.ResourceActivityDTOList);
+
+            this.resourceRepository.Setup(rr => rr.GetResourcesFromIds(resourceIds))
+                .ReturnsAsync(resources);
+
+            // When
+            var x = await this.resourceService.GetResourceReferenceByActivityStatus(new List<int>() { (int)ActivityStatusEnum.Completed }, currentUserId);
+
+            // Then
+
+            // Two groups resourceId 1 and 2 have completed for a major version. ResourceId 3 had resourceActivity data but not completed
+            x.Count().Should().Be(2);
+
+            // We are including all the major versions not just the matching ones if there exists one matching one
+            x[0].ResourceId.Should().Be(1);
+            x[0].UserSummaryActivityStatuses.Count().Should().Be(5);
+
+            // Return all the activitySummaries if one match
+            x[1].ResourceId.Should().Be(2);
+            x[1].UserSummaryActivityStatuses.Count().Should().Be(3);
+
+            // we are not excluding major version that are not completed. We return the resource and all its activitySummaries if one matches
+            x[0].UserSummaryActivityStatuses[1].ActivityStatusDescription.Should().Be("In progress");
+            x[0].UserSummaryActivityStatuses[2].ActivityStatusDescription.Should().Be("Viewed"); // Rename completed and still return it
+
+        }
+
+        [Fact]
+        public async Task GetResourceReferencesByInProgressReturnsCorrectInformation()
+        {
+            // Given
+            List<int> resourceIds = new List<int>() { 1, 3 };
+            List<Resource> resources = new List<Resource>() { this.ResourceList[0], this.ResourceList[2] };
+            resources[0].ResourceReference.ToList()[0].Resource = ResourceTestHelper.CreateResourceWithDetails(id: 1, title: "title1", description: "description1", rating: 3m, resourceType: ResourceTypeEnum.Article);
+            resources[1].ResourceReference.ToList()[0].Resource = ResourceTestHelper.CreateResourceWithDetails(id: 3, title: "title2", description: "description2");
+
+            this.resourceRepository.Setup(rr => rr.GetResourceActivityPerResourceMajorVersion(It.IsAny<List<int>>(), It.IsAny<List<int>>()))
+                .ReturnsAsync(this.ResourceActivityDTOList);
+
+            this.resourceRepository.Setup(rr => rr.GetResourcesFromIds(resourceIds))
+                .ReturnsAsync(resources);
+
+            // When
+            var x = await this.resourceService.GetResourceReferenceByActivityStatus(new List<int>() { (int)ActivityStatusEnum.Incomplete }, currentUserId); // In complete in the database is in progress im database
+
+            // Then
+
+            // Two groups resourceId 1 and 3 have completed for a major version. ResourceId 2 had resourceActivity data but not "in progress"
+            x.Count().Should().Be(2);
+
+            // We are including all the major versions not just the matching ones if there exists one matching one
+            x[0].ResourceId.Should().Be(1);
+            x[0].UserSummaryActivityStatuses.Count().Should().Be(5);
+
+            // Return all the activitySummaries if one match
+            x[1].ResourceId.Should().Be(3);
+            x[1].UserSummaryActivityStatuses.Count().Should().Be(3);
+
+            // we are not excluding major version that are not completed. We return the resource and all its activitySummaries if one matches
+            x[0].UserSummaryActivityStatuses[1].ActivityStatusDescription.Should().Be("In progress");
+            x[0].UserSummaryActivityStatuses[2].ActivityStatusDescription.Should().Be("Viewed"); // Rename completed and still return it
+
+        }
+
+        [Fact]
+        public async Task GetResourceReferencesByCertificatesReturnsCorrectInformation()
+        {
+
+            // Given
+            List<int> resourceIds = new List<int>() { 1,2 }; // Ids returned from activity
+
+            this.resourceRepository.Setup(rr => rr.GetResourceActivityPerResourceMajorVersion(It.IsAny<List<int>>(), It.IsAny<List<int>>()))
+                .ReturnsAsync(this.ResourceActivityDTOList);
+
+            this.resourceRepository.Setup(rr => rr.GetResourceReferencesForAssessments(resourceIds))
+                .ReturnsAsync(ResourceReferenceList.GetRange(1,1));
+
+            // When
+            var x = await this.resourceService.GetResourceReferencesForCertificates(currentUserId);
+
+            // Then
+            x.Count().Should().Be(1); // ActivityStatus passed and resourceType Assessment
+            x[0].ResourceId.Should().Be(1);
+            x[0].UserSummaryActivityStatuses.Count().Should().Be(3); // return passed and all other major version statuses for this resource
+            x[0].UserSummaryActivityStatuses[0].Should().Be("Passed");
+        }
+
+        // QQQQ EmptyList do it for nothing returned to check nulls and empty list
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs
index a92463d20..b42f70686 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs
@@ -5,6 +5,7 @@ namespace LearningHub.NHS.OpenAPI.Controllers
     using System.Linq;
     using System.Net;
     using System.Threading.Tasks;
+    using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.OpenApi.Models.Configuration;
     using LearningHub.Nhs.OpenApi.Models.Exceptions;
     using LearningHub.Nhs.OpenApi.Models.ServiceModels.Findwise;
@@ -150,5 +151,42 @@ public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOrigina
 
             return await this.resourceService.GetResourceReferencesByOriginalIds(bulkResourceReferences.ResourceReferenceIds, this.CurrentUserId);
         }
+        /// <summary>
+        /// Get resourceReferences that have an in progress activity summary
+        /// </summary>
+        /// <returns>ResourceReferenceViewModels for matching resources.</returns>
+        [HttpGet("User/InProgress")]
+        public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesByInProgress()
+        {
+            if (this.CurrentUserId == null) throw new UnauthorizedAccessException("User Id required");
+
+            return await this.resourceService.GetResourceReferenceByActivityStatus(new List<int>(){ (int)ActivityStatusEnum.Incomplete}, this.CurrentUserId.Value);// In complete value is renamed in progress once leaves db
+        }
+        /// <summary>
+        /// Get resourceReferences that have a complete activity summary
+        /// </summary>
+        /// <returns>ResourceReferenceViewModels for matching resources.</returns>
+        [HttpGet("User/Complete")]
+        public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesByComplete()
+        {
+            if (this.CurrentUserId == null) throw new UnauthorizedAccessException("User Id required");
+
+            return await this.resourceService.GetResourceReferenceByActivityStatus(new List<int>() { (int)ActivityStatusEnum.Completed }, this.CurrentUserId.Value);// Complete can be renamed to viewed etc
+        }
+
+        /// <summary>
+        /// Get resourceReferences that have certificates
+        /// </summary>
+        /// <returns>ResourceReferenceViewModels for matching resources.</returns>
+        [HttpGet("User/Certificates")]
+        public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesByCertificates()
+        {
+            if (this.CurrentUserId == null) throw new UnauthorizedAccessException("User Id required");
+
+            return await this.resourceService.GetResourceReferencesForCertificates(this.CurrentUserId.Value);
+        }
+
+
+
     }
 }
diff --git a/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs b/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
index 65b4acdba..6f2fb8985 100644
--- a/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
@@ -168,7 +168,7 @@ public async Task<Tuple<int, MyLearningDetailedItemViewModel>> GetResourceCertif
             var activityEntities = await activityQuery.OrderByDescending(x => x.Score).ThenByDescending(x => x.ActivityStart).ToListAsync();
             activityEntities.RemoveAll(x => x.Resource.ResourceTypeEnum == ResourceTypeEnum.Scorm && (x.ActivityStatusId == (int)ActivityStatusEnum.Downloaded || x.ActivityStatusId == (int)ActivityStatusEnum.Incomplete || x.ActivityStatusId == (int)ActivityStatusEnum.InProgress));
             if (activityEntities.Any() && activityEntities.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Assessment)
-            {
+            { // qqqq 
                 totalNumberOfAccess = activityQuery.SelectMany(x => x.AssessmentResourceActivity).OrderByDescending(a => a.CreateDate).ToList().Count();
                 activityEntities = activityEntities.Where(x => x.AssessmentResourceActivity.FirstOrDefault() != null && x.AssessmentResourceActivity.FirstOrDefault().Score.HasValue && ((int)Math.Round(x.AssessmentResourceActivity.FirstOrDefault().Score.Value, MidpointRounding.AwayFromZero) >= x.ResourceVersion.AssessmentResourceVersion.PassMark)).ToList();
             }

From e716f18ffc707ceb63b91bf31e29edca0b5d3156 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Wed, 10 Jul 2024 11:35:25 +0100
Subject: [PATCH 021/143] Change to parameterised end point and added to json
 description

---
 .../Controllers/ResourceControllerTests.cs    |  6 +--
 .../Services/Services/ResourceServiceTests.cs | 36 +++++++++++----
 .../Controllers/ResourceController.cs         | 24 ++++++++--
 .../SwaggerDefinitions/v1.3.0.json            | 46 +++++++++++++++++++
 .../MyLearningService.cs                      |  2 +-
 5 files changed, 99 insertions(+), 15 deletions(-)

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs
index 254103a5b..92ffa59a5 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs
@@ -249,7 +249,7 @@ public async Task GetResourceReferencesByCompleteThrowsErrorWhenNoUserId()
             });
 
             // Then
-            Assert.Equal("User Id is required.", exception.Message);
+            Assert.Equal("User Id required.", exception.Message);
         }
 
         [Fact]
@@ -262,7 +262,7 @@ public async Task GetResourceReferencesByInProgressThrowsErrorWhenNoUserId()
             });
 
             // Then
-            Assert.Equal("User Id is required.", exception.Message);
+            Assert.Equal("User Id required.", exception.Message);
         }
 
         [Fact]
@@ -275,7 +275,7 @@ public async Task GetResourceReferencesByCertficatesThrowsErrorWhenNoUserId()
             });
 
             // Then
-            Assert.Equal("User Id is required.", exception.Message);
+            Assert.Equal("User Id required.", exception.Message);
         }
 
         private void GivenDefaultLimitForFindwiseSearchIs(int limit)
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs
index d89ae6c6e..4f2da1d1e 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs
@@ -313,12 +313,12 @@ public async Task ResourceServiceReturnsTheOriginalResourceReferenceIdAsTheRefId
             this.resourceRepository.Setup(rr => rr.GetResourceReferencesByOriginalResourceReferenceIds(list))
                 .ReturnsAsync(this.ResourceReferenceList.GetRange(5, 1));
 
-             // When
+            // When
             var x = await this.resourceService.GetResourceReferenceByOriginalId(6, null);
 
-             // Then
+            // Then
             x.RefId.Should().Be(6);
-         }
+        }
 
         [Fact]
         public async Task ResourceServiceReturnsThatARestrictedCatalogueIsRestricted()
@@ -404,7 +404,7 @@ public async Task GetResourceReferencesByCompleteReturnsCorrectInformation()
 
             // Given
             List<int> resourceIds = new List<int>() { 1, 2 };
-            List<Resource> resources = this.ResourceList.GetRange(0,2);
+            List<Resource> resources = this.ResourceList.GetRange(0, 2);
             resources[0].ResourceReference.ToList()[0].Resource = ResourceTestHelper.CreateResourceWithDetails(id: 1, title: "title1", description: "description1", rating: 3m, resourceType: ResourceTypeEnum.Article);
             resources[1].ResourceReference.ToList()[0].Resource = ResourceTestHelper.CreateResourceWithDetails(id: 2, hasCurrentResourceVersion: false, hasNodePath: false, resourceType: ResourceTypeEnum.Assessment);
 
@@ -478,13 +478,13 @@ public async Task GetResourceReferencesByCertificatesReturnsCorrectInformation()
         {
 
             // Given
-            List<int> resourceIds = new List<int>() { 1,2 }; // Ids returned from activity
+            List<int> resourceIds = new List<int>() { 1, 2 }; // Ids returned from activity
 
             this.resourceRepository.Setup(rr => rr.GetResourceActivityPerResourceMajorVersion(It.IsAny<List<int>>(), It.IsAny<List<int>>()))
                 .ReturnsAsync(this.ResourceActivityDTOList);
 
             this.resourceRepository.Setup(rr => rr.GetResourceReferencesForAssessments(resourceIds))
-                .ReturnsAsync(ResourceReferenceList.GetRange(1,1));
+                .ReturnsAsync(ResourceReferenceList.GetRange(1, 1));
 
             // When
             var x = await this.resourceService.GetResourceReferencesForCertificates(currentUserId);
@@ -493,9 +493,29 @@ public async Task GetResourceReferencesByCertificatesReturnsCorrectInformation()
             x.Count().Should().Be(1); // ActivityStatus passed and resourceType Assessment
             x[0].ResourceId.Should().Be(1);
             x[0].UserSummaryActivityStatuses.Count().Should().Be(3); // return passed and all other major version statuses for this resource
-            x[0].UserSummaryActivityStatuses[0].Should().Be("Passed");
+            x[0].UserSummaryActivityStatuses[0].ActivityStatusDescription.Should().Be("Passed");
         }
 
-        // QQQQ EmptyList do it for nothing returned to check nulls and empty list
+        [Fact]
+        public async Task GetResourceReferencesByCompleteNoActivitySummaryFound()
+        {
+            // Given
+            List<int> resourceIds = new List<int>() { };
+            List<Resource> resources = this.ResourceList.GetRange(0, 0);
+
+            this.resourceRepository.Setup(rr => rr.GetResourceActivityPerResourceMajorVersion(It.IsAny<List<int>>(), It.IsAny<List<int>>()))
+                .ReturnsAsync(this.ResourceActivityDTOList.GetRange(8, 3));
+
+            this.resourceRepository.Setup(rr => rr.GetResourcesFromIds(resourceIds))
+                .ReturnsAsync(resources);
+
+            // When
+            var x = await this.resourceService.GetResourceReferenceByActivityStatus(new List<int>() { (int)ActivityStatusEnum.Completed }, currentUserId);
+
+            // Then
+
+            x.Count().Should().Be(0);
+
+        }
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs
index b42f70686..981dcf94f 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs
@@ -1,6 +1,7 @@
 namespace LearningHub.NHS.OpenAPI.Controllers
 {
     using System;
+    using System.Collections;
     using System.Collections.Generic;
     using System.Linq;
     using System.Net;
@@ -155,10 +156,27 @@ public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOrigina
         /// Get resourceReferences that have an in progress activity summary
         /// </summary>
         /// <returns>ResourceReferenceViewModels for matching resources.</returns>
+        [HttpGet("User/{activityStatusId}")]
+       
+        public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesByActivityStatus(int activityStatusId)
+        {
+            // These activity statuses are set with other activity statuses and resource type within the ActivityStatusHelper.GetActivityStatusDescription
+            // Note In progress is in complete in the db
+            List<int> activityStatusIdsNotInUseInDB = new List<int>() { (int)ActivityStatusEnum.Launched, (int)ActivityStatusEnum.InProgress, (int)ActivityStatusEnum.Viewed, (int)ActivityStatusEnum.Downloaded };
+            if (this.CurrentUserId == null) throw new UnauthorizedAccessException("User Id required.");
+            if (!Enum.IsDefined(typeof(ActivityStatusEnum), activityStatusId)) throw new ArgumentOutOfRangeException($"activityStatusId : {activityStatusId} does not exist within ActivityStatusEnum");
+            if (activityStatusIdsNotInUseInDB.Contains(activityStatusId)) throw new ArgumentOutOfRangeException($"activityStatusId: {activityStatusId} does not exist within the database definitions");
+
+            return await this.resourceService.GetResourceReferenceByActivityStatus(new List<int>() { activityStatusId }, this.CurrentUserId.Value);
+        }
+        /// <summary>
+        /// Get resourceReferences that have an in progress activity summary
+        /// </summary>
+        /// <returns>ResourceReferenceViewModels for matching resources.</returns>
         [HttpGet("User/InProgress")]
         public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesByInProgress()
         {
-            if (this.CurrentUserId == null) throw new UnauthorizedAccessException("User Id required");
+            if (this.CurrentUserId == null) throw new UnauthorizedAccessException("User Id required.");
 
             return await this.resourceService.GetResourceReferenceByActivityStatus(new List<int>(){ (int)ActivityStatusEnum.Incomplete}, this.CurrentUserId.Value);// In complete value is renamed in progress once leaves db
         }
@@ -169,7 +187,7 @@ public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResour
         [HttpGet("User/Complete")]
         public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesByComplete()
         {
-            if (this.CurrentUserId == null) throw new UnauthorizedAccessException("User Id required");
+            if (this.CurrentUserId == null) throw new UnauthorizedAccessException("User Id required.");
 
             return await this.resourceService.GetResourceReferenceByActivityStatus(new List<int>() { (int)ActivityStatusEnum.Completed }, this.CurrentUserId.Value);// Complete can be renamed to viewed etc
         }
@@ -181,7 +199,7 @@ public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResour
         [HttpGet("User/Certificates")]
         public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesByCertificates()
         {
-            if (this.CurrentUserId == null) throw new UnauthorizedAccessException("User Id required");
+            if (this.CurrentUserId == null) throw new UnauthorizedAccessException("User Id required.");
 
             return await this.resourceService.GetResourceReferencesForCertificates(this.CurrentUserId.Value);
         }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/SwaggerDefinitions/v1.3.0.json b/OpenAPI/LearningHub.Nhs.OpenApi/SwaggerDefinitions/v1.3.0.json
index d77f6b823..e7644d565 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/SwaggerDefinitions/v1.3.0.json
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/SwaggerDefinitions/v1.3.0.json
@@ -295,6 +295,52 @@
           }
         }
       }
+    },
+    "/Resource/ActivityStatus/{activityStatusId}": {
+      "get": {
+        "tags": [ "Resource" ],
+        "summary": "Get resource references by activity status",
+        "operationId": "GetResourceReferencesByActivityStatus",
+        "parameters": [
+          {
+            "name": "activityStatusId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "description": "The activity status Id to filter resource references. Valid values are Completed 3 (returned as Completed/Downloaded/Launched/Viewed), Incomplete 7 (returned as In progress), Passed 5, Failed 4."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ResourceReferenceWithResourceDetailsViewModel"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad request: The activityStatusId provided is not valid."
+          },
+          "401": {
+            "description": "Unauthorized: User Id required."
+          },
+          "403": {
+            "description": "Forbidden: The activityStatusId is not defined within ActivityStatusEnum or is in the list of activityStatusIdsNotInUseInDB."
+          },
+          "500": {
+            "description": "Internal server error: An unexpected error occurred while processing the request."
+          }
+        }
+      }
     }
   },
   "components": {
diff --git a/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs b/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
index 6f2fb8985..65b4acdba 100644
--- a/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
@@ -168,7 +168,7 @@ public async Task<Tuple<int, MyLearningDetailedItemViewModel>> GetResourceCertif
             var activityEntities = await activityQuery.OrderByDescending(x => x.Score).ThenByDescending(x => x.ActivityStart).ToListAsync();
             activityEntities.RemoveAll(x => x.Resource.ResourceTypeEnum == ResourceTypeEnum.Scorm && (x.ActivityStatusId == (int)ActivityStatusEnum.Downloaded || x.ActivityStatusId == (int)ActivityStatusEnum.Incomplete || x.ActivityStatusId == (int)ActivityStatusEnum.InProgress));
             if (activityEntities.Any() && activityEntities.FirstOrDefault()?.Resource.ResourceTypeEnum == ResourceTypeEnum.Assessment)
-            { // qqqq 
+            {
                 totalNumberOfAccess = activityQuery.SelectMany(x => x.AssessmentResourceActivity).OrderByDescending(a => a.CreateDate).ToList().Count();
                 activityEntities = activityEntities.Where(x => x.AssessmentResourceActivity.FirstOrDefault() != null && x.AssessmentResourceActivity.FirstOrDefault().Score.HasValue && ((int)Math.Round(x.AssessmentResourceActivity.FirstOrDefault().Score.Value, MidpointRounding.AwayFromZero) >= x.ResourceVersion.AssessmentResourceVersion.PassMark)).ToList();
             }

From 1a9365257c6755b85d251b68dbd9d0169420be41 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Thu, 11 Jul 2024 13:35:57 +0100
Subject: [PATCH 022/143] Stored procedures
 GetAcheivedCertificateResourcesWithOptionalPagination

---
 .../Controllers/ResourceController.cs         |   2 +-
 .../Repositories/IResourceRepository.cs       |   6 +-
 .../Repositories/ResourceRepository.cs        |  29 ++++-
 .../Services/ResourceService.cs               |  47 +++++--
 ...ficatedResourcesWithOptionalPagination.sql | 117 ++++++++++++++++++
 .../Resources/GetDashboardResources.sql       |  76 +-----------
 6 files changed, 186 insertions(+), 91 deletions(-)
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAcheivedCetificatedResourcesWithOptionalPagination.sql

diff --git a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
index cf674fab5..972135167 100644
--- a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
@@ -192,7 +192,7 @@ public async Task<IActionResult> Index(int resourceReferenceId, bool? acceptSens
                 await this.activityService.CreateResourceActivityAsync(activity);
             }
 
-            // Get node path data for breadcrumbs.
+            // Get node path data for breadcrumbs. //qqqqq
             var nodePathNodes = await this.hierarchyService.GetNodePathNodes(resource.NodePathId);
             bool userHasCertificate = false;
             if (resource.CertificateEnabled.GetValueOrDefault(false) && this.User.Identity.IsAuthenticated)
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs
index d0294a8a6..2973a0c5c 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs
@@ -40,6 +40,10 @@ public Task<IEnumerable<ResourceReference>> GetResourceReferencesByOriginalResou
         /// <returns>ResourceActivityDTO.</returns>
         public Task<IEnumerable<ResourceReference>> GetResourceReferencesForAssessments(List<int> resourceIds);
 
-
+        /// <summary>
+        /// GetAcheivedCertificatedResourceIds
+        /// </summary>
+        /// <param name="currentUserId"><see cref="currentUserId"/>.</param>
+        public Task<List<int>> GetAcheivedCertificatedResourceIds(int currentUserId);
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
index 7669d754c..33803d2f2 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
@@ -2,8 +2,12 @@ namespace LearningHub.Nhs.OpenApi.Repositories.Repositories
 {
     using System;
     using System.Collections.Generic;
+    using System.ComponentModel;
+    using System.Data;
     using System.Linq;
     using System.Threading.Tasks;
+    using LearningHub.Nhs.Models.Dashboard;
+    using LearningHub.Nhs.Models.Entities;
     using LearningHub.Nhs.Models.Entities.Activity;
     using LearningHub.Nhs.Models.Entities.Resource;
     using LearningHub.Nhs.OpenApi.Repositories.EntityFramework;
@@ -73,7 +77,7 @@ public async Task<IEnumerable<ResourceReference>> GetResourceReferencesByOrigina
                 .ToListAsync();
         }
 
-        public async Task<IEnumerable<ResourceReference>> GetResourceReferencesForAssessments(List<int> resourceIds)
+        public async Task<IEnumerable<ResourceReference>> GetResourceReferencesForAssessments(List<int> resourceIds)// qqqq no more complex
         {
 
             return await this.dbContext.ResourceReference
@@ -91,16 +95,33 @@ public async Task<IEnumerable<ResourceReference>> GetResourceReferencesForAssess
                 .ToListAsync();
         }
 
+        public async Task<List<int>> GetAcheivedCertificatedResourceIds(int currentUserId) //qqqqq
+        {
+            // Use dashboard logic to ensure same resources determined has having acheived certificates
+            var param0 = new SqlParameter("@dashboardType", SqlDbType.NVarChar, 30) { Value = "my-certificates" };
+            var param1 = new SqlParameter("@userId", SqlDbType.Int) { Value = currentUserId };
+            var param2 = new SqlParameter("@pageNumber", SqlDbType.Int) { Value = 1 };
+            var param3 = new SqlParameter("@totalRows", SqlDbType.Int) { Direction = ParameterDirection.Output };
+
+            // qqqq originalResourceId instead?
+
+            // qqqq pagination so cant use this for that
+            var result = this.dbContext.DashboardResourceDto.FromSqlRaw("resources.GetDashboardResources @dashboardType, @userId, @pageNumber, @totalRows output", param0, param1, param2, param3).ToList();
+            List<int> acheivedCertificatedResourceIds = result.Select(drd => drd.ResourceId).Distinct().ToList<int>();
+
+            return acheivedCertificatedResourceIds;
+        }
+
         /// </summary>
         /// <param name="resourceReferenceIds"></param>
         /// <param name="userIds"></param>
         /// <param name="originalResourceReferenceIds">.</param>
         /// <returns>A <see cref="Task{ResourceReference}"/> representing the result of the asynchronous operation.</returns>
         public async Task<IEnumerable<ResourceActivityDTO>> GetResourceActivityPerResourceMajorVersion(
-          IEnumerable<int>? resourceReferenceIds, IEnumerable<int>? userIds)
+          IEnumerable<int>? resourceIds, IEnumerable<int>? userIds)
         {
-            var resourceIdsParam = resourceReferenceIds != null
-                ? string.Join(",", resourceReferenceIds)
+            var resourceIdsParam = resourceIds != null
+                ? string.Join(",", resourceIds)
                 : null;
 
             var userIdsParam = userIds != null
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
index 6c9d703ec..b1e83e0ee 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
@@ -163,27 +163,48 @@ public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResour
         /// <returns>list resource reference ViewModel.</returns>
         public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesForCertificates(int currentUserId)
         {
-            //qqqq can some of this go into a helper
-            List<int> activityStatusesForCertificates = new List<int>() { (int)ActivityStatusEnum.Completed, (int)ActivityStatusEnum.Passed }; // qqqq maybe drop completed
+
             List<ResourceActivityDTO> resourceActivities = new List<ResourceActivityDTO>() { };
             List<ResourceReferenceWithResourceDetailsViewModel> ResourceReferenceWithResourceDetailsViewModelLS = new List<ResourceReferenceWithResourceDetailsViewModel>() { };
+            List<int> acheivedCertificatedResourceIds = (await this.resourceRepository.GetAcheivedCertificatedResourceIds(currentUserId));
 
-            resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(new List<int>() { }, new List<int>() { currentUserId }))?.ToList() ?? new List<ResourceActivityDTO>() { };
-
-            // Removing resources that have no major versions with the required activitystatus
-            List<int> resourceIds = resourceActivities
-                .GroupBy(ra => ra.ResourceId)
-                .Where(group => group.Any(g => activityStatusesForCertificates.Contains(g.ActivityStatusId)))
-                .Select(group => group.Key)
-                .Distinct()
-                .ToList();
+            resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(acheivedCertificatedResourceIds, new List<int>() { currentUserId }))?.ToList() ?? new List<ResourceActivityDTO>() { };
 
-            var resourceReferencesList = (await this.resourceRepository.GetResourceReferencesForAssessments(resourceIds)).ToList();
+            var resourceList = (await this.resourceRepository.GetResourcesFromIds(acheivedCertificatedResourceIds)).ToList();
 
-            ResourceReferenceWithResourceDetailsViewModelLS = resourceReferencesList.Select(rr => this.GetResourceReferenceWithResourceDetailsViewModel(rr, resourceActivities)).ToList();
+            //qqqq check this can return empty list of resourceActivity where there isnt any
+            //because we return resourceActivity but things are certified on other things could have strange looking results
+            ResourceReferenceWithResourceDetailsViewModelLS = resourceList.SelectMany(r => r.ResourceReference)
+                .Distinct()
+                .Select(rr => this.GetResourceReferenceWithResourceDetailsViewModel(rr, resourceActivities)).ToList();
 
             return ResourceReferenceWithResourceDetailsViewModelLS;
         }
+        // qqqq original
+        //public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesForCertificates(int currentUserId)
+        //{
+        //    // GetAcheivedCertificatedResourceIds
+        //    //qqqq can some of this go into a helper
+        //    List<int> activityStatusesForCertificates = new List<int>() { (int)ActivityStatusEnum.Completed, (int)ActivityStatusEnum.Passed }; // qqqq maybe drop completed
+        //    List<ResourceActivityDTO> resourceActivities = new List<ResourceActivityDTO>() { };
+        //    List<ResourceReferenceWithResourceDetailsViewModel> ResourceReferenceWithResourceDetailsViewModelLS = new List<ResourceReferenceWithResourceDetailsViewModel>() { };
+
+        //    resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(new List<int>() { }, new List<int>() { currentUserId }))?.ToList() ?? new List<ResourceActivityDTO>() { };
+
+        //    // Removing resources that have no major versions with the required activitystatus
+        //    List<int> resourceIds = resourceActivities
+        //        .GroupBy(ra => ra.ResourceId)
+        //        .Where(group => group.Any(g => activityStatusesForCertificates.Contains(g.ActivityStatusId)))
+        //        .Select(group => group.Key)
+        //        .Distinct()
+        //        .ToList();
+
+        //    var resourceReferencesList = (await this.resourceRepository.GetResourceReferencesForAssessments(resourceIds)).ToList();
+
+        //    ResourceReferenceWithResourceDetailsViewModelLS = resourceReferencesList.Select(rr => this.GetResourceReferenceWithResourceDetailsViewModel(rr, resourceActivities)).ToList();
+
+        //    return ResourceReferenceWithResourceDetailsViewModelLS;
+        //}
 
         private ResourceReferenceWithResourceDetailsViewModel GetResourceReferenceWithResourceDetailsViewModel(ResourceReference resourceReference, List<ResourceActivityDTO> resourceActivities)
         {
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAcheivedCetificatedResourcesWithOptionalPagination.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAcheivedCetificatedResourcesWithOptionalPagination.sql
new file mode 100644
index 000000000..ecc34e35f
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAcheivedCetificatedResourcesWithOptionalPagination.sql	
@@ -0,0 +1,117 @@
+
+-------------------------------------------------------------------------------
+-- Author       PT
+-- Created      11 July 2024
+-- Purpose      Get acheived certificated resources with optional pagination
+-- Description  Extracted from the GetDashboardResources sproc to enable one source of truth for determining acheived certificated resources
+--              To support the GetDashboardResources it has pagination and to support other requests the default values disable pagination effects
+-------------------------------------------------------------------------------
+
+
+CREATE PROCEDURE [resources].[GetAcheivedCertficatedResourcesWithOptionalPagination]
+    @UserId INT,
+
+	-- Default values disable pagination
+    @MaxRows INT = 2147483647,  -- Warning! Magic number. To disable pagination by default.
+    @OffsetRows INT = 0,
+    @FetchRows INT = 2147483647, -- Warning! Magic number. To disable pagination by default.
+
+    @TotalRecords INT OUTPUT
+AS
+BEGIN
+
+    -- Step 1: Create a table variable to store intermediate results
+    DECLARE @MyActivity TABLE (
+        ResourceId INT,
+        ResourceActivityId INT
+    );
+
+		INSERT INTO @MyActivity					
+			SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
+				FROM
+				/* resources with resource activity, resource activity determines if certificated*/
+				activity.ResourceActivity ra				
+				JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
+				JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
+
+				/* Determining if certificated scorm, assessment mark, media*/
+				LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
+				LEFT JOIN [activity].[AssessmentResourceActivity] ara ON ara.ResourceActivityId = ra.Id
+				LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = ra.Id
+				LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
+
+				WHERE ra.UserId = @UserId AND rv.CertificateEnabled = 1  -- detemining if certificated	
+				AND (					
+					 (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId IN (3) /* resourceType 2 Audio and 7 is video activityStatusId 3 is completed */
+						OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00' /* old activity assumed to be valid*/
+						OR mar.Id IS NOT NULL AND mar.PercentComplete = 100  /* media activity 100% complete*/
+					)
+					/* type 6 scorm elearning,*/
+					OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status IN(3,5) OR (ra.ActivityStatusId IN(3, 5))))  /* activityStatus 3 and 5 are completed and passed */
+					/* 11 is assessment */
+					OR (r.ResourceTypeId = 11 AND ara.Score >= arv.PassMark OR ra.ActivityStatusId IN(3, 5)) /*assessment mark and activity status passed completed */
+					/* 1 Article, 5 Image, 8 Weblink 9 file, 10 case, 12 html */
+					OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId IN (3))) 	/* Completed */			
+				GROUP BY ra.ResourceId
+				ORDER BY ResourceActivityId DESC
+
+			SELECT r.Id AS ResourceId
+			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+				) AS ResourceReferenceID
+			,r.CurrentResourceVersionId AS ResourceVersionId
+			,r.ResourceTypeId AS ResourceTypeId
+			,rv.Title
+			,rv.Description
+			,CASE 
+				WHEN r.ResourceTypeId = 7	THEN				 
+				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				WHEN r.ResourceTypeId = 2	THEN				 
+				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				ELSE 
+				NULL
+				END  AS DurationInMilliseconds
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+			,cnv.Url AS Url
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+			,cnv.RestrictedAccess
+			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+			,ub.Id AS BookMarkId
+			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+			,rs.AverageRating
+			,rs.RatingCount
+		FROM @MyActivity ma 		
+		JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
+		JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0	
+		JOIN Resources.Resource r ON r.Id = rv.ResourceId
+		JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+		JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+		
+		/* Catalogue logic */
+		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+
+		/* Book marks */
+		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+		LEFT JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id			
+		ORDER BY ma.ResourceActivityId DESC, rv.Title
+
+		/* pagination logic */
+		OFFSET @OffsetRows ROWS
+		FETCH NEXT @FetchRows ROWS ONLY	
+		SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
+		
+	END
+
+
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql
index 0a5da6e56..3638d61d7 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql	
@@ -19,6 +19,7 @@
 -- 27 Feb 2024  SS  Fixed missing In progress resources in the My Accessed Learning tray issue
 -- 2 May 2024   SA  Fixed the issue on showing statuses on 'My accessed Learning' for resource type file
 -- 13 May 2024  SA  TD-4115
+-- 11 Jul 2024  PT  Extract certification logic to GetAcheivedCertficatedResourcesWithOptionalPagination so logic can have one source of truth
 -------------------------------------------------------------------------------
 
 CREATE PROCEDURE [resources].[GetDashboardResources]
@@ -372,76 +373,7 @@ BEGIN
 	END
 	ELSE IF  @dashboardType IN ('my-certificates')
 	BEGIN
-		INSERT INTO @MyActivity					
-			SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
-				FROM
-				activity.ResourceActivity ra				
-				JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
-				JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
-				LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
-				LEFT JOIN [activity].[AssessmentResourceActivity] ara ON ara.ResourceActivityId = ra.Id
-				LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = ra.Id
-				LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
-				WHERE ra.UserId = @UserId AND rv.CertificateEnabled = 1
-				AND (					
-					 (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId IN (3) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00' OR mar.Id IS NOT NULL AND mar.PercentComplete = 100)
-					OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status IN(3,5) OR (ra.ActivityStatusId IN(3, 5))))
-					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 2) AND (ara.Score >= arv.PassMark OR ra.ActivityStatusId IN(3, 5)))
-					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType =1) AND (ara.Score >= arv.PassMark AND ra.ActivityStatusId IN(3, 5,7)))
-					OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId = 3))		
-				GROUP BY ra.ResourceId
-				ORDER BY ResourceActivityId DESC
-
-			SELECT r.Id AS ResourceId
-			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
-				FROM [resources].[ResourceReference] rr
-				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
-				) AS ResourceReferenceID
-			,r.CurrentResourceVersionId AS ResourceVersionId
-			,r.ResourceTypeId AS ResourceTypeId
-			,rv.Title
-			,rv.Description
-			,CASE 
-				WHEN r.ResourceTypeId = 7	THEN				 
-				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-				WHEN r.ResourceTypeId = 2	THEN				 
-				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-				ELSE 
-				NULL
-				END  AS DurationInMilliseconds
-			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
-			,cnv.Url AS Url
-			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
-			,cnv.RestrictedAccess
-			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
-			,ub.Id AS BookMarkId
-			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
-			,rs.AverageRating
-			,rs.RatingCount
-		FROM @MyActivity ma 		
-		JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
-		JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0	
-		JOIN Resources.Resource r ON r.Id = rv.ResourceId
-		JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
-		JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
-		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
-		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
-		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
-		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
-		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
-		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
-				FROM [resources].[ResourceReference] rr
-				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
-		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
-						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
-						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
-		LEFT JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id			
-		ORDER BY ma.ResourceActivityId DESC, rv.Title
-		OFFSET @OffsetRows ROWS
-		FETCH NEXT @FetchRows ROWS ONLY	
-
-		SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
-	END	
+		EXEC [resources].[GetAcheivedCertficatedResourcesWithOptionalPagination] @UserId = @UserId, @MaxRows= @MaxRows, @OffsetRows = @OffsetRows, @FetchRows = @FetchRows, @TotalRecords = @TotalRecords;
+	END
+	
 END
\ No newline at end of file

From 02cc3242573acdd3eea42b3c43cde4eb50019176 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Thu, 11 Jul 2024 13:47:28 +0100
Subject: [PATCH 023/143] typo

---
 .../Repositories/IResourceRepository.cs          |  4 ++--
 .../Repositories/ResourceRepository.cs           | 16 +++++++---------
 .../Services/ResourceService.cs                  |  8 ++++----
 .../LearningHub.Nhs.Database.sqlproj             |  1 +
 ...tificatedResourcesWithOptionalPagination.sql} |  6 +++---
 .../Resources/GetDashboardResources.sql          |  4 ++--
 6 files changed, 19 insertions(+), 20 deletions(-)
 rename WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/{GetAcheivedCetificatedResourcesWithOptionalPagination.sql => GetAchievedCertificatedResourcesWithOptionalPagination.sql} (96%)

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs
index 2973a0c5c..8e5678daa 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs
@@ -41,9 +41,9 @@ public Task<IEnumerable<ResourceReference>> GetResourceReferencesByOriginalResou
         public Task<IEnumerable<ResourceReference>> GetResourceReferencesForAssessments(List<int> resourceIds);
 
         /// <summary>
-        /// GetAcheivedCertificatedResourceIds
+        /// GetAchievedCertificatedResourceIds
         /// </summary>
         /// <param name="currentUserId"><see cref="currentUserId"/>.</param>
-        public Task<List<int>> GetAcheivedCertificatedResourceIds(int currentUserId);
+        public Task<List<int>> GetAchievedCertificatedResourceIds(int currentUserId);
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
index 33803d2f2..cd9f6461f 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
@@ -95,21 +95,19 @@ public async Task<IEnumerable<ResourceReference>> GetResourceReferencesForAssess
                 .ToListAsync();
         }
 
-        public async Task<List<int>> GetAcheivedCertificatedResourceIds(int currentUserId) //qqqqq
+        public async Task<List<int>> GetAchievedCertificatedResourceIds(int currentUserId) //qqqqq
         {
-            // Use dashboard logic to ensure same resources determined has having acheived certificates
-            var param0 = new SqlParameter("@dashboardType", SqlDbType.NVarChar, 30) { Value = "my-certificates" };
-            var param1 = new SqlParameter("@userId", SqlDbType.Int) { Value = currentUserId };
-            var param2 = new SqlParameter("@pageNumber", SqlDbType.Int) { Value = 1 };
-            var param3 = new SqlParameter("@totalRows", SqlDbType.Int) { Direction = ParameterDirection.Output };
+            // Use dashboard logic to ensure same resources determined has having achieved certificates
+            var param0 = new SqlParameter("@userId", SqlDbType.Int) { Value = currentUserId };
+            var param1 = new SqlParameter("@totalRows", SqlDbType.Int) { Direction = ParameterDirection.Output };
 
             // qqqq originalResourceId instead?
 
             // qqqq pagination so cant use this for that
-            var result = this.dbContext.DashboardResourceDto.FromSqlRaw("resources.GetDashboardResources @dashboardType, @userId, @pageNumber, @totalRows output", param0, param1, param2, param3).ToList();
-            List<int> acheivedCertificatedResourceIds = result.Select(drd => drd.ResourceId).Distinct().ToList<int>();
+            var result = this.dbContext.DashboardResourceDto.FromSqlRaw("resources.GetAchieved @userId, @totalRows output", param0, param1).ToList();
+            List<int> achievedCertificatedResourceIds = result.Select(drd => drd.ResourceId).Distinct().ToList<int>();
 
-            return acheivedCertificatedResourceIds;
+            return achievedCertificatedResourceIds;
         }
 
         /// </summary>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
index b1e83e0ee..f816d1154 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
@@ -166,11 +166,11 @@ public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResour
 
             List<ResourceActivityDTO> resourceActivities = new List<ResourceActivityDTO>() { };
             List<ResourceReferenceWithResourceDetailsViewModel> ResourceReferenceWithResourceDetailsViewModelLS = new List<ResourceReferenceWithResourceDetailsViewModel>() { };
-            List<int> acheivedCertificatedResourceIds = (await this.resourceRepository.GetAcheivedCertificatedResourceIds(currentUserId));
+            List<int> achievedCertificatedResourceIds = (await this.resourceRepository.GetAchievedCertificatedResourceIds(currentUserId));
 
-            resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(acheivedCertificatedResourceIds, new List<int>() { currentUserId }))?.ToList() ?? new List<ResourceActivityDTO>() { };
+            resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(achievedCertificatedResourceIds, new List<int>() { currentUserId }))?.ToList() ?? new List<ResourceActivityDTO>() { };
 
-            var resourceList = (await this.resourceRepository.GetResourcesFromIds(acheivedCertificatedResourceIds)).ToList();
+            var resourceList = (await this.resourceRepository.GetResourcesFromIds(achievedCertificatedResourceIds)).ToList();
 
             //qqqq check this can return empty list of resourceActivity where there isnt any
             //because we return resourceActivity but things are certified on other things could have strange looking results
@@ -183,7 +183,7 @@ public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResour
         // qqqq original
         //public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesForCertificates(int currentUserId)
         //{
-        //    // GetAcheivedCertificatedResourceIds
+        //    // GetAchievedCertificatedResourceIds
         //    //qqqq can some of this go into a helper
         //    List<int> activityStatusesForCertificates = new List<int>() { (int)ActivityStatusEnum.Completed, (int)ActivityStatusEnum.Passed }; // qqqq maybe drop completed
         //    List<ResourceActivityDTO> resourceActivities = new List<ResourceActivityDTO>() { };
diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
index ee9f4c0ad..92d92e836 100644
--- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
+++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
@@ -516,6 +516,7 @@
     <Build Include="Stored Procedures\Resources\BlockCollectionFileSearch.sql" />
     <None Include="Scripts\Post-Deploy\Scripts\TD-4031_AMStoMKIOMigration.sql" />
     <Build Include="Stored Procedures\Activity\GetResourceActivityPerResourceMajorVersion.sql" />
+    <Build Include="Stored Procedures\Resources\GetAchievedCertificatedResourcesWithOptionalPagination.sql" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAcheivedCetificatedResourcesWithOptionalPagination.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAchievedCertificatedResourcesWithOptionalPagination.sql
similarity index 96%
rename from WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAcheivedCetificatedResourcesWithOptionalPagination.sql
rename to WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAchievedCertificatedResourcesWithOptionalPagination.sql
index ecc34e35f..aa7cb9fbf 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAcheivedCetificatedResourcesWithOptionalPagination.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAchievedCertificatedResourcesWithOptionalPagination.sql	
@@ -2,13 +2,13 @@
 -------------------------------------------------------------------------------
 -- Author       PT
 -- Created      11 July 2024
--- Purpose      Get acheived certificated resources with optional pagination
--- Description  Extracted from the GetDashboardResources sproc to enable one source of truth for determining acheived certificated resources
+-- Purpose      Get achieved certificated resources with optional pagination
+-- Description  Extracted from the GetDashboardResources sproc to enable one source of truth for determining achieved certificated resources
 --              To support the GetDashboardResources it has pagination and to support other requests the default values disable pagination effects
 -------------------------------------------------------------------------------
 
 
-CREATE PROCEDURE [resources].[GetAcheivedCertficatedResourcesWithOptionalPagination]
+CREATE PROCEDURE [resources].[GetAchievedCertficatedResourcesWithOptionalPagination]
     @UserId INT,
 
 	-- Default values disable pagination
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql
index 3638d61d7..cb36b7c14 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql	
@@ -19,7 +19,7 @@
 -- 27 Feb 2024  SS  Fixed missing In progress resources in the My Accessed Learning tray issue
 -- 2 May 2024   SA  Fixed the issue on showing statuses on 'My accessed Learning' for resource type file
 -- 13 May 2024  SA  TD-4115
--- 11 Jul 2024  PT  Extract certification logic to GetAcheivedCertficatedResourcesWithOptionalPagination so logic can have one source of truth
+-- 11 Jul 2024  PT  Extract certification logic to GetAchievedCertficatedResourcesWithOptionalPagination so logic can have one source of truth
 -------------------------------------------------------------------------------
 
 CREATE PROCEDURE [resources].[GetDashboardResources]
@@ -373,7 +373,7 @@ BEGIN
 	END
 	ELSE IF  @dashboardType IN ('my-certificates')
 	BEGIN
-		EXEC [resources].[GetAcheivedCertficatedResourcesWithOptionalPagination] @UserId = @UserId, @MaxRows= @MaxRows, @OffsetRows = @OffsetRows, @FetchRows = @FetchRows, @TotalRecords = @TotalRecords;
+		EXEC [resources].[GetAchievedCertficatedResourcesWithOptionalPagination] @UserId = @UserId, @MaxRows= @MaxRows, @OffsetRows = @OffsetRows, @FetchRows = @FetchRows, @TotalRecords = @TotalRecords;
 	END
 	
 END
\ No newline at end of file

From 1138be9ffe5222d692e24623bad01c02166286c3 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Thu, 11 Jul 2024 14:58:03 +0100
Subject: [PATCH 024/143] spelling stored proc

---
 .../Repositories/ResourceRepository.cs                      | 6 ++----
 .../Controllers/ResourceControllerTests.cs                  | 2 +-
 ...tAchievedCertificatedResourcesWithOptionalPagination.sql | 6 +++---
 .../Stored Procedures/Resources/GetDashboardResources.sql   | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
index cd9f6461f..a96313bdf 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
@@ -99,12 +99,10 @@ public async Task<List<int>> GetAchievedCertificatedResourceIds(int currentUserI
         {
             // Use dashboard logic to ensure same resources determined has having achieved certificates
             var param0 = new SqlParameter("@userId", SqlDbType.Int) { Value = currentUserId };
-            var param1 = new SqlParameter("@totalRows", SqlDbType.Int) { Direction = ParameterDirection.Output };
-
-            // qqqq originalResourceId instead?
+            var param4 = new SqlParameter("@TotalRecords", SqlDbType.Int) { Direction = ParameterDirection.Output };
 
             // qqqq pagination so cant use this for that
-            var result = this.dbContext.DashboardResourceDto.FromSqlRaw("resources.GetAchieved @userId, @totalRows output", param0, param1).ToList();
+            var result = this.dbContext.DashboardResourceDto.FromSqlRaw("resources.GetAchievedCertificatedResourcesWithOptionalPagination @userId = @userId, @TotalRecords = @TotalRecords output", param0, param4).ToList();
             List<int> achievedCertificatedResourceIds = result.Select(drd => drd.ResourceId).Distinct().ToList<int>();
 
             return achievedCertificatedResourceIds;
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs
index 92ffa59a5..60a5c6600 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs
@@ -266,7 +266,7 @@ public async Task GetResourceReferencesByInProgressThrowsErrorWhenNoUserId()
         }
 
         [Fact]
-        public async Task GetResourceReferencesByCertficatesThrowsErrorWhenNoUserId()
+        public async Task GetResourceReferencesBycertificatesThrowsErrorWhenNoUserId()
         {
             // When
             var exception = await Assert.ThrowsAsync<UnauthorizedAccessException>(async () =>
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAchievedCertificatedResourcesWithOptionalPagination.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAchievedCertificatedResourcesWithOptionalPagination.sql
index aa7cb9fbf..568fbc440 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAchievedCertificatedResourcesWithOptionalPagination.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAchievedCertificatedResourcesWithOptionalPagination.sql	
@@ -8,7 +8,7 @@
 -------------------------------------------------------------------------------
 
 
-CREATE PROCEDURE [resources].[GetAchievedCertficatedResourcesWithOptionalPagination]
+CREATE PROCEDURE [resources].[GetAchievedcertificatedResourcesWithOptionalPagination]
     @UserId INT,
 
 	-- Default values disable pagination
@@ -111,7 +111,7 @@ BEGIN
 		OFFSET @OffsetRows ROWS
 		FETCH NEXT @FetchRows ROWS ONLY	
 		SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
-		
-	END
+	END;
+GO
 
 
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql
index cb36b7c14..7b8c36029 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetDashboardResources.sql	
@@ -19,7 +19,7 @@
 -- 27 Feb 2024  SS  Fixed missing In progress resources in the My Accessed Learning tray issue
 -- 2 May 2024   SA  Fixed the issue on showing statuses on 'My accessed Learning' for resource type file
 -- 13 May 2024  SA  TD-4115
--- 11 Jul 2024  PT  Extract certification logic to GetAchievedCertficatedResourcesWithOptionalPagination so logic can have one source of truth
+-- 11 Jul 2024  PT  Extract certification logic to GetAchievedcertificatedResourcesWithOptionalPagination so logic can have one source of truth
 -------------------------------------------------------------------------------
 
 CREATE PROCEDURE [resources].[GetDashboardResources]
@@ -373,7 +373,7 @@ BEGIN
 	END
 	ELSE IF  @dashboardType IN ('my-certificates')
 	BEGIN
-		EXEC [resources].[GetAchievedCertficatedResourcesWithOptionalPagination] @UserId = @UserId, @MaxRows= @MaxRows, @OffsetRows = @OffsetRows, @FetchRows = @FetchRows, @TotalRecords = @TotalRecords;
+		EXEC [resources].[GetAchievedcertificatedResourcesWithOptionalPagination] @UserId = @UserId, @MaxRows= @MaxRows, @OffsetRows = @OffsetRows, @FetchRows = @FetchRows, @TotalRecords = @TotalRecords;
 	END
 	
 END
\ No newline at end of file

From 70ad3a7c5c73d9174c9d9e2a306740394ad6e534 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Thu, 11 Jul 2024 15:04:11 +0100
Subject: [PATCH 025/143] Remove unneeded end points

---
 .../Controllers/ResourceController.cs         |  2 +-
 .../Repositories/IResourceRepository.cs       |  7 ------
 .../Repositories/ResourceRepository.cs        | 21 +---------------
 .../Services/ResourceService.cs               | 25 -------------------
 .../Controllers/ResourceController.cs         | 25 -------------------
 5 files changed, 2 insertions(+), 78 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
index 972135167..cf674fab5 100644
--- a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
@@ -192,7 +192,7 @@ public async Task<IActionResult> Index(int resourceReferenceId, bool? acceptSens
                 await this.activityService.CreateResourceActivityAsync(activity);
             }
 
-            // Get node path data for breadcrumbs. //qqqqq
+            // Get node path data for breadcrumbs.
             var nodePathNodes = await this.hierarchyService.GetNodePathNodes(resource.NodePathId);
             bool userHasCertificate = false;
             if (resource.CertificateEnabled.GetValueOrDefault(false) && this.User.Identity.IsAuthenticated)
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs
index 8e5678daa..52b3dee08 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/Repositories/IResourceRepository.cs
@@ -33,13 +33,6 @@ public Task<IEnumerable<ResourceReference>> GetResourceReferencesByOriginalResou
         /// <returns>ResourceActivityDTO.</returns>
         Task<IEnumerable<ResourceActivityDTO>> GetResourceActivityPerResourceMajorVersion(IEnumerable<int>? resourceReferenceIds, IEnumerable<int>? userIds);
 
-        /// <summary>
-        /// GetResourceReferencesForAssessments
-        /// </summary>
-        /// <param name="resourceIds"><see cref="resourceIds"/>.</param>
-        /// <returns>ResourceActivityDTO.</returns>
-        public Task<IEnumerable<ResourceReference>> GetResourceReferencesForAssessments(List<int> resourceIds);
-
         /// <summary>
         /// GetAchievedCertificatedResourceIds
         /// </summary>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
index a96313bdf..e9e0dfdd3 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
@@ -77,31 +77,12 @@ public async Task<IEnumerable<ResourceReference>> GetResourceReferencesByOrigina
                 .ToListAsync();
         }
 
-        public async Task<IEnumerable<ResourceReference>> GetResourceReferencesForAssessments(List<int> resourceIds)// qqqq no more complex
-        {
-
-            return await this.dbContext.ResourceReference
-                .Where(rr => resourceIds.Contains(rr.ResourceId))
-                .Where(rr => !rr.Deleted)
-                .Where(rr => (int)rr.NodePath.Node.NodeTypeEnum != 4)
-                .Include(rr => rr.NodePath)
-                .ThenInclude(np => np.CatalogueNode)
-                .ThenInclude(n => n.CurrentNodeVersion)
-                .ThenInclude(n => n.CatalogueNodeVersion)
-                .Include(rr => rr.Resource)
-                .ThenInclude(r => r.CurrentResourceVersion)
-                .ThenInclude(r => r.ResourceVersionRatingSummary)
-                .Where(r => r.Resource.ResourceTypeEnum == Nhs.Models.Enums.ResourceTypeEnum.Assessment)
-                .ToListAsync();
-        }
-
-        public async Task<List<int>> GetAchievedCertificatedResourceIds(int currentUserId) //qqqqq
+        public async Task<List<int>> GetAchievedCertificatedResourceIds(int currentUserId)
         {
             // Use dashboard logic to ensure same resources determined has having achieved certificates
             var param0 = new SqlParameter("@userId", SqlDbType.Int) { Value = currentUserId };
             var param4 = new SqlParameter("@TotalRecords", SqlDbType.Int) { Direction = ParameterDirection.Output };
 
-            // qqqq pagination so cant use this for that
             var result = this.dbContext.DashboardResourceDto.FromSqlRaw("resources.GetAchievedCertificatedResourcesWithOptionalPagination @userId = @userId, @TotalRecords = @TotalRecords output", param0, param4).ToList();
             List<int> achievedCertificatedResourceIds = result.Select(drd => drd.ResourceId).Distinct().ToList<int>();
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
index f816d1154..4f94f3257 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
@@ -180,31 +180,6 @@ public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResour
 
             return ResourceReferenceWithResourceDetailsViewModelLS;
         }
-        // qqqq original
-        //public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesForCertificates(int currentUserId)
-        //{
-        //    // GetAchievedCertificatedResourceIds
-        //    //qqqq can some of this go into a helper
-        //    List<int> activityStatusesForCertificates = new List<int>() { (int)ActivityStatusEnum.Completed, (int)ActivityStatusEnum.Passed }; // qqqq maybe drop completed
-        //    List<ResourceActivityDTO> resourceActivities = new List<ResourceActivityDTO>() { };
-        //    List<ResourceReferenceWithResourceDetailsViewModel> ResourceReferenceWithResourceDetailsViewModelLS = new List<ResourceReferenceWithResourceDetailsViewModel>() { };
-
-        //    resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(new List<int>() { }, new List<int>() { currentUserId }))?.ToList() ?? new List<ResourceActivityDTO>() { };
-
-        //    // Removing resources that have no major versions with the required activitystatus
-        //    List<int> resourceIds = resourceActivities
-        //        .GroupBy(ra => ra.ResourceId)
-        //        .Where(group => group.Any(g => activityStatusesForCertificates.Contains(g.ActivityStatusId)))
-        //        .Select(group => group.Key)
-        //        .Distinct()
-        //        .ToList();
-
-        //    var resourceReferencesList = (await this.resourceRepository.GetResourceReferencesForAssessments(resourceIds)).ToList();
-
-        //    ResourceReferenceWithResourceDetailsViewModelLS = resourceReferencesList.Select(rr => this.GetResourceReferenceWithResourceDetailsViewModel(rr, resourceActivities)).ToList();
-
-        //    return ResourceReferenceWithResourceDetailsViewModelLS;
-        //}
 
         private ResourceReferenceWithResourceDetailsViewModel GetResourceReferenceWithResourceDetailsViewModel(ResourceReference resourceReference, List<ResourceActivityDTO> resourceActivities)
         {
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs
index 981dcf94f..95ca6d549 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs
@@ -157,7 +157,6 @@ public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOrigina
         /// </summary>
         /// <returns>ResourceReferenceViewModels for matching resources.</returns>
         [HttpGet("User/{activityStatusId}")]
-       
         public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesByActivityStatus(int activityStatusId)
         {
             // These activity statuses are set with other activity statuses and resource type within the ActivityStatusHelper.GetActivityStatusDescription
@@ -169,28 +168,6 @@ public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResour
 
             return await this.resourceService.GetResourceReferenceByActivityStatus(new List<int>() { activityStatusId }, this.CurrentUserId.Value);
         }
-        /// <summary>
-        /// Get resourceReferences that have an in progress activity summary
-        /// </summary>
-        /// <returns>ResourceReferenceViewModels for matching resources.</returns>
-        [HttpGet("User/InProgress")]
-        public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesByInProgress()
-        {
-            if (this.CurrentUserId == null) throw new UnauthorizedAccessException("User Id required.");
-
-            return await this.resourceService.GetResourceReferenceByActivityStatus(new List<int>(){ (int)ActivityStatusEnum.Incomplete}, this.CurrentUserId.Value);// In complete value is renamed in progress once leaves db
-        }
-        /// <summary>
-        /// Get resourceReferences that have a complete activity summary
-        /// </summary>
-        /// <returns>ResourceReferenceViewModels for matching resources.</returns>
-        [HttpGet("User/Complete")]
-        public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferencesByComplete()
-        {
-            if (this.CurrentUserId == null) throw new UnauthorizedAccessException("User Id required.");
-
-            return await this.resourceService.GetResourceReferenceByActivityStatus(new List<int>() { (int)ActivityStatusEnum.Completed }, this.CurrentUserId.Value);// Complete can be renamed to viewed etc
-        }
 
         /// <summary>
         /// Get resourceReferences that have certificates
@@ -204,7 +181,5 @@ public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResour
             return await this.resourceService.GetResourceReferencesForCertificates(this.CurrentUserId.Value);
         }
 
-
-
     }
 }

From a1e1e58ee3de15bb9023e6ba893b77477998ca58 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Thu, 11 Jul 2024 15:29:39 +0100
Subject: [PATCH 026/143] Tests

---
 .../Services/IResourceService.cs              |  2 +
 .../Services/ResourceService.cs               | 16 ++++----
 .../Controllers/ResourceControllerTests.cs    |  5 ++-
 .../Services/Services/ResourceServiceTests.cs | 40 +++++++++++++------
 .../Controllers/ResourceController.cs         |  2 +-
 5 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IResourceService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IResourceService.cs
index 3c397bb78..f5f59cb1d 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IResourceService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/Services/IResourceService.cs
@@ -22,6 +22,7 @@ public interface IResourceService
         /// The get resource by id async.
         /// </summary>
         /// <param name="originalResourceReferenceId">The original resource reference id.</param>
+        /// <param name="currentUserId">.</param>
         /// <returns>The <see cref="Task"/>the resourceMetaDataViewModel corresponding to the resource reference.</returns>
         Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceReferenceByOriginalId(int originalResourceReferenceId, int? currentUserId);
 
@@ -36,6 +37,7 @@ public interface IResourceService
         /// The get resources by Ids endpoint.
         /// </summary>
         /// <param name="originalResourceReferenceIds">The original resource reference Ids.</param>
+        /// <param name="currentUserId">.</param>
         /// <returns><see cref="Task"/>The resourceReferenceMetaDataViewModel.</returns>
         Task<BulkResourceReferenceViewModel> GetResourceReferencesByOriginalIds(List<int> originalResourceReferenceIds, int? currentUserId);
     }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
index 4f94f3257..34c5c0d40 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
@@ -51,7 +51,7 @@ public ResourceService(ILearningHubService learningHubService, IResourceReposito
         /// the get by id async.
         /// </summary>
         /// <param name="originalResourceReferenceId">the id.</param>
-        /// <param name="currentUserId"></param>
+        /// <param name="currentUserId">.</param>
         /// <returns>the resource.</returns>
         public async Task<ResourceReferenceWithResourceDetailsViewModel> GetResourceReferenceByOriginalId(int originalResourceReferenceId, int? currentUserId)
         {
@@ -131,8 +131,8 @@ public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOrigina
         /// <summary>
         /// the get by id async.
         /// </summary>
-        /// <param name="originalResourceReferenceId">the id.</param>
-        /// <param name="currentUserId"></param>
+        /// <param name="activityStatusIds">.</param>
+        /// <param name="currentUserId">.</param>
         /// <returns>list resource ViewModel.</returns>
         public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferenceByActivityStatus(List<int> activityStatusIds, int currentUserId)
         {
@@ -165,20 +165,18 @@ public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResour
         {
 
             List<ResourceActivityDTO> resourceActivities = new List<ResourceActivityDTO>() { };
-            List<ResourceReferenceWithResourceDetailsViewModel> ResourceReferenceWithResourceDetailsViewModelLS = new List<ResourceReferenceWithResourceDetailsViewModel>() { };
-            List<int> achievedCertificatedResourceIds = (await this.resourceRepository.GetAchievedCertificatedResourceIds(currentUserId));
+            List<ResourceReferenceWithResourceDetailsViewModel> resourceReferenceWithResourceDetailsViewModelLS = new List<ResourceReferenceWithResourceDetailsViewModel>() { };
+            List<int> achievedCertificatedResourceIds = (await this.resourceRepository.GetAchievedCertificatedResourceIds(currentUserId)).ToList();
 
             resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(achievedCertificatedResourceIds, new List<int>() { currentUserId }))?.ToList() ?? new List<ResourceActivityDTO>() { };
 
             var resourceList = (await this.resourceRepository.GetResourcesFromIds(achievedCertificatedResourceIds)).ToList();
 
-            //qqqq check this can return empty list of resourceActivity where there isnt any
-            //because we return resourceActivity but things are certified on other things could have strange looking results
-            ResourceReferenceWithResourceDetailsViewModelLS = resourceList.SelectMany(r => r.ResourceReference)
+            resourceReferenceWithResourceDetailsViewModelLS = resourceList.SelectMany(r => r.ResourceReference)
                 .Distinct()
                 .Select(rr => this.GetResourceReferenceWithResourceDetailsViewModel(rr, resourceActivities)).ToList();
 
-            return ResourceReferenceWithResourceDetailsViewModelLS;
+            return resourceReferenceWithResourceDetailsViewModelLS;
         }
 
         private ResourceReferenceWithResourceDetailsViewModel GetResourceReferenceWithResourceDetailsViewModel(ResourceReference resourceReference, List<ResourceActivityDTO> resourceActivities)
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs
index 60a5c6600..d0126a840 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Controllers/ResourceControllerTests.cs
@@ -21,6 +21,7 @@ namespace LearningHub.Nhs.OpenApi.Tests.Controllers
     using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;
     using System.Security.Claims;
+    using LearningHub.Nhs.Models.Enums;
 
     public sealed class ResourceControllerTests
     {
@@ -245,7 +246,7 @@ public async Task GetResourceReferencesByCompleteThrowsErrorWhenNoUserId()
             // When
             var exception = await Assert.ThrowsAsync<UnauthorizedAccessException>(async () =>
             {
-                await this.resourceController.GetResourceReferencesByComplete();
+                await this.resourceController.GetResourceReferencesByActivityStatus((int)ActivityStatusEnum.Completed);
             });
 
             // Then
@@ -258,7 +259,7 @@ public async Task GetResourceReferencesByInProgressThrowsErrorWhenNoUserId()
             // When
             var exception = await Assert.ThrowsAsync<UnauthorizedAccessException>(async () =>
             {
-                await this.resourceController.GetResourceReferencesByInProgress();
+                await this.resourceController.GetResourceReferencesByActivityStatus((int)ActivityStatusEnum.Incomplete);// in complete in db is in progress front endS
             });
 
             // Then
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs
index 4f2da1d1e..ddddc6ebc 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/Services/Services/ResourceServiceTests.cs
@@ -28,13 +28,14 @@ public class ResourceServiceTests
 
         public ResourceServiceTests()
         {
-            //This Id is the development accountId
+            // This Id is the development accountId
             this.currentUserId = 57541;
 
             this.learningHubService = new Mock<ILearningHubService>();
             this.resourceRepository = new Mock<IResourceRepository>();
             this.resourceService = new ResourceService(this.learningHubService.Object, this.resourceRepository.Object, new NullLogger<ResourceService>());
         }
+
         private List<ResourceActivityDTO> ResourceActivityDTOList => new List<ResourceActivityDTO>()
         {
             new ResourceActivityDTO{ ResourceId = 1, ActivityStatusId = 5, MajorVersion = 5 },
@@ -51,6 +52,7 @@ public ResourceServiceTests()
             new ResourceActivityDTO{ ResourceId = 3, ActivityStatusId = 4, MajorVersion = 1 }, // Failed
             new ResourceActivityDTO{ ResourceId = 3, ActivityStatusId = 7, MajorVersion = 4 }, // In complete
         };
+
         private List<Resource> ResourceList => new List<Resource>()
         {
             ResourceTestHelper.CreateResourceWithDetails(id: 1, title: "title1", description: "description1", rating: 3m, resourceType: ResourceTypeEnum.Article),
@@ -376,7 +378,6 @@ public async Task SingleResourceEndpointReturnsActivitySummaryWhenCurrentUserIdP
             x.UserSummaryActivityStatuses[2].ActivityStatusDescription.Should().Be("Viewed");
             x.UserSummaryActivityStatuses[3].ActivityStatusDescription.Should().Be("In progress");
             x.UserSummaryActivityStatuses[4].ActivityStatusDescription.Should().Be("Viewed");
-
         }
 
         [Fact]
@@ -395,13 +396,11 @@ public async Task SingleResourceEndpointReturnsEmptyActivitySummaryWhenNoCurrent
 
             // Then
             x.UserSummaryActivityStatuses.Should().BeEmpty();
-
         }
 
         [Fact]
         public async Task GetResourceReferencesByCompleteReturnsCorrectInformation()
         {
-
             // Given
             List<int> resourceIds = new List<int>() { 1, 2 };
             List<Resource> resources = this.ResourceList.GetRange(0, 2);
@@ -478,22 +477,41 @@ public async Task GetResourceReferencesByCertificatesReturnsCorrectInformation()
         {
 
             // Given
-            List<int> resourceIds = new List<int>() { 1, 2 }; // Ids returned from activity
+            List<int> resourceIds = new List<int>() { 1, 3 }; // Ids returned from activity
+
+            List<Resource> resources = new List<Resource>() { this.ResourceList[0], this.ResourceList[2] };
+            resources[0].ResourceReference.ToList()[0].Resource = ResourceTestHelper.CreateResourceWithDetails(id: 1, title: "title1", description: "description1", rating: 3m, resourceType: ResourceTypeEnum.Article);
+            resources[1].ResourceReference.ToList()[0].Resource = ResourceTestHelper.CreateResourceWithDetails(id: 3, title: "title2", description: "description2");
 
+
+            // Will be passed resourceIds and currentUserId
             this.resourceRepository.Setup(rr => rr.GetResourceActivityPerResourceMajorVersion(It.IsAny<List<int>>(), It.IsAny<List<int>>()))
                 .ReturnsAsync(this.ResourceActivityDTOList);
 
-            this.resourceRepository.Setup(rr => rr.GetResourceReferencesForAssessments(resourceIds))
-                .ReturnsAsync(ResourceReferenceList.GetRange(1, 1));
+            this.resourceRepository.Setup(rr => rr.GetAchievedCertificatedResourceIds(currentUserId))
+                .ReturnsAsync(resourceIds);
+
+            this.resourceRepository.Setup(rr => rr.GetResourcesFromIds(resourceIds))
+                .ReturnsAsync(resources);
 
             // When
             var x = await this.resourceService.GetResourceReferencesForCertificates(currentUserId);
 
             // Then
-            x.Count().Should().Be(1); // ActivityStatus passed and resourceType Assessment
+
+            x.Count().Should().Be(2);
+
+            // We are including all the major versions not just the matching ones if there exists one matching one
             x[0].ResourceId.Should().Be(1);
-            x[0].UserSummaryActivityStatuses.Count().Should().Be(3); // return passed and all other major version statuses for this resource
-            x[0].UserSummaryActivityStatuses[0].ActivityStatusDescription.Should().Be("Passed");
+            x[0].UserSummaryActivityStatuses.Count().Should().Be(5);
+
+            // Return all the activitySummaries if one match
+            x[1].ResourceId.Should().Be(3);
+            x[1].UserSummaryActivityStatuses.Count().Should().Be(3);
+
+            // we are not excluding major version that are not completed (assuming here that its completed and has certificated flag). We return the resource and all its activitySummaries if one matches
+            x[0].UserSummaryActivityStatuses[1].ActivityStatusDescription.Should().Be("In progress");
+            x[0].UserSummaryActivityStatuses[2].ActivityStatusDescription.Should().Be("Viewed"); // Rename completed and still return it
         }
 
         [Fact]
@@ -513,9 +531,7 @@ public async Task GetResourceReferencesByCompleteNoActivitySummaryFound()
             var x = await this.resourceService.GetResourceReferenceByActivityStatus(new List<int>() { (int)ActivityStatusEnum.Completed }, currentUserId);
 
             // Then
-
             x.Count().Should().Be(0);
-
         }
     }
 }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs
index 95ca6d549..c48aa4f83 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/ResourceController.cs
@@ -152,6 +152,7 @@ public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOrigina
 
             return await this.resourceService.GetResourceReferencesByOriginalIds(bulkResourceReferences.ResourceReferenceIds, this.CurrentUserId);
         }
+
         /// <summary>
         /// Get resourceReferences that have an in progress activity summary
         /// </summary>
@@ -180,6 +181,5 @@ public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResour
 
             return await this.resourceService.GetResourceReferencesForCertificates(this.CurrentUserId.Value);
         }
-
     }
 }

From 8a99395b3260b1c7f9834a3f369793b1e58f906f Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Thu, 11 Jul 2024 15:32:43 +0100
Subject: [PATCH 027/143] correction

---
 .../Services/ResourceService.cs                           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
index 34c5c0d40..4848cc1e6 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/Services/ResourceService.cs
@@ -132,12 +132,12 @@ public async Task<BulkResourceReferenceViewModel> GetResourceReferencesByOrigina
         /// the get by id async.
         /// </summary>
         /// <param name="activityStatusIds">.</param>
-        /// <param name="currentUserId">.</param>
+        /// <param name="currentUserId">c.</param>
         /// <returns>list resource ViewModel.</returns>
         public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResourceReferenceByActivityStatus(List<int> activityStatusIds, int currentUserId)
         {
             List<ResourceActivityDTO> resourceActivities = new List<ResourceActivityDTO>() { };
-            List<ResourceReferenceWithResourceDetailsViewModel> ResourceReferenceWithResourceDetailsViewModelLS = new List<ResourceReferenceWithResourceDetailsViewModel>() { };
+            List<ResourceReferenceWithResourceDetailsViewModel> resourceReferenceWithResourceDetailsViewModelLS = new List<ResourceReferenceWithResourceDetailsViewModel>() { };
 
             resourceActivities = (await this.resourceRepository.GetResourceActivityPerResourceMajorVersion(new List<int>(){ }, new List<int>(){ currentUserId }))?.ToList() ?? new List<ResourceActivityDTO>() { };
 
@@ -151,9 +151,9 @@ public async Task<List<ResourceReferenceWithResourceDetailsViewModel>> GetResour
 
             var resourceReferencesList = (await this.resourceRepository.GetResourcesFromIds(resourceIds)).SelectMany(r => r.ResourceReference).ToList();
 
-            ResourceReferenceWithResourceDetailsViewModelLS = resourceReferencesList.Select(rr => this.GetResourceReferenceWithResourceDetailsViewModel(rr, resourceActivities)).ToList();
+            resourceReferenceWithResourceDetailsViewModelLS = resourceReferencesList.Select(rr => this.GetResourceReferenceWithResourceDetailsViewModel(rr, resourceActivities)).ToList();
 
-            return ResourceReferenceWithResourceDetailsViewModelLS;
+            return resourceReferenceWithResourceDetailsViewModelLS;
         }
 
         /// <summary>

From 1bebb6e0db3935eb7c62edcffb8e075ee84287c2 Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Thu, 11 Jul 2024 16:00:31 +0100
Subject: [PATCH 028/143] Update continuous-integration-workflow.yml

---
 .github/workflows/continuous-integration-workflow.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index ec0ed2d5f..027e35695 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Use Node 12.19 with Yarn
         uses: actions/setup-node@v4
         with:
-          node-version: '14'
+          node-version: '18'
           npm: '6.14.8'
 
       - name: Typescript install WebUI

From f03e9840b89553d0e2df1ffa0b7d40bc37d3a6d8 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Thu, 11 Jul 2024 16:21:14 +0100
Subject: [PATCH 029/143] virgo change


From aa428f745d3b1323e16373120a544d04e37d944f Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Tue, 16 Jul 2024 14:24:38 +0100
Subject: [PATCH 030/143] Comment on openapibase

---
 .../LearningHub.Nhs.OpenApi/Controllers/OpenApiControllerBase.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/OpenApiControllerBase.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/OpenApiControllerBase.cs
index 863a8bb22..64a84de82 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/OpenApiControllerBase.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/OpenApiControllerBase.cs
@@ -17,6 +17,7 @@ public int? CurrentUserId
         {
             get
             {
+                // This check is to determine between the two ways of authorising, OAuth and APIKey, where APIKey does not provide UserId
                 if ((this.User?.Identity?.AuthenticationType ?? null) == "AuthenticationTypes.Federation")
                 {
                     int userId;

From 6ff76a7e58c0e61681af882367da252c7ab2e279 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Tue, 16 Jul 2024 14:26:26 +0100
Subject: [PATCH 031/143] commit reword

---
 .../Controllers/OpenApiControllerBase.cs                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/OpenApiControllerBase.cs b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/OpenApiControllerBase.cs
index 64a84de82..799c15190 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/OpenApiControllerBase.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/Controllers/OpenApiControllerBase.cs
@@ -17,7 +17,7 @@ public int? CurrentUserId
         {
             get
             {
-                // This check is to determine between the two ways of authorising, OAuth and APIKey, where APIKey does not provide UserId
+                // This check is to determine between the two ways of authorising, OAuth and APIKey.OAuth provides userId and APIKey does not. For OpenApi we provide the data without specific user info.
                 if ((this.User?.Identity?.AuthenticationType ?? null) == "AuthenticationTypes.Federation")
                 {
                     int userId;

From 8f86d2e71f1f3455d7360fc292137e3045881e53 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Tue, 16 Jul 2024 22:00:05 +0100
Subject: [PATCH 032/143] Add role to header-dropdown-menu-control

---
 LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
index 33ccb4ceb..821d4d152 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
@@ -49,7 +49,7 @@
 
 </div>
   @if (User.Identity.IsAuthenticated) {
-    <input type="checkbox" id="header-dropdown-menu-control" aria-labelledby="close-menu toggle-menu">
+    <input type="checkbox" id="header-dropdown-menu-control" aria-labelledby="close-menu toggle-menu" role="button">
     <nav class="nhsuk-header__navigation app-width-container" id="header-navigation" role="navigation" aria-label="Primary navigation" aria-labelledby="label-navigation">
         <p class="nhsuk-header__navigation-title"><span id="label-navigation">Menu</span>
           <label class="nhsuk-header__navigation-close" id="close-menu">

From ff325b51bcad93c576576accd3236486075e8717 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Thu, 25 Jul 2024 10:04:56 +0100
Subject: [PATCH 033/143] Add custom error message for Country Search input
 errors

---
 .../Styles/nhsuk/pages/createaccount.scss                  | 5 +++++
 .../Views/Account/CreateAccountCountrySearch.cshtml        | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/createaccount.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/createaccount.scss
index 85f514e15..069127a82 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/createaccount.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/createaccount.scss
@@ -72,4 +72,9 @@
     .no-bottom-border {
         border-bottom: 0px;
     }
+
+    .custom-validation-error {
+        color: #d5281b;
+        font-size: 19px;
+    }
 }
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml
index 18d419953..6e31e7f89 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml
@@ -31,7 +31,12 @@
                             </svg>
                             <span class="nhsuk-u-visually-hidden">Search</span>
                         </button>
-
+                    </div>
+                    <div>
+                    @if (errorHasOccurred)
+                    {
+                        <span class="custom-validation-error">@CommonValidationErrorMessages.SearchTermRequired</span>
+                    }
                     </div>
                 </form>
 

From 25c74026cdb480b50235b10abf6477a8776fd3bb Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Thu, 25 Jul 2024 12:54:37 +0100
Subject: [PATCH 034/143] Add custom input error id to aria-describedby

---
 .../Views/Account/CreateAccountCountrySearch.cshtml        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml
index 6e31e7f89..b2aad6de5 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml
@@ -24,7 +24,10 @@
                     <input type="hidden" name="formSubmission" value="true">
                     <label for="FilterText" class="nhsuk-body-l nhsuk-u-font-size-19 nhsuk-u-margin-bottom-3">Search for example, England</label>
                     <div class="nhsuk-form-group search-box-container" style="white-space:nowrap">
-                        <input class="nhsuk-input nhsuk-search__input" type="search" autocomplete="off" id="FilterText" name="FilterText" placeholder="" value="@Model.FilterText" @if(errorHasOccurred){<text>aria-describedby="error-summary-title"</text>}>
+                        <input class="nhsuk-input nhsuk-search__input" type="search" autocomplete="off" id="FilterText" name="FilterText" placeholder="" value="@Model.FilterText" @if (errorHasOccurred)
+                        {
+                            <text>aria-describedby="error-summary-title custom-validation-error"</text>
+                        }>
                         <button class="nhsuk-search__submit" type="submit">
                             <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
                                 <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
@@ -35,7 +38,7 @@
                     <div>
                     @if (errorHasOccurred)
                     {
-                        <span class="custom-validation-error">@CommonValidationErrorMessages.SearchTermRequired</span>
+                        <span id="custom-validation-error" class="custom-validation-error">@CommonValidationErrorMessages.SearchTermRequired</span>
                     }
                     </div>
                 </form>

From e80080e4975038fb168727443f66eea0fdff14f4 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Fri, 26 Jul 2024 16:21:19 +0100
Subject: [PATCH 035/143] TD-4411: Fixed filter result for "Completed" filter
 along with "Assessment".

---
 .../Activity/GetUserLearningActivities.sql    | 34 ++++++++++++++++---
 .../GetUserLearningActivitiesCount.sql        | 32 +++++++++++++++--
 2 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql
index c96931937..3b9609380 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
@@ -10,6 +10,7 @@
 -- Sarathlal	08-03-2024
 -- Sarathlal	23-04-2024 TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
 -- Sarathlal	25-04-2024 TD-4067: Resource with muliple version issue resolved
+-- Arunima		26-07-2024 TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [activity].[GetUserLearningActivities] (
 	 @userId INT	
@@ -271,8 +272,35 @@ FROM (
 												)
 										  )
 										  OR
-												([Res].[ResourceTypeId]  IN (6,11) AND  [ResourceActivity].[ActivityStatusId] = 3)
-										  OR	([Res].[ResourceTypeId]  IN (11) AND  [ResourceActivity].[ActivityStatusId] = 3 AND [AssessResVer].[AssessmentType]=1)
+												([Res].[ResourceTypeId]  IN (6) AND  [ResourceActivity].[ActivityStatusId] = 3)
+										OR (
+												EXISTS (SELECT 1 FROM @tmpActivityStatus WHERE ActivityStatusId = 3)
+												AND
+													(
+														[Res].[ResourceTypeId] = 11 AND [AssessResVer].[AssessmentType]=1
+														AND
+														EXISTS
+															(
+																SELECT 1
+																FROM   [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity6]
+																WHERE  
+																[AssessmentResourceActivity6].[Deleted] = 0
+																AND    
+																[ResourceActivity].[Id] = [AssessmentResourceActivity6].[ResourceActivityId]
+															)
+														AND 
+															(
+																(SELECT TOP(1)
+																[AssessmentResourceActivity7].[Score]
+																FROM   [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity7]
+																WHERE  
+																[AssessmentResourceActivity7].[Deleted] = 0
+																AND    [ResourceActivity].[Id] = [AssessmentResourceActivity7].[ResourceActivityId]) >= 0.0
+															)
+													)
+										
+											)
+										  -- OR	([Res].[ResourceTypeId]  IN (11) AND  [ResourceActivity].[ActivityStatusId] = 3 AND [AssessResVer].[AssessmentType]=1)
 										--OR         
 										--(
 										--		([Res].[ResourceTypeId] IN (1,5,10,12) AND  [ResourceActivity].[ActivityStatusId] = 3)
@@ -507,5 +535,3 @@ LEFT JOIN (
 ORDER BY [t2].[ActivityStart] DESC, [t2].[Id], [t2].[Id0], [t2].[Id1], [t2].[Id2], [VideoResourceVersion].[Id], [AudeoResourceVersion].[Id], [t3].[Id], [t4].[Id], [t5].[Id], [t6].[Id], [t7].[Id], [t8].[Id], [t9].[Id], [t10].[Id], [t11].[Id]
 		
 END
-
-
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql
index daa20e0e7..3f283a884 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
@@ -9,6 +9,7 @@
 -- Sarathlal	18-12-2023
 -- Sarathlal	08-03-2024
 -- Sarathlal	23-04-2024	TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
+-- Arunima		26-07-2024  TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [activity].[GetUserLearningActivitiesCount] (
 	 @userId INT	
@@ -186,8 +187,35 @@ FROM (
 												)
 										  )
 										  OR
-												([Res].[ResourceTypeId]  IN (6,11) AND  [ResourceActivity].[ActivityStatusId] = 3)
-												 OR	([Res].[ResourceTypeId]  IN (11) AND  [ResourceActivity].[ActivityStatusId] = 3 AND [AssessResVer].[AssessmentType]=1)
+												([Res].[ResourceTypeId]  IN (6) AND  [ResourceActivity].[ActivityStatusId] = 3)
+										  OR (
+												EXISTS (SELECT 1 FROM @tmpActivityStatus WHERE ActivityStatusId = 3)
+												AND
+													(
+														[Res].[ResourceTypeId] = 11 AND [AssessResVer].[AssessmentType]=1
+														AND
+														EXISTS
+															(
+																SELECT 1
+																FROM   [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity6]
+																WHERE  
+																[AssessmentResourceActivity6].[Deleted] = 0
+																AND    
+																[ResourceActivity].[Id] = [AssessmentResourceActivity6].[ResourceActivityId]
+															)
+														AND 
+															(
+																(SELECT TOP(1)
+																[AssessmentResourceActivity7].[Score]
+																FROM   [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity7]
+																WHERE  
+																[AssessmentResourceActivity7].[Deleted] = 0
+																AND    [ResourceActivity].[Id] = [AssessmentResourceActivity7].[ResourceActivityId]) >= 0.0
+															)
+													)
+										
+											)
+												 --OR	([Res].[ResourceTypeId]  IN (11) AND  [ResourceActivity].[ActivityStatusId] = 3 AND [AssessResVer].[AssessmentType]=1)
 
 										--OR         
 										--(

From e04b3a33f7e357e8b0731229ffa361dba9276c55 Mon Sep 17 00:00:00 2001
From: ArunimaGeorge <163844873+ArunimaGeorge@users.noreply.github.com>
Date: Fri, 26 Jul 2024 16:49:48 +0100
Subject: [PATCH 036/143] Update GetUserLearningActivities.sql

---
 .../Stored Procedures/Activity/GetUserLearningActivities.sql    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql
index 3b9609380..fb807abba 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
@@ -10,7 +10,7 @@
 -- Sarathlal	08-03-2024
 -- Sarathlal	23-04-2024 TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
 -- Sarathlal	25-04-2024 TD-4067: Resource with muliple version issue resolved
--- Arunima		26-07-2024 TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
+-- Arunima	26-07-2024 TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [activity].[GetUserLearningActivities] (
 	 @userId INT	

From cc89580171360ab00ef8f61f90f844cbd07c3e5b Mon Sep 17 00:00:00 2001
From: ArunimaGeorge <163844873+ArunimaGeorge@users.noreply.github.com>
Date: Fri, 26 Jul 2024 16:50:32 +0100
Subject: [PATCH 037/143] Update GetUserLearningActivitiesCount.sql

---
 .../Activity/GetUserLearningActivitiesCount.sql                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql
index 3f283a884..aa51ecdea 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
@@ -9,7 +9,7 @@
 -- Sarathlal	18-12-2023
 -- Sarathlal	08-03-2024
 -- Sarathlal	23-04-2024	TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
--- Arunima		26-07-2024  TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
+-- Arunima	26-07-2024  TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [activity].[GetUserLearningActivitiesCount] (
 	 @userId INT	

From fc3d67a4c97779d90f8873b01c43ab420bfd77e5 Mon Sep 17 00:00:00 2001
From: ArunimaGeorge <163844873+ArunimaGeorge@users.noreply.github.com>
Date: Fri, 26 Jul 2024 16:59:43 +0100
Subject: [PATCH 038/143] Update GetUserLearningActivities.sql

---
 .../Stored Procedures/Activity/GetUserLearningActivities.sql     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql
index fb807abba..49b475213 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
@@ -300,7 +300,6 @@ FROM (
 													)
 										
 											)
-										  -- OR	([Res].[ResourceTypeId]  IN (11) AND  [ResourceActivity].[ActivityStatusId] = 3 AND [AssessResVer].[AssessmentType]=1)
 										--OR         
 										--(
 										--		([Res].[ResourceTypeId] IN (1,5,10,12) AND  [ResourceActivity].[ActivityStatusId] = 3)

From 671ef24fd71916dd938424e5d0eb04d08ec9fec3 Mon Sep 17 00:00:00 2001
From: ArunimaGeorge <163844873+ArunimaGeorge@users.noreply.github.com>
Date: Fri, 26 Jul 2024 17:02:31 +0100
Subject: [PATCH 039/143] Update GetUserLearningActivities.sql

---
 .../Activity/GetUserLearningActivities.sql                  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql
index 49b475213..909b72978 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
@@ -300,12 +300,6 @@ FROM (
 													)
 										
 											)
-										--OR         
-										--(
-										--		([Res].[ResourceTypeId] IN (1,5,10,12) AND  [ResourceActivity].[ActivityStatusId] = 3)
-										--	  AND
-										--		([Res].[ResourceTypeId] NOT IN (2,7,8) AND  [ResourceActivity].[ActivityStatusId] = 3)
-										--)
 									)
 						)
 						OR	

From d462067ddde751f5ae34ae6a6c05d3a01fb08779 Mon Sep 17 00:00:00 2001
From: ArunimaGeorge <163844873+ArunimaGeorge@users.noreply.github.com>
Date: Fri, 26 Jul 2024 17:04:00 +0100
Subject: [PATCH 040/143] Update GetUserLearningActivitiesCount.sql

---
 .../Activity/GetUserLearningActivitiesCount.sql           | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql
index aa51ecdea..21e54ed83 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
@@ -215,14 +215,6 @@ FROM (
 													)
 										
 											)
-												 --OR	([Res].[ResourceTypeId]  IN (11) AND  [ResourceActivity].[ActivityStatusId] = 3 AND [AssessResVer].[AssessmentType]=1)
-
-										--OR         
-										--(
-										--		([Res].[ResourceTypeId] IN (1,5,10,12) AND  [ResourceActivity].[ActivityStatusId] = 3)
-										--	  AND
-										--		([Res].[ResourceTypeId] NOT IN (2,7,8) AND  [ResourceActivity].[ActivityStatusId] = 3)
-										--)
 									)
 						)
 						OR	

From 2740353274acfe9d72bddb66862f9c9cd2c8c840 Mon Sep 17 00:00:00 2001
From: ArunimaGeorge <163844873+ArunimaGeorge@users.noreply.github.com>
Date: Fri, 26 Jul 2024 17:26:51 +0100
Subject: [PATCH 041/143] Update GetUserLearningActivities.sql

---
 .../Activity/GetUserLearningActivities.sql                  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql
index 909b72978..15272dc4e 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
@@ -300,6 +300,12 @@ FROM (
 													)
 										
 											)
+											--OR         
+										--(
+										--		([Res].[ResourceTypeId] IN (1,5,10,12) AND  [ResourceActivity].[ActivityStatusId] = 3)
+										--	  AND
+										--		([Res].[ResourceTypeId] NOT IN (2,7,8) AND  [ResourceActivity].[ActivityStatusId] = 3)
+										--)
 									)
 						)
 						OR	

From e28850ef87318091091c0f4d80a256bab1f2bea3 Mon Sep 17 00:00:00 2001
From: ArunimaGeorge <163844873+ArunimaGeorge@users.noreply.github.com>
Date: Fri, 26 Jul 2024 17:29:07 +0100
Subject: [PATCH 042/143] Update GetUserLearningActivitiesCount.sql

---
 .../Activity/GetUserLearningActivitiesCount.sql             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql
index 21e54ed83..7ce53f78c 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
@@ -215,6 +215,12 @@ FROM (
 													)
 										
 											)
+											--OR         
+										--(
+										--		([Res].[ResourceTypeId] IN (1,5,10,12) AND  [ResourceActivity].[ActivityStatusId] = 3)
+										--	  AND
+										--		([Res].[ResourceTypeId] NOT IN (2,7,8) AND  [ResourceActivity].[ActivityStatusId] = 3)
+										--)
 									)
 						)
 						OR	

From d6e33a71ccb88ba0b79d616e8367ccbb15585108 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Mon, 29 Jul 2024 18:41:23 +0100
Subject: [PATCH 043/143] Remove tabindex

---
 .../vuesrc/mycontributions/mycontributionscardheader.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributionscardheader.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributionscardheader.vue
index aafcb47bb..13bcc4a3a 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributionscardheader.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributionscardheader.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="panel-card-container">
 
-        <div tabindex="0" style="background-size: cover;" class="h-100 my-contribute-card contribute-resource-panel-card">
+        <div style="background-size: cover;" class="h-100 my-contribute-card contribute-resource-panel-card">
             
             <a class="h-100 d-flex flex-column text-decoration-none" v-bind:href="contributeResourceUrl">
                 <div class="mt-5 mb-3"><h2 class="nhsuk-heading-xs mx-4 header text-center">Contribute a resource</h2></div>

From 2a7181e29abed4eff18e9dc3d6dae36280ec1bea Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Mon, 29 Jul 2024 21:09:27 +0100
Subject: [PATCH 044/143] Correct notification shevron and elipses color
 contrast

---
 .../Scripts/vuesrc/notification/notification.vue             | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notification.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notification.vue
index ba448902d..256b126c6 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notification.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notification.vue
@@ -63,7 +63,8 @@
                  :style="[isHighPriority ? {background:'#FCEC60'}:{background:'#435563', color:'#fff'}]"
                  @click="toggleContent" role=button>
                 <h2 class="m-0">{{priorityTypeText}}</h2>
-                <i :class="showContentIcon"></i>
+                <i :class="showContentIcon"
+                   :style="[isHighPriority ? {color:'#4c6272'}:{color:'#fff'}] "></i>
             </div>
 
             <template v-if="showContent">
@@ -76,7 +77,7 @@
                     </div>
 
                     <a href="#deleteModalButton" data-toggle="modal" @click="deleteNotification()" aria-label="Delete" v-if="notification.userDismissable">
-                        <i class="fas fa-ellipsis-h fa-lg" style="color: #AEB7BD;"></i>
+                        <i class="fas fa-ellipsis-h fa-lg" style="color: #435563;"></i>
                     </a>
                 </div>
 

From 98c04ea530b5c63ddf5acff4654179f9105d2bd5 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Wed, 31 Jul 2024 13:35:45 +0100
Subject: [PATCH 045/143] Before merge due to pr conflict

---
 .../Repositories/ResourceRepository.cs                           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
index e9e0dfdd3..79b7a239b 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/Repositories/ResourceRepository.cs
@@ -77,6 +77,7 @@ public async Task<IEnumerable<ResourceReference>> GetResourceReferencesByOrigina
                 .ToListAsync();
         }
 
+        /// <inheritdoc/>
         public async Task<List<int>> GetAchievedCertificatedResourceIds(int currentUserId)
         {
             // Use dashboard logic to ensure same resources determined has having achieved certificates

From 1a19f431a2e9c364c4c0be2efcd131a522b1bf87 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Wed, 31 Jul 2024 16:09:36 +0100
Subject: [PATCH 046/143] #merge part 2 these are just adds so we can take them

---
 .../GetMyCertificatesDashboardResources.sql   | 101 +++++
 .../GetMyInProgressDashboardResources.sql     | 122 ++++++
 ...GetMyRecentCompletedDashboardResources.sql | 119 ++++++
 .../GetPopularDashboardResources.sql          |  96 +++++
 .../Resources/GetRatedDashboardResources.sql  |  83 ++++
 .../Resources/GetRecentDashboardResources.sql |  82 ++++
 ... getdashboardresource previous changes.txt | 379 ++++++++++++++++++
 7 files changed, 982 insertions(+)
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyCertificatesDashboardResources.sql
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyRecentCompletedDashboardResources.sql
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetPopularDashboardResources.sql
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRatedDashboardResources.sql
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRecentDashboardResources.sql
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getdashboardresource previous changes.txt

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyCertificatesDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyCertificatesDashboardResources.sql
new file mode 100644
index 000000000..b75e45860
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyCertificatesDashboardResources.sql	
@@ -0,0 +1,101 @@
+-------------------------------------------------------------------------------
+-- Author       OA
+-- Created      24 JUN 2024 Nov 2020
+-- Purpose      Break down the GetDashboardResources SP to smaller SP for a specific data type
+--
+-- Modification History
+--
+-- 24 Jun 2024	OA	Initial Revision
+-------------------------------------------------------------------------------
+
+CREATE PROCEDURE [resources].[GetMyCertificatesDashboardResources]
+	@UserId					INT,	
+	@PageNumber				INT = 1,
+	@TotalRecords			INT OUTPUT
+AS
+BEGIN
+	DECLARE @MaxPageNumber INT = 4
+	
+	IF @PageNumber > 4
+	BEGIN
+		SET @PageNumber = @MaxPageNumber
+	END
+		
+	DECLARE @FetchRows INT = 3
+	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
+	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
+
+	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
+	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
+
+    INSERT INTO @MyActivity					
+        SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
+            FROM
+            activity.ResourceActivity ra				
+            JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
+            JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
+            LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
+            LEFT JOIN [activity].[AssessmentResourceActivity] ara ON ara.ResourceActivityId = ra.Id
+            LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = ra.Id
+            LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
+            WHERE ra.UserId = @UserId AND rv.CertificateEnabled = 1
+            AND (					
+                    (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId = 3 OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00' OR mar.Id IS NOT NULL AND mar.PercentComplete = 100)
+                OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status IN(3,5) OR (ra.ActivityStatusId IN(3, 5))))
+                OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 2) AND (ara.Score >= arv.PassMark OR ra.ActivityStatusId IN(3, 5)))
+                OR ((r.ResourceTypeId = 11 AND arv.AssessmentType =1) AND (ara.Score >= arv.PassMark AND ra.ActivityStatusId IN(3, 5,7)))
+                OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId = 3))		
+            GROUP BY ra.ResourceId
+            ORDER BY ResourceActivityId DESC
+
+    SELECT r.Id AS ResourceId
+    ,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+        FROM [resources].[ResourceReference] rr
+        JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+        WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+        ) AS ResourceReferenceID
+    ,r.CurrentResourceVersionId AS ResourceVersionId
+    ,r.ResourceTypeId AS ResourceTypeId
+    ,rv.Title
+    ,rv.Description
+    ,CASE 
+        WHEN r.ResourceTypeId = 7	THEN				 
+            (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+        WHEN r.ResourceTypeId = 2	THEN				 
+        (SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+        ELSE 
+        NULL
+        END  AS DurationInMilliseconds
+    ,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+    ,cnv.Url AS Url
+    ,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+    ,cnv.RestrictedAccess
+    ,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+    ,ub.Id AS BookMarkId
+    ,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+    ,rvrs.AverageRating
+    ,rvrs.RatingCount
+FROM @MyActivity ma 		
+JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
+JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0	
+JOIN Resources.Resource r ON r.Id = rv.ResourceId
+JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+        FROM [resources].[ResourceReference] rr
+        JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+        WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+                FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+                WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId		
+ORDER BY ma.ResourceActivityId DESC, rv.Title
+OFFSET @OffsetRows ROWS
+FETCH NEXT @FetchRows ROWS ONLY	
+
+    SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql
new file mode 100644
index 000000000..7464de6e3
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql	
@@ -0,0 +1,122 @@
+-------------------------------------------------------------------------------
+-- Author       OA
+-- Created      24 JUN 2024 Nov 2020
+-- Purpose      Break down the GetDashboardResources SP to smaller SP for a specific data type
+--
+-- Modification History
+--
+-- 24 Jun 2024	OA	Initial Revision
+-- 27 Jun 2024	SA My Learning Dashboard Tray showing Wrong Counts
+-------------------------------------------------------------------------------
+
+CREATE PROCEDURE [resources].[GetMyInProgressDashboardResources]
+	@UserId					INT,	
+	@PageNumber				INT = 1,
+	@TotalRecords			INT OUTPUT
+AS
+BEGIN
+	DECLARE @MaxPageNumber INT = 4
+	
+	IF @PageNumber > 4
+	BEGIN
+		SET @PageNumber = @MaxPageNumber
+	END
+		
+	DECLARE @FetchRows INT = 3
+	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
+	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
+
+	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);  
+
+	INSERT INTO @MyActivity					
+			SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
+				FROM 
+				(SELECT a.Id,a.ResourceId,a.ResourceVersionId,a.LaunchResourceActivityId,a.UserId,a.ActivityStatusId,a.ActivityStart FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity GROUP BY ResourceId) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id  order by a.Id desc OFFSET 0 ROWS) ra	
+				JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
+				JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
+				LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
+				LEFT JOIN [activity].[AssessmentResourceActivity] ara ON ara.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
+				LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
+				LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
+				WHERE ra.UserId = @UserId
+				AND (
+					 (r.ResourceTypeId IN (1, 5, 8, 9,10, 12) AND ra.ActivityStatusId <> 3)
+				    OR (r.ResourceTypeId IN (2, 7) AND (mar.Id IS NULL OR (mar.Id IS NOT NULL AND mar.PercentComplete < 100) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00'))
+					OR  (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status NOT IN (3, 5) AND (ra.ActivityStatusId NOT IN(3, 5))))
+					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 2) AND ((ara.Id IS NOT NULL AND ara.score < arv.PassMark) OR ra.ActivityStatusId = 7)) 
+
+					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 1) AND ra.ActivityStatusId = 7) 
+					)		
+				GROUP BY ra.ResourceId	
+				ORDER BY ResourceActivityId DESC
+				
+	SELECT ma.ResourceActivityId, r.Id AS ResourceId
+		,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+			FROM [resources].[ResourceReference] rr
+			JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+			WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+			) AS ResourceReferenceID
+		,r.CurrentResourceVersionId AS ResourceVersionId
+		,r.ResourceTypeId AS ResourceTypeId			
+		,rv.Title
+		,rv.Description
+		,CASE 
+			WHEN r.ResourceTypeId = 7	THEN				 
+				(SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+			WHEN r.ResourceTypeId = 2	THEN				 
+			(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+			ELSE 
+			NULL
+			END  AS DurationInMilliseconds
+		,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+		,cnv.Url AS Url
+		,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+		,cnv.RestrictedAccess
+		,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+		,ub.Id AS BookMarkId
+		,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+		,rvrs.AverageRating
+		,rvrs.RatingCount
+	FROM @MyActivity ma 		
+	JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
+	JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0		
+	JOIN Resources.Resource r ON r.Id = rv.ResourceId
+	JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+	JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+	JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+	JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+	JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+	JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+	JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+	LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+			FROM [resources].[ResourceReference] rr
+			JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+			WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+	LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+					FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+					WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+	ORDER BY ma.ResourceActivityId DESC
+	OFFSET @OffsetRows ROWS
+	FETCH NEXT @FetchRows ROWS ONLY	
+
+	SELECT @TotalRecords = CASE WHEN COUNT(ma.ResourceActivityId)  > 12 THEN @MaxRows ELSE COUNT(*) END 
+	FROM @MyActivity ma 		
+	JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
+	JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0		
+	JOIN Resources.Resource r ON r.Id = rv.ResourceId
+	JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+	JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+	JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+	JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+	JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+	JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+	JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+	LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+			FROM [resources].[ResourceReference] rr
+			JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+			WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+	LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+					FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+					WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+	
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyRecentCompletedDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyRecentCompletedDashboardResources.sql
new file mode 100644
index 000000000..cb12b2a10
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyRecentCompletedDashboardResources.sql	
@@ -0,0 +1,119 @@
+-------------------------------------------------------------------------------
+-- Author       OA
+-- Created      24 JUN 2024 Nov 2020
+-- Purpose      Break down the GetDashboardResources SP to smaller SP for a specific data type
+--
+-- Modification History
+--
+-- 24 Jun 2024	OA	Initial Revision
+-- 27 Jun 2024  SA  Removed unused temp tables
+-------------------------------------------------------------------------------
+
+CREATE PROCEDURE [resources].[GetMyRecentCompletedDashboardResources]
+	@UserId					INT,	
+	@PageNumber				INT = 1,
+	@TotalRecords			INT OUTPUT
+AS
+BEGIN
+	DECLARE @MaxPageNumber INT = 4
+	
+	IF @PageNumber > 4
+	BEGIN
+		SET @PageNumber = @MaxPageNumber
+	END
+		
+	DECLARE @FetchRows INT = 3
+	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
+	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
+
+	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
+	
+	INSERT INTO @MyActivity		
+			SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
+				FROM
+				(SELECT a.Id,a.ResourceId,a.ResourceVersionId,a.LaunchResourceActivityId,a.UserId,a.ActivityStatusId,a.ActivityStart FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity GROUP BY ResourceId ) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id  order by a.Id desc OFFSET 0 ROWS) ra					
+				JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
+				JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
+				LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
+				LEFT JOIN [activity].[AssessmentResourceActivity] ara ON ara.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
+				LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
+				LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
+				WHERE ra.UserId = @UserId
+				AND (					
+					 (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId = 3 AND ((mar.Id IS NOT NULL AND mar.PercentComplete = 100) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00'))
+					OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status IN(3,5) OR (ra.ActivityStatusId IN(3, 5))))
+					OR (r.ResourceTypeId = 11 AND ara.Score >= arv.PassMark OR ra.ActivityStatusId IN( 3, 5))
+					OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId = 3))		
+				GROUP BY ra.ResourceId
+				ORDER BY ResourceActivityId DESC
+
+	SELECT r.Id AS ResourceId
+	,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+		FROM [resources].[ResourceReference] rr
+		JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+		WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+		) AS ResourceReferenceID
+	,r.CurrentResourceVersionId AS ResourceVersionId
+	,r.ResourceTypeId AS ResourceTypeId
+	,rv.Title
+	,rv.Description
+	,CASE 
+		WHEN r.ResourceTypeId = 7	THEN				 
+			(SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+		WHEN r.ResourceTypeId = 2	THEN				 
+		(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+		ELSE 
+		NULL
+		END  AS DurationInMilliseconds
+	,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+	,cnv.Url AS Url
+	,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+	,cnv.RestrictedAccess
+	,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+	,ub.Id AS BookMarkId
+	,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+	,rvrs.AverageRating
+	,rvrs.RatingCount
+FROM @MyActivity ma 		
+JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
+JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0		
+JOIN Resources.Resource r ON r.Id = rv.ResourceId
+JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+		FROM [resources].[ResourceReference] rr
+		JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+		WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+				FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+				WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+ORDER BY ma.ResourceActivityId DESC, rv.Title
+OFFSET @OffsetRows ROWS
+FETCH NEXT @FetchRows ROWS ONLY	
+
+SELECT @TotalRecords = CASE WHEN COUNT(ma.ResourceActivityId)  > 12 THEN @MaxRows ELSE COUNT(*) END 
+FROM @MyActivity ma 		
+JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
+JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0		
+JOIN Resources.Resource r ON r.Id = rv.ResourceId
+JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+		FROM [resources].[ResourceReference] rr
+		JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+		WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+				FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+				WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+	
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetPopularDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetPopularDashboardResources.sql
new file mode 100644
index 000000000..c9904f0fc
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetPopularDashboardResources.sql	
@@ -0,0 +1,96 @@
+-------------------------------------------------------------------------------
+-- Author       OA
+-- Created      24 JUN 2024 Nov 2020
+-- Purpose      Break down the GetDashboardResources SP to smaller SP for a specific data type
+--
+-- Modification History
+--
+-- 24 Jun 2024	OA	Initial Revision
+-- 27 Jun 2024  SA  Removed unused temp tables
+-------------------------------------------------------------------------------
+
+CREATE PROCEDURE [resources].[GetPopularDashboardResources]
+	@UserId					INT,	
+	@PageNumber				INT = 1,
+	@TotalRecords			INT OUTPUT
+AS
+BEGIN
+	DECLARE @MaxPageNumber INT = 4
+	
+	IF @PageNumber > 4
+	BEGIN
+		SET @PageNumber = @MaxPageNumber
+	END
+		
+	DECLARE @FetchRows INT = 3
+	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
+	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
+
+	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
+
+
+	INSERT INTO @Resources	
+			SELECT TOP (@MaxRows) ra.ResourceId
+			,Count(ra.ResourceVersionId) ResourceActivityCount 
+			FROM resources.Resource r					
+			JOIN resources.ResourceVersion rv On rv.id = r.CurrentResourceVersionId AND rv.VersionStatusId = 2
+			JOIN activity.ResourceActivity ra ON ra.ResourceId = r.Id	
+			JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+			JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+			JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+			JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+			JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+			GROUP BY  ra.ResourceId
+			ORDER BY ResourceActivityCount DESC					
+	SELECT 
+		tr.ResourceId
+		,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+			FROM [resources].[ResourceReference] rr
+			JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+			WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+			) AS ResourceReferenceID
+		,r.CurrentResourceVersionId AS ResourceVersionId
+		,r.ResourceTypeId AS ResourceTypeId
+		,rv.Title
+		,rv.Description
+		,CASE 
+			WHEN r.ResourceTypeId = 7	THEN				 
+				(SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+			WHEN r.ResourceTypeId = 2	THEN				 
+			(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+			ELSE 
+			NULL
+			END  AS DurationInMilliseconds
+		,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+		,cnv.Url AS Url
+		,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+		,cnv.RestrictedAccess
+		,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+		,ub.Id AS BookMarkId
+		,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+		,rvrs.AverageRating
+		,rvrs.RatingCount
+	FROM @Resources tr
+	JOIN resources.Resource r ON r.id = tr.ResourceId
+	JOIN resources.resourceversion rv ON rv.ResourceId = r.Id	AND rv.id = r.CurrentResourceVersionId AND rv.Deleted = 0
+	JOIN resources.ResourceVersionRatingSummary rvrs ON r.CurrentResourceVersionId = rvrs.ResourceVersionId AND rvrs.Deleted = 0
+	JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+	JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+	JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+	JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+	JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+	LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+			FROM [resources].[ResourceReference] rr
+			JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+			WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+	LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+					FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+					WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+	WHERE rv.VersionStatusId = 2	
+	ORDER BY tr.ResourceActivityCount DESC, rv.Title
+	OFFSET @OffsetRows ROWS
+	FETCH NEXT @FetchRows ROWS ONLY	
+
+	SELECT @TotalRecords = CASE WHEN COUNT(*)  > 12 THEN @MaxRows ELSE COUNT(*) END FROM @Resources
+
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRatedDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRatedDashboardResources.sql
new file mode 100644
index 000000000..56b994092
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRatedDashboardResources.sql	
@@ -0,0 +1,83 @@
+-------------------------------------------------------------------------------
+-- Author       OA
+-- Created      24 JUN 2024 Nov 2020
+-- Purpose      Break down the GetDashboardResources SP to smaller SP for a specific data type
+--
+-- Modification History
+--
+-- 24 Jun 2024	OA	Initial Revision
+-- 27 Jun 2024  SA  Removed unused temp tables
+-------------------------------------------------------------------------------
+
+CREATE PROCEDURE [resources].[GetRatedDashboardResources]
+	@UserId					INT,	
+	@PageNumber				INT = 1,
+	@TotalRecords			INT OUTPUT
+AS
+BEGIN
+	DECLARE @MaxPageNumber INT = 4
+	
+	IF @PageNumber > 4
+	BEGIN
+		SET @PageNumber = @MaxPageNumber
+	END
+		
+	DECLARE @FetchRows INT = 3
+	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
+	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
+
+	SELECT TOP(@MaxRows) r.Id AS ResourceId
+			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+				) AS ResourceReferenceID
+			,r.CurrentResourceVersionId AS ResourceVersionId
+			,r.ResourceTypeId AS ResourceTypeId
+			,rv.Title
+			,rv.Description
+			,CASE 
+				WHEN r.ResourceTypeId = 7	THEN				 
+				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				WHEN r.ResourceTypeId = 2	THEN				 
+				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				ELSE 
+				NULL
+				END  AS DurationInMilliseconds
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+			,cnv.Url AS Url
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+			,cnv.RestrictedAccess
+			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+			,ub.Id AS BookMarkId
+			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+			,rvrs.AverageRating
+			,rvrs.RatingCount
+		INTO #ratedresources
+		FROM Resources.Resource r
+		JOIN resources.resourceversion rv ON rv.ResourceId = r.Id	AND rv.id = r.CurrentResourceVersionId	AND rv.Deleted = 0
+		JOIN resources.ResourceVersionRatingSummary rvrs ON r.CurrentResourceVersionId = rvrs.ResourceVersionId AND rvrs.RatingCount > 0	
+		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+		WHERE rv.VersionStatusId = 2	
+		ORDER BY rvrs.AverageRating DESC, rvrs.RatingCount DESC, rv.Title
+
+	SELECT rr.* FROM #ratedresources rr
+		ORDER BY rr.AverageRating DESC, rr.RatingCount DESC, rr.Title
+		OFFSET @OffsetRows ROWS
+		FETCH NEXT @FetchRows ROWS ONLY	
+
+	SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM #ratedresources
+
+
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRecentDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRecentDashboardResources.sql
new file mode 100644
index 000000000..5ba8fdd4a
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetRecentDashboardResources.sql	
@@ -0,0 +1,82 @@
+-------------------------------------------------------------------------------
+-- Author       OA
+-- Created      24 JUN 2024 Nov 2020
+-- Purpose      Break down the GetDashboardResources SP to smaller SP for a specific data type
+--
+-- Modification History
+--
+-- 24 Jun 2024	OA	Initial Revision
+-- 27 Jun 2024  SA  Removed unused temp tables
+-------------------------------------------------------------------------------
+
+CREATE PROCEDURE [resources].[GetRecentDashboardResources]
+	@UserId					INT,	
+	@PageNumber				INT = 1,
+	@TotalRecords			INT OUTPUT
+AS
+BEGIN
+	DECLARE @MaxPageNumber INT = 4
+	
+	IF @PageNumber > 4
+	BEGIN
+		SET @PageNumber = @MaxPageNumber
+	END
+		
+	DECLARE @FetchRows INT = 3
+	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
+	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
+
+	SELECT TOP(@MaxRows) r.Id AS ResourceId
+			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+				) AS ResourceReferenceID
+			,r.CurrentResourceVersionId AS ResourceVersionId
+			,r.ResourceTypeId AS ResourceTypeId
+			,rv.Title
+			,rv.Description
+			,CASE 
+				WHEN r.ResourceTypeId = 7	THEN				 
+				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				WHEN r.ResourceTypeId = 2	THEN				 
+				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				ELSE 
+				NULL
+				END  AS DurationInMilliseconds
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+			,cnv.Url AS Url
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+			,cnv.RestrictedAccess
+			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+			,ub.Id AS BookMarkId
+			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+			,rvrs.AverageRating
+			,rvrs.RatingCount
+			INTO #recentresources
+		FROM Resources.Resource r
+		JOIN resources.resourceversion rv ON rv.ResourceId = r.Id	AND rv.id = r.CurrentResourceVersionId AND rv.Deleted = 0
+		JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+		JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+		WHERE rv.VersionStatusId = 2
+		ORDER BY p.CreateDate DESC
+		
+	SELECT rr.* FROM #recentresources rr		
+	ORDER BY rr.ResourceVersionId DESC
+	OFFSET @OffsetRows ROWS
+	FETCH NEXT @FetchRows ROWS ONLY
+
+	SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM #recentresources
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getdashboardresource previous changes.txt b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getdashboardresource previous changes.txt
new file mode 100644
index 000000000..7d55ced2c
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getdashboardresource previous changes.txt	
@@ -0,0 +1,379 @@
+-------------------------------------------------------------------------------
+-- Author       HV
+-- Created      18 Nov 2020
+-- Purpose      Gets the resources to be displayed on dashboard
+--
+-- Modification History
+--
+-- 18 Nov 2020	HV	Initial Revision
+-- 28 Apr 2021	KD	Added restricted access indication
+-- 28 Jun 2021	DB	Fix to the join between Node & NodeVersion
+-- 14 Nov 2022  RS  Fix to include resources located in catalogue subfolders
+-- 16 Nov 2022  RS  FetchRows changes for progressive enhancement
+-- 16 Mar 2023  RS  Added rating data
+-- 28 Mar 2023  RS  Removed columns no longer used
+-- 15 Jun 2023  RS  Re-added BadgeUrl column following design change
+-- 27 Sep 2023  HV  Included Paging and user resource activity
+-- 08 Nov 2023  OA  Fixed latest resource activity entry selection(with updated logic for media activities) and  status check for incomplete assessment.
+-- 17 Jan 2024  SA  Changes to accomadate activity status changes
+-- 27 Feb 2024  SS  Fixed missing In progress resources in the My Accessed Learning tray issue
+-- 2 May 2024   SA  Fixed the issue on showing statuses on 'My accessed Learning' for resource type file
+-- 13 May 2024  SA  TD-4115
+-- 11 Jul 2024  PT  Extract certification logic to GetAchievedcertificatedResourcesWithOptionalPagination so logic can have one source of truth
+-------------------------------------------------------------------------------
+
+CREATE PROCEDURE [resources].[GetDashboardResources]
+	@dashboardType			nvarchar(30),
+	@UserId					INT,	
+	@PageNumber				INT = 1,
+	@TotalRecords			INT OUTPUT
+AS
+BEGIN
+	DECLARE @MaxPageNumber INT = 4
+	
+	IF @PageNumber > 4
+	BEGIN
+		SET @PageNumber = @MaxPageNumber
+	END
+		
+	DECLARE @FetchRows INT = 3
+	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
+	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
+
+	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
+	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
+
+	IF @dashboardType = 'popular-resources'
+	BEGIN
+		INSERT INTO @Resources	
+				SELECT TOP (@MaxRows) ra.ResourceId
+				,Count(ra.ResourceVersionId) ResourceActivityCount 
+				FROM resources.Resource r					
+				JOIN resources.ResourceVersion rv On rv.id = r.CurrentResourceVersionId AND rv.VersionStatusId = 2
+				JOIN activity.ResourceActivity ra ON ra.ResourceId = r.Id	
+				JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+				JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+				JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+				JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+				JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+				GROUP BY  ra.ResourceId
+				ORDER BY ResourceActivityCount DESC					
+		SELECT 
+			tr.ResourceId
+			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+				) AS ResourceReferenceID
+			,r.CurrentResourceVersionId AS ResourceVersionId
+			,r.ResourceTypeId AS ResourceTypeId
+			,rv.Title
+			,rv.Description
+			,CASE 
+				WHEN r.ResourceTypeId = 7	THEN				 
+				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				WHEN r.ResourceTypeId = 2	THEN				 
+				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				ELSE 
+				NULL
+				END  AS DurationInMilliseconds
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+			,cnv.Url AS Url
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+			,cnv.RestrictedAccess
+			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+			,ub.Id AS BookMarkId
+			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+			,rs.AverageRating
+			,rs.RatingCount
+		FROM @Resources tr
+		JOIN resources.Resource r ON r.id = tr.ResourceId
+		JOIN resources.resourceversion rv ON rv.ResourceId = r.Id	AND rv.id = r.CurrentResourceVersionId AND rv.Deleted = 0
+		JOIN resources.ResourceVersionRatingSummary rvrs ON r.CurrentResourceVersionId = rvrs.ResourceVersionId AND rvrs.Deleted = 0
+		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+		LEFT JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id
+		WHERE rv.VersionStatusId = 2	
+		ORDER BY tr.ResourceActivityCount DESC, rv.Title
+		OFFSET @OffsetRows ROWS
+		FETCH NEXT @FetchRows ROWS ONLY	
+
+		SELECT @TotalRecords = CASE WHEN COUNT(*)  > 12 THEN @MaxRows ELSE COUNT(*) END FROM @Resources
+	END
+	ELSE IF  @dashboardType = 'rated-resources'	
+	BEGIN
+			SELECT TOP(@MaxRows) r.Id AS ResourceId
+			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+				) AS ResourceReferenceID
+			,r.CurrentResourceVersionId AS ResourceVersionId
+			,r.ResourceTypeId AS ResourceTypeId
+			,rv.Title
+			,rv.Description
+			,CASE 
+				WHEN r.ResourceTypeId = 7	THEN				 
+				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				WHEN r.ResourceTypeId = 2	THEN				 
+				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				ELSE 
+				NULL
+				END  AS DurationInMilliseconds
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+			,cnv.Url AS Url
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+			,cnv.RestrictedAccess
+			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+			,ub.Id AS BookMarkId
+			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+			,rs.AverageRating
+			,rs.RatingCount
+		INTO #ratedresources
+		FROM Resources.Resource r
+		JOIN resources.resourceversion rv ON rv.ResourceId = r.Id	AND rv.id = r.CurrentResourceVersionId	AND rv.Deleted = 0
+		JOIN resources.ResourceVersionRatingSummary rvrs ON r.CurrentResourceVersionId = rvrs.ResourceVersionId AND rvrs.RatingCount > 0	
+		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+		INNER JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id
+		WHERE rv.VersionStatusId = 2	
+		ORDER BY rvrs.AverageRating DESC, rvrs.RatingCount DESC, rv.Title
+
+		SELECT rr.* FROM #ratedresources rr
+		ORDER BY rr.AverageRating DESC, rr.RatingCount DESC, rr.Title
+		OFFSET @OffsetRows ROWS
+		FETCH NEXT @FetchRows ROWS ONLY	
+
+		SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM #ratedresources
+	END
+	ELSE IF  @dashboardType = 'recent-resources'
+	BEGIN
+			SELECT TOP(@MaxRows) r.Id AS ResourceId
+			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+				) AS ResourceReferenceID
+			,r.CurrentResourceVersionId AS ResourceVersionId
+			,r.ResourceTypeId AS ResourceTypeId
+			,rv.Title
+			,rv.Description
+			,CASE 
+				WHEN r.ResourceTypeId = 7	THEN				 
+				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				WHEN r.ResourceTypeId = 2	THEN				 
+				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				ELSE 
+				NULL
+				END  AS DurationInMilliseconds
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+			,cnv.Url AS Url
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+			,cnv.RestrictedAccess
+			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+			,ub.Id AS BookMarkId
+			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+			,rs.AverageRating
+			,rs.RatingCount
+			INTO #recentresources
+		FROM Resources.Resource r
+		JOIN resources.resourceversion rv ON rv.ResourceId = r.Id	AND rv.id = r.CurrentResourceVersionId AND rv.Deleted = 0
+		JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+		JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+		INNER JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id
+		WHERE rv.VersionStatusId = 2
+		ORDER BY p.CreateDate DESC
+		
+		SELECT rr.* FROM #recentresources rr		
+		ORDER BY rr.ResourceVersionId DESC
+		OFFSET @OffsetRows ROWS
+		FETCH NEXT @FetchRows ROWS ONLY
+
+		SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM #recentresources
+	END
+	ELSE IF  @dashboardType = 'my-in-progress'
+	BEGIN
+	INSERT INTO @MyActivity					
+			SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
+				FROM 
+				(SELECT a.* FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity GROUP BY ResourceId) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id  order by a.Id desc OFFSET 0 ROWS) ra	
+				JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
+				JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
+				LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
+				LEFT JOIN [activity].[AssessmentResourceActivity] ara ON ara.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
+				LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
+				LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
+				WHERE ra.UserId = @UserId
+				AND (
+					 (r.ResourceTypeId IN (1, 5, 8, 9,10, 12) AND ra.ActivityStatusId <> 3)
+				    OR (r.ResourceTypeId IN (2, 7) AND (mar.Id IS NULL OR (mar.Id IS NOT NULL AND mar.PercentComplete < 100) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00'))
+					OR  (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status NOT IN (3, 5) AND (ra.ActivityStatusId NOT IN(3, 5))))
+					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 2) AND ((ara.Id IS NOT NULL AND ara.score < arv.PassMark) OR ra.ActivityStatusId IN (7))) 
+					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 1) AND ra.ActivityStatusId = 7) 
+					)		
+				GROUP BY ra.ResourceId	
+				ORDER BY ResourceActivityId DESC
+				
+		SELECT ma.ResourceActivityId, r.Id AS ResourceId
+			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+				) AS ResourceReferenceID
+			,r.CurrentResourceVersionId AS ResourceVersionId
+			,r.ResourceTypeId AS ResourceTypeId			
+			,rv.Title
+			,rv.Description
+			,CASE 
+				WHEN r.ResourceTypeId = 7	THEN				 
+				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				WHEN r.ResourceTypeId = 2	THEN				 
+				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				ELSE 
+				NULL
+				END  AS DurationInMilliseconds
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+			,cnv.Url AS Url
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+			,cnv.RestrictedAccess
+			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+			,ub.Id AS BookMarkId
+			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+			,rs.AverageRating
+			,rs.RatingCount
+		FROM @MyActivity ma 		
+		JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
+		JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0		
+		JOIN Resources.Resource r ON r.Id = rv.ResourceId
+		JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+		JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+		LEFT JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id
+		ORDER BY ma.ResourceActivityId DESC
+		OFFSET @OffsetRows ROWS
+		FETCH NEXT @FetchRows ROWS ONLY	
+
+		SELECT @TotalRecords = CASE WHEN COUNT(*)  > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
+	END
+	ELSE IF  @dashboardType IN ('my-recent-completed')
+	BEGIN	
+	INSERT INTO @MyActivity		
+			SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
+				FROM
+				(SELECT a.* FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity GROUP BY ResourceId ) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id  order by a.Id desc OFFSET 0 ROWS) ra					
+				JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
+				JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
+				LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
+				LEFT JOIN [activity].[AssessmentResourceActivity] ara ON ara.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
+				LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
+				LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
+				WHERE ra.UserId = @UserId
+				AND (					
+					 (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId IN (3) AND ((mar.Id IS NOT NULL AND mar.PercentComplete = 100) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00'))
+					OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status IN(3,5) OR (ra.ActivityStatusId IN(3, 5))))
+					OR (r.ResourceTypeId = 11 AND ara.Score >= arv.PassMark OR ra.ActivityStatusId IN( 3, 5))
+					OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId = 3))		
+				GROUP BY ra.ResourceId
+				ORDER BY ResourceActivityId DESC
+
+			SELECT r.Id AS ResourceId
+			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+				) AS ResourceReferenceID
+			,r.CurrentResourceVersionId AS ResourceVersionId
+			,r.ResourceTypeId AS ResourceTypeId
+			,rv.Title
+			,rv.Description
+			,CASE 
+				WHEN r.ResourceTypeId = 7	THEN				 
+				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				WHEN r.ResourceTypeId = 2	THEN				 
+				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+				ELSE 
+				NULL
+				END  AS DurationInMilliseconds
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+			,cnv.Url AS Url
+			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+			,cnv.RestrictedAccess
+			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+			,ub.Id AS BookMarkId
+			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+			,rs.AverageRating
+			,rs.RatingCount
+		FROM @MyActivity ma 		
+		JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
+		JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0		
+		JOIN Resources.Resource r ON r.Id = rv.ResourceId
+		JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+		JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+				FROM [resources].[ResourceReference] rr
+				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
+		LEFT JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id
+		ORDER BY ma.ResourceActivityId DESC, rv.Title
+		OFFSET @OffsetRows ROWS
+		FETCH NEXT @FetchRows ROWS ONLY	
+
+		SELECT @TotalRecords = CASE WHEN COUNT(*)  > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
+	END
+	ELSE IF  @dashboardType IN ('my-certificates')
+	BEGIN
+		EXEC [resources].[GetAchievedcertificatedResourcesWithOptionalPagination] @UserId = @UserId, @MaxRows= @MaxRows, @OffsetRows = @OffsetRows, @FetchRows = @FetchRows, @TotalRecords = @TotalRecords;
+	END
+	
+END
\ No newline at end of file

From b14e80ed954407f173d51be6fee150a81a6de80e Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Wed, 31 Jul 2024 16:10:04 +0100
Subject: [PATCH 047/143] backup will be removed later

---
 WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
index 54e29d468..e3732d660 100644
--- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
+++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
@@ -203,6 +203,7 @@
     <Build Include="Stored Procedures\Resources\GetRecentDashboardResources.sql" />
     <Build Include="Stored Procedures\Resources\GetMyInProgressDashboardResources.sql" />
     <Build Include="Stored Procedures\Resources\GetMyRecentCompletedDashboardResources.sql" />
+    <None Include="Stored Procedures\Resources\backup getdashboardresource previous changes.txt" />
   </ItemGroup>
   <ItemGroup>
     <RefactorLog Include="LearningHub.Nhs.Database.refactorlog" />

From bc3e0fc934e45c1aeb5141e830e1d169503d24ae Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Thu, 1 Aug 2024 09:22:31 +0100
Subject: [PATCH 048/143] fixes

---
 .../ContributeAssessmentSettings.vue              | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue
index 5a20df8ad..ab3a50bd0 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue
@@ -65,15 +65,14 @@
 
                         <div class="d-flex">
                             <div class="selection pr-50">
-                                <div>Provide guidance for the learner at the end of this assessment.</div>
-                                <EditSaveFieldWithCharacterCount   
-                                                                    v-model="assessmentDetails.endGuidance.blocks[0].title"
-                                                                    addEditLabel="title"
-                                                                    v-bind:characterLimit="60"
-                                                                    v-bind:isH3="true" />
-                                <ckeditorwithhint v-on:blur="setEndGuidance" 
+                                <div>Provide guidance for the learner at the end of this assessment. <i class="warningTriangle fas fa-exclamation-triangle warm-yellow"></i></div>
+                                <EditSaveFieldWithCharacterCount v-model="assessmentDetails.endGuidance.blocks[0].title"
+                                                                 addEditLabel="title"
+                                                                 v-bind:characterLimit="60"
+                                                                 v-bind:isH3="true" />
+                                <ckeditorwithhint v-on:blur="setEndGuidance"
                                                   v-on:inputValidity="setGuidanceValidity"
-                                                  :maxLength="1000" 
+                                                  :maxLength="1000"
                                                   :initialValue="endGuidance" />
                             </div>
                             <div class="tip">

From 4d29e9e0e7aabb02bd84c49683706cadbde9d6c3 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Thu, 1 Aug 2024 15:07:23 +0100
Subject: [PATCH 049/143] pre publish to update local db

---
 .../LearningHub.Nhs.Database.sqlproj          |   1 +
 ...ficatedResourcesWithOptionalPagination.sql |   1 +
 .../GetMyCertificatesDashboardResources.sql   |  79 ++------------
 .../backup getmy certificate resources.txt    | 101 ++++++++++++++++++
 4 files changed, 110 insertions(+), 72 deletions(-)
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getmy certificate resources.txt

diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
index e3732d660..936ae28f3 100644
--- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
+++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
@@ -204,6 +204,7 @@
     <Build Include="Stored Procedures\Resources\GetMyInProgressDashboardResources.sql" />
     <Build Include="Stored Procedures\Resources\GetMyRecentCompletedDashboardResources.sql" />
     <None Include="Stored Procedures\Resources\backup getdashboardresource previous changes.txt" />
+    <None Include="Stored Procedures\Resources\backup getmy certificate resources.txt" />
   </ItemGroup>
   <ItemGroup>
     <RefactorLog Include="LearningHub.Nhs.Database.refactorlog" />
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAchievedCertificatedResourcesWithOptionalPagination.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAchievedCertificatedResourcesWithOptionalPagination.sql
index 568fbc440..922480858 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAchievedCertificatedResourcesWithOptionalPagination.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetAchievedCertificatedResourcesWithOptionalPagination.sql	
@@ -8,6 +8,7 @@
 -------------------------------------------------------------------------------
 
 
+
 CREATE PROCEDURE [resources].[GetAchievedcertificatedResourcesWithOptionalPagination]
     @UserId INT,
 
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyCertificatesDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyCertificatesDashboardResources.sql
index b75e45860..7beec0594 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyCertificatesDashboardResources.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyCertificatesDashboardResources.sql	
@@ -6,6 +6,7 @@
 -- Modification History
 --
 -- 24 Jun 2024	OA	Initial Revision
+-- 31 Jun 2024  PT  Extracting functionality of certification with optional pagination so can be used on openapi and be single source of truth
 -------------------------------------------------------------------------------
 
 CREATE PROCEDURE [resources].[GetMyCertificatesDashboardResources]
@@ -25,77 +26,11 @@ BEGIN
 	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
 	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
 
-	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
-	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
+    EXEC [resources].[GetAchievedcertificatedResourcesWithOptionalPagination] 
+    @UserId = @UserId,
+    @MaxRows= @MaxRows,
+    @OffsetRows = @OffsetRows,
+    @FetchRows = @FetchRows,
+    @TotalRecords = @TotalRecords;
 
-    INSERT INTO @MyActivity					
-        SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
-            FROM
-            activity.ResourceActivity ra				
-            JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
-            JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
-            LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
-            LEFT JOIN [activity].[AssessmentResourceActivity] ara ON ara.ResourceActivityId = ra.Id
-            LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = ra.Id
-            LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
-            WHERE ra.UserId = @UserId AND rv.CertificateEnabled = 1
-            AND (					
-                    (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId = 3 OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00' OR mar.Id IS NOT NULL AND mar.PercentComplete = 100)
-                OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status IN(3,5) OR (ra.ActivityStatusId IN(3, 5))))
-                OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 2) AND (ara.Score >= arv.PassMark OR ra.ActivityStatusId IN(3, 5)))
-                OR ((r.ResourceTypeId = 11 AND arv.AssessmentType =1) AND (ara.Score >= arv.PassMark AND ra.ActivityStatusId IN(3, 5,7)))
-                OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId = 3))		
-            GROUP BY ra.ResourceId
-            ORDER BY ResourceActivityId DESC
-
-    SELECT r.Id AS ResourceId
-    ,(	SELECT TOP 1 rr.OriginalResourceReferenceId
-        FROM [resources].[ResourceReference] rr
-        JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-        WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
-        ) AS ResourceReferenceID
-    ,r.CurrentResourceVersionId AS ResourceVersionId
-    ,r.ResourceTypeId AS ResourceTypeId
-    ,rv.Title
-    ,rv.Description
-    ,CASE 
-        WHEN r.ResourceTypeId = 7	THEN				 
-            (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-        WHEN r.ResourceTypeId = 2	THEN				 
-        (SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-        ELSE 
-        NULL
-        END  AS DurationInMilliseconds
-    ,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
-    ,cnv.Url AS Url
-    ,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
-    ,cnv.RestrictedAccess
-    ,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
-    ,ub.Id AS BookMarkId
-    ,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
-    ,rvrs.AverageRating
-    ,rvrs.RatingCount
-FROM @MyActivity ma 		
-JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
-JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0	
-JOIN Resources.Resource r ON r.Id = rv.ResourceId
-JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
-JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
-JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
-JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
-JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
-JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
-JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
-LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
-        FROM [resources].[ResourceReference] rr
-        JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-        WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
-LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
-                FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
-                WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId		
-ORDER BY ma.ResourceActivityId DESC, rv.Title
-OFFSET @OffsetRows ROWS
-FETCH NEXT @FetchRows ROWS ONLY	
-
-    SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
 END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getmy certificate resources.txt b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getmy certificate resources.txt
new file mode 100644
index 000000000..b75e45860
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getmy certificate resources.txt	
@@ -0,0 +1,101 @@
+-------------------------------------------------------------------------------
+-- Author       OA
+-- Created      24 JUN 2024 Nov 2020
+-- Purpose      Break down the GetDashboardResources SP to smaller SP for a specific data type
+--
+-- Modification History
+--
+-- 24 Jun 2024	OA	Initial Revision
+-------------------------------------------------------------------------------
+
+CREATE PROCEDURE [resources].[GetMyCertificatesDashboardResources]
+	@UserId					INT,	
+	@PageNumber				INT = 1,
+	@TotalRecords			INT OUTPUT
+AS
+BEGIN
+	DECLARE @MaxPageNumber INT = 4
+	
+	IF @PageNumber > 4
+	BEGIN
+		SET @PageNumber = @MaxPageNumber
+	END
+		
+	DECLARE @FetchRows INT = 3
+	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
+	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
+
+	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
+	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
+
+    INSERT INTO @MyActivity					
+        SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
+            FROM
+            activity.ResourceActivity ra				
+            JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
+            JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
+            LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
+            LEFT JOIN [activity].[AssessmentResourceActivity] ara ON ara.ResourceActivityId = ra.Id
+            LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = ra.Id
+            LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
+            WHERE ra.UserId = @UserId AND rv.CertificateEnabled = 1
+            AND (					
+                    (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId = 3 OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00' OR mar.Id IS NOT NULL AND mar.PercentComplete = 100)
+                OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status IN(3,5) OR (ra.ActivityStatusId IN(3, 5))))
+                OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 2) AND (ara.Score >= arv.PassMark OR ra.ActivityStatusId IN(3, 5)))
+                OR ((r.ResourceTypeId = 11 AND arv.AssessmentType =1) AND (ara.Score >= arv.PassMark AND ra.ActivityStatusId IN(3, 5,7)))
+                OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId = 3))		
+            GROUP BY ra.ResourceId
+            ORDER BY ResourceActivityId DESC
+
+    SELECT r.Id AS ResourceId
+    ,(	SELECT TOP 1 rr.OriginalResourceReferenceId
+        FROM [resources].[ResourceReference] rr
+        JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+        WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
+        ) AS ResourceReferenceID
+    ,r.CurrentResourceVersionId AS ResourceVersionId
+    ,r.ResourceTypeId AS ResourceTypeId
+    ,rv.Title
+    ,rv.Description
+    ,CASE 
+        WHEN r.ResourceTypeId = 7	THEN				 
+            (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+        WHEN r.ResourceTypeId = 2	THEN				 
+        (SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
+        ELSE 
+        NULL
+        END  AS DurationInMilliseconds
+    ,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
+    ,cnv.Url AS Url
+    ,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
+    ,cnv.RestrictedAccess
+    ,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
+    ,ub.Id AS BookMarkId
+    ,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
+    ,rvrs.AverageRating
+    ,rvrs.RatingCount
+FROM @MyActivity ma 		
+JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
+JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0	
+JOIN Resources.Resource r ON r.Id = rv.ResourceId
+JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
+JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
+JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
+JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
+JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
+JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
+JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
+LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
+        FROM [resources].[ResourceReference] rr
+        JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
+        WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
+LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
+                FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
+                WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId		
+ORDER BY ma.ResourceActivityId DESC, rv.Title
+OFFSET @OffsetRows ROWS
+FETCH NEXT @FetchRows ROWS ONLY	
+
+    SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
+END
\ No newline at end of file

From 403f094ad07ac545c466b2366995cc9384d48866 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Thu, 1 Aug 2024 16:28:23 +0100
Subject: [PATCH 050/143] cleaning up

---
 .../LearningHub.Nhs.Database.sqlproj          |   2 -
 ... getdashboardresource previous changes.txt | 379 ------------------
 .../backup getmy certificate resources.txt    | 101 -----
 3 files changed, 482 deletions(-)
 delete mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getdashboardresource previous changes.txt
 delete mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getmy certificate resources.txt

diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
index 936ae28f3..54e29d468 100644
--- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
+++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
@@ -203,8 +203,6 @@
     <Build Include="Stored Procedures\Resources\GetRecentDashboardResources.sql" />
     <Build Include="Stored Procedures\Resources\GetMyInProgressDashboardResources.sql" />
     <Build Include="Stored Procedures\Resources\GetMyRecentCompletedDashboardResources.sql" />
-    <None Include="Stored Procedures\Resources\backup getdashboardresource previous changes.txt" />
-    <None Include="Stored Procedures\Resources\backup getmy certificate resources.txt" />
   </ItemGroup>
   <ItemGroup>
     <RefactorLog Include="LearningHub.Nhs.Database.refactorlog" />
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getdashboardresource previous changes.txt b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getdashboardresource previous changes.txt
deleted file mode 100644
index 7d55ced2c..000000000
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getdashboardresource previous changes.txt	
+++ /dev/null
@@ -1,379 +0,0 @@
--------------------------------------------------------------------------------
--- Author       HV
--- Created      18 Nov 2020
--- Purpose      Gets the resources to be displayed on dashboard
---
--- Modification History
---
--- 18 Nov 2020	HV	Initial Revision
--- 28 Apr 2021	KD	Added restricted access indication
--- 28 Jun 2021	DB	Fix to the join between Node & NodeVersion
--- 14 Nov 2022  RS  Fix to include resources located in catalogue subfolders
--- 16 Nov 2022  RS  FetchRows changes for progressive enhancement
--- 16 Mar 2023  RS  Added rating data
--- 28 Mar 2023  RS  Removed columns no longer used
--- 15 Jun 2023  RS  Re-added BadgeUrl column following design change
--- 27 Sep 2023  HV  Included Paging and user resource activity
--- 08 Nov 2023  OA  Fixed latest resource activity entry selection(with updated logic for media activities) and  status check for incomplete assessment.
--- 17 Jan 2024  SA  Changes to accomadate activity status changes
--- 27 Feb 2024  SS  Fixed missing In progress resources in the My Accessed Learning tray issue
--- 2 May 2024   SA  Fixed the issue on showing statuses on 'My accessed Learning' for resource type file
--- 13 May 2024  SA  TD-4115
--- 11 Jul 2024  PT  Extract certification logic to GetAchievedcertificatedResourcesWithOptionalPagination so logic can have one source of truth
--------------------------------------------------------------------------------
-
-CREATE PROCEDURE [resources].[GetDashboardResources]
-	@dashboardType			nvarchar(30),
-	@UserId					INT,	
-	@PageNumber				INT = 1,
-	@TotalRecords			INT OUTPUT
-AS
-BEGIN
-	DECLARE @MaxPageNumber INT = 4
-	
-	IF @PageNumber > 4
-	BEGIN
-		SET @PageNumber = @MaxPageNumber
-	END
-		
-	DECLARE @FetchRows INT = 3
-	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
-	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
-
-	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
-	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
-
-	IF @dashboardType = 'popular-resources'
-	BEGIN
-		INSERT INTO @Resources	
-				SELECT TOP (@MaxRows) ra.ResourceId
-				,Count(ra.ResourceVersionId) ResourceActivityCount 
-				FROM resources.Resource r					
-				JOIN resources.ResourceVersion rv On rv.id = r.CurrentResourceVersionId AND rv.VersionStatusId = 2
-				JOIN activity.ResourceActivity ra ON ra.ResourceId = r.Id	
-				JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
-				JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
-				JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
-				JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
-				JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
-				GROUP BY  ra.ResourceId
-				ORDER BY ResourceActivityCount DESC					
-		SELECT 
-			tr.ResourceId
-			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
-				FROM [resources].[ResourceReference] rr
-				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
-				) AS ResourceReferenceID
-			,r.CurrentResourceVersionId AS ResourceVersionId
-			,r.ResourceTypeId AS ResourceTypeId
-			,rv.Title
-			,rv.Description
-			,CASE 
-				WHEN r.ResourceTypeId = 7	THEN				 
-				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-				WHEN r.ResourceTypeId = 2	THEN				 
-				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-				ELSE 
-				NULL
-				END  AS DurationInMilliseconds
-			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
-			,cnv.Url AS Url
-			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
-			,cnv.RestrictedAccess
-			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
-			,ub.Id AS BookMarkId
-			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
-			,rs.AverageRating
-			,rs.RatingCount
-		FROM @Resources tr
-		JOIN resources.Resource r ON r.id = tr.ResourceId
-		JOIN resources.resourceversion rv ON rv.ResourceId = r.Id	AND rv.id = r.CurrentResourceVersionId AND rv.Deleted = 0
-		JOIN resources.ResourceVersionRatingSummary rvrs ON r.CurrentResourceVersionId = rvrs.ResourceVersionId AND rvrs.Deleted = 0
-		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
-		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
-		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
-		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
-		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
-		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
-				FROM [resources].[ResourceReference] rr
-				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
-		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
-						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
-						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
-		LEFT JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id
-		WHERE rv.VersionStatusId = 2	
-		ORDER BY tr.ResourceActivityCount DESC, rv.Title
-		OFFSET @OffsetRows ROWS
-		FETCH NEXT @FetchRows ROWS ONLY	
-
-		SELECT @TotalRecords = CASE WHEN COUNT(*)  > 12 THEN @MaxRows ELSE COUNT(*) END FROM @Resources
-	END
-	ELSE IF  @dashboardType = 'rated-resources'	
-	BEGIN
-			SELECT TOP(@MaxRows) r.Id AS ResourceId
-			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
-				FROM [resources].[ResourceReference] rr
-				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
-				) AS ResourceReferenceID
-			,r.CurrentResourceVersionId AS ResourceVersionId
-			,r.ResourceTypeId AS ResourceTypeId
-			,rv.Title
-			,rv.Description
-			,CASE 
-				WHEN r.ResourceTypeId = 7	THEN				 
-				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-				WHEN r.ResourceTypeId = 2	THEN				 
-				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-				ELSE 
-				NULL
-				END  AS DurationInMilliseconds
-			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
-			,cnv.Url AS Url
-			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
-			,cnv.RestrictedAccess
-			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
-			,ub.Id AS BookMarkId
-			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
-			,rs.AverageRating
-			,rs.RatingCount
-		INTO #ratedresources
-		FROM Resources.Resource r
-		JOIN resources.resourceversion rv ON rv.ResourceId = r.Id	AND rv.id = r.CurrentResourceVersionId	AND rv.Deleted = 0
-		JOIN resources.ResourceVersionRatingSummary rvrs ON r.CurrentResourceVersionId = rvrs.ResourceVersionId AND rvrs.RatingCount > 0	
-		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
-		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
-		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
-		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
-		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
-		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
-				FROM [resources].[ResourceReference] rr
-				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
-		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
-						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
-						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
-		INNER JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id
-		WHERE rv.VersionStatusId = 2	
-		ORDER BY rvrs.AverageRating DESC, rvrs.RatingCount DESC, rv.Title
-
-		SELECT rr.* FROM #ratedresources rr
-		ORDER BY rr.AverageRating DESC, rr.RatingCount DESC, rr.Title
-		OFFSET @OffsetRows ROWS
-		FETCH NEXT @FetchRows ROWS ONLY	
-
-		SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM #ratedresources
-	END
-	ELSE IF  @dashboardType = 'recent-resources'
-	BEGIN
-			SELECT TOP(@MaxRows) r.Id AS ResourceId
-			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
-				FROM [resources].[ResourceReference] rr
-				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
-				) AS ResourceReferenceID
-			,r.CurrentResourceVersionId AS ResourceVersionId
-			,r.ResourceTypeId AS ResourceTypeId
-			,rv.Title
-			,rv.Description
-			,CASE 
-				WHEN r.ResourceTypeId = 7	THEN				 
-				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-				WHEN r.ResourceTypeId = 2	THEN				 
-				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-				ELSE 
-				NULL
-				END  AS DurationInMilliseconds
-			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
-			,cnv.Url AS Url
-			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
-			,cnv.RestrictedAccess
-			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
-			,ub.Id AS BookMarkId
-			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
-			,rs.AverageRating
-			,rs.RatingCount
-			INTO #recentresources
-		FROM Resources.Resource r
-		JOIN resources.resourceversion rv ON rv.ResourceId = r.Id	AND rv.id = r.CurrentResourceVersionId AND rv.Deleted = 0
-		JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
-		JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
-		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
-		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
-		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
-		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
-		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
-		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
-				FROM [resources].[ResourceReference] rr
-				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
-		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
-						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
-						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
-		INNER JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id
-		WHERE rv.VersionStatusId = 2
-		ORDER BY p.CreateDate DESC
-		
-		SELECT rr.* FROM #recentresources rr		
-		ORDER BY rr.ResourceVersionId DESC
-		OFFSET @OffsetRows ROWS
-		FETCH NEXT @FetchRows ROWS ONLY
-
-		SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM #recentresources
-	END
-	ELSE IF  @dashboardType = 'my-in-progress'
-	BEGIN
-	INSERT INTO @MyActivity					
-			SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
-				FROM 
-				(SELECT a.* FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity GROUP BY ResourceId) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id  order by a.Id desc OFFSET 0 ROWS) ra	
-				JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
-				JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
-				LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
-				LEFT JOIN [activity].[AssessmentResourceActivity] ara ON ara.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
-				LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
-				LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
-				WHERE ra.UserId = @UserId
-				AND (
-					 (r.ResourceTypeId IN (1, 5, 8, 9,10, 12) AND ra.ActivityStatusId <> 3)
-				    OR (r.ResourceTypeId IN (2, 7) AND (mar.Id IS NULL OR (mar.Id IS NOT NULL AND mar.PercentComplete < 100) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00'))
-					OR  (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status NOT IN (3, 5) AND (ra.ActivityStatusId NOT IN(3, 5))))
-					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 2) AND ((ara.Id IS NOT NULL AND ara.score < arv.PassMark) OR ra.ActivityStatusId IN (7))) 
-					OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 1) AND ra.ActivityStatusId = 7) 
-					)		
-				GROUP BY ra.ResourceId	
-				ORDER BY ResourceActivityId DESC
-				
-		SELECT ma.ResourceActivityId, r.Id AS ResourceId
-			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
-				FROM [resources].[ResourceReference] rr
-				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
-				) AS ResourceReferenceID
-			,r.CurrentResourceVersionId AS ResourceVersionId
-			,r.ResourceTypeId AS ResourceTypeId			
-			,rv.Title
-			,rv.Description
-			,CASE 
-				WHEN r.ResourceTypeId = 7	THEN				 
-				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-				WHEN r.ResourceTypeId = 2	THEN				 
-				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-				ELSE 
-				NULL
-				END  AS DurationInMilliseconds
-			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
-			,cnv.Url AS Url
-			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
-			,cnv.RestrictedAccess
-			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
-			,ub.Id AS BookMarkId
-			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
-			,rs.AverageRating
-			,rs.RatingCount
-		FROM @MyActivity ma 		
-		JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
-		JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0		
-		JOIN Resources.Resource r ON r.Id = rv.ResourceId
-		JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
-		JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
-		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
-		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
-		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
-		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
-		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
-		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
-				FROM [resources].[ResourceReference] rr
-				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
-		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
-						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
-						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
-		LEFT JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id
-		ORDER BY ma.ResourceActivityId DESC
-		OFFSET @OffsetRows ROWS
-		FETCH NEXT @FetchRows ROWS ONLY	
-
-		SELECT @TotalRecords = CASE WHEN COUNT(*)  > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
-	END
-	ELSE IF  @dashboardType IN ('my-recent-completed')
-	BEGIN	
-	INSERT INTO @MyActivity		
-			SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
-				FROM
-				(SELECT a.* FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity GROUP BY ResourceId ) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id  order by a.Id desc OFFSET 0 ROWS) ra					
-				JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
-				JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
-				LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
-				LEFT JOIN [activity].[AssessmentResourceActivity] ara ON ara.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
-				LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = COALESCE(ra.LaunchResourceActivityId, ra.Id)
-				LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
-				WHERE ra.UserId = @UserId
-				AND (					
-					 (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId IN (3) AND ((mar.Id IS NOT NULL AND mar.PercentComplete = 100) OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00'))
-					OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status IN(3,5) OR (ra.ActivityStatusId IN(3, 5))))
-					OR (r.ResourceTypeId = 11 AND ara.Score >= arv.PassMark OR ra.ActivityStatusId IN( 3, 5))
-					OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId = 3))		
-				GROUP BY ra.ResourceId
-				ORDER BY ResourceActivityId DESC
-
-			SELECT r.Id AS ResourceId
-			,(	SELECT TOP 1 rr.OriginalResourceReferenceId
-				FROM [resources].[ResourceReference] rr
-				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
-				) AS ResourceReferenceID
-			,r.CurrentResourceVersionId AS ResourceVersionId
-			,r.ResourceTypeId AS ResourceTypeId
-			,rv.Title
-			,rv.Description
-			,CASE 
-				WHEN r.ResourceTypeId = 7	THEN				 
-				 (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-				WHEN r.ResourceTypeId = 2	THEN				 
-				(SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-				ELSE 
-				NULL
-				END  AS DurationInMilliseconds
-			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
-			,cnv.Url AS Url
-			,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
-			,cnv.RestrictedAccess
-			,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
-			,ub.Id AS BookMarkId
-			,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
-			,rs.AverageRating
-			,rs.RatingCount
-		FROM @MyActivity ma 		
-		JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
-		JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0		
-		JOIN Resources.Resource r ON r.Id = rv.ResourceId
-		JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
-		JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
-		JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
-		JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
-		JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
-		JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
-		JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
-		LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
-				FROM [resources].[ResourceReference] rr
-				JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-				WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
-		LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
-						FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
-						WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId
-		LEFT JOIN resources.ResourceVersionRatingSummary rs ON rs.ResourceVersionId = rv.Id
-		ORDER BY ma.ResourceActivityId DESC, rv.Title
-		OFFSET @OffsetRows ROWS
-		FETCH NEXT @FetchRows ROWS ONLY	
-
-		SELECT @TotalRecords = CASE WHEN COUNT(*)  > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
-	END
-	ELSE IF  @dashboardType IN ('my-certificates')
-	BEGIN
-		EXEC [resources].[GetAchievedcertificatedResourcesWithOptionalPagination] @UserId = @UserId, @MaxRows= @MaxRows, @OffsetRows = @OffsetRows, @FetchRows = @FetchRows, @TotalRecords = @TotalRecords;
-	END
-	
-END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getmy certificate resources.txt b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getmy certificate resources.txt
deleted file mode 100644
index b75e45860..000000000
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/backup getmy certificate resources.txt	
+++ /dev/null
@@ -1,101 +0,0 @@
--------------------------------------------------------------------------------
--- Author       OA
--- Created      24 JUN 2024 Nov 2020
--- Purpose      Break down the GetDashboardResources SP to smaller SP for a specific data type
---
--- Modification History
---
--- 24 Jun 2024	OA	Initial Revision
--------------------------------------------------------------------------------
-
-CREATE PROCEDURE [resources].[GetMyCertificatesDashboardResources]
-	@UserId					INT,	
-	@PageNumber				INT = 1,
-	@TotalRecords			INT OUTPUT
-AS
-BEGIN
-	DECLARE @MaxPageNumber INT = 4
-	
-	IF @PageNumber > 4
-	BEGIN
-		SET @PageNumber = @MaxPageNumber
-	END
-		
-	DECLARE @FetchRows INT = 3
-	DECLARE @MaxRows INT = @MaxPageNUmber * @FetchRows
-	DECLARE @OffsetRows INT = (@PageNumber - 1) * @FetchRows
-
-	DECLARE @MyActivity TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityId [int] NOT NULL);
-	DECLARE @Resources TABLE (ResourceId [int] NOT NULL PRIMARY KEY, ResourceActivityCount [int] NOT NULL);
-
-    INSERT INTO @MyActivity					
-        SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
-            FROM
-            activity.ResourceActivity ra				
-            JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
-            JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
-            LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId
-            LEFT JOIN [activity].[AssessmentResourceActivity] ara ON ara.ResourceActivityId = ra.Id
-            LEFT JOIN [activity].[MediaResourceActivity] mar ON mar.ResourceActivityId = ra.Id
-            LEFT JOIN [activity].[ScormActivity] sa ON sa.ResourceActivityId = ra.Id
-            WHERE ra.UserId = @UserId AND rv.CertificateEnabled = 1
-            AND (					
-                    (r.ResourceTypeId IN (2, 7) AND ra.ActivityStatusId = 3 OR ra.ActivityStart < '2020-09-07 00:00:00 +00:00' OR mar.Id IS NOT NULL AND mar.PercentComplete = 100)
-                OR (r.ResourceTypeId = 6 AND (sa.CmiCoreLesson_status IN(3,5) OR (ra.ActivityStatusId IN(3, 5))))
-                OR ((r.ResourceTypeId = 11 AND arv.AssessmentType = 2) AND (ara.Score >= arv.PassMark OR ra.ActivityStatusId IN(3, 5)))
-                OR ((r.ResourceTypeId = 11 AND arv.AssessmentType =1) AND (ara.Score >= arv.PassMark AND ra.ActivityStatusId IN(3, 5,7)))
-                OR (r.ResourceTypeId IN (1, 5, 8, 9, 10, 12) AND ra.ActivityStatusId = 3))		
-            GROUP BY ra.ResourceId
-            ORDER BY ResourceActivityId DESC
-
-    SELECT r.Id AS ResourceId
-    ,(	SELECT TOP 1 rr.OriginalResourceReferenceId
-        FROM [resources].[ResourceReference] rr
-        JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-        WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0
-        ) AS ResourceReferenceID
-    ,r.CurrentResourceVersionId AS ResourceVersionId
-    ,r.ResourceTypeId AS ResourceTypeId
-    ,rv.Title
-    ,rv.Description
-    ,CASE 
-        WHEN r.ResourceTypeId = 7	THEN				 
-            (SELECT vrv.DurationInMilliseconds from  [resources].[VideoResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-        WHEN r.ResourceTypeId = 2	THEN				 
-        (SELECT vrv.DurationInMilliseconds from  [resources].[AudioResourceVersion] vrv WHERE vrv.[ResourceVersionId] = r.CurrentResourceVersionId)
-        ELSE 
-        NULL
-        END  AS DurationInMilliseconds
-    ,CASE WHEN n.id = 1 THEN NULL ELSE cnv.Name END AS CatalogueName
-    ,cnv.Url AS Url
-    ,CASE WHEN n.id = 1 THEN NULL ELSE cnv.BadgeUrl END AS BadgeUrl
-    ,cnv.RestrictedAccess
-    ,CAST(CASE WHEN cnv.RestrictedAccess = 1 AND auth.CatalogueNodeId IS NULL THEN 0 ELSE 1 END AS bit) AS HasAccess
-    ,ub.Id AS BookMarkId
-    ,CAST(ISNULL(ub.[Deleted], 1) ^ 1 AS BIT) AS IsBookmarked
-    ,rvrs.AverageRating
-    ,rvrs.RatingCount
-FROM @MyActivity ma 		
-JOIN activity.ResourceActivity ra ON ra.id = ma.ResourceActivityId
-JOIN resources.resourceversion rv ON rv.id = ra.ResourceVersionId AND rv.Deleted = 0	
-JOIN Resources.Resource r ON r.Id = rv.ResourceId
-JOIN hierarchy.Publication p ON rv.PublicationId = p.Id AND p.Deleted = 0
-JOIN resources.ResourceVersionRatingSummary rvrs ON rv.Id = rvrs.ResourceVersionId	AND rvrs.Deleted = 0
-JOIN hierarchy.NodeResource nr ON r.Id = nr.ResourceId AND nr.Deleted = 0
-JOIN hierarchy.Node n ON n.Id = nr.NodeId AND n.Hidden = 0 AND n.Deleted = 0
-JOIN hierarchy.NodePath np ON np.NodeId = n.Id AND np.Deleted = 0 AND np.IsActive = 1
-JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.CatalogueNodeId	AND nv.VersionStatusId = 2 AND nv.Deleted = 0
-JOIN hierarchy.CatalogueNodeVersion cnv ON cnv.NodeVersionId = nv.Id AND cnv.Deleted = 0
-LEFT JOIN hub.UserBookmark ub ON ub.UserId = @UserId AND ub.ResourceReferenceId = (SELECT TOP 1 rr.OriginalResourceReferenceId
-        FROM [resources].[ResourceReference] rr
-        JOIN hierarchy.NodePath np on np.id = rr.NodePathId and np.NodeId = n.Id and np.Deleted = 0
-        WHERE rr.ResourceId = rv.ResourceId AND rr.Deleted = 0)
-LEFT JOIN (  SELECT DISTINCT CatalogueNodeId 
-                FROM [hub].[RoleUserGroupView] rug JOIN hub.UserUserGroup uug ON rug.UserGroupId = uug.UserGroupId
-                WHERE rug.ScopeTypeId = 1 and rug.RoleId in (1,2,3) and uug.Deleted = 0 and uug.UserId = @userId) auth ON n.Id = auth.CatalogueNodeId		
-ORDER BY ma.ResourceActivityId DESC, rv.Title
-OFFSET @OffsetRows ROWS
-FETCH NEXT @FetchRows ROWS ONLY	
-
-    SELECT @TotalRecords = CASE WHEN COUNT(*) > 12 THEN @MaxRows ELSE COUNT(*) END FROM @MyActivity
-END
\ No newline at end of file

From e6d99722acccee8ba28692368b6eca93ae4b337b Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Fri, 2 Aug 2024 14:35:55 +0100
Subject: [PATCH 051/143] Add more spaces

---
 .../Account/CreateAccountConfirmation.cshtml     | 16 ++++++++--------
 .../Views/MyAccount/Index.cshtml                 |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml
index 5c7601144..31cccd1b5 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml
@@ -33,7 +33,7 @@
 
                         <dd class="nhsuk-summary-list__actions">
                             <a asp-action="CreateAccountPersonalDetails" asp-route-returnToConfirmation="true">
-                                Change<span class="nhsuk-u-visually-hidden"> name</span>
+                                Change<span class="nhsuk-u-visually-hidden">&nbsp;name</span>
                             </a>
 
                         </dd>
@@ -51,7 +51,7 @@
                         <dd class="nhsuk-summary-list__actions">
 
                             <a asp-action="CreateAccountEmailVerification" asp-route-returnToConfirmation="true">
-                                Change<span class="nhsuk-u-visually-hidden"> email</span>
+                                Change<span class="nhsuk-u-visually-hidden">&nbsp;email</span>
                             </a>
 
                         </dd>
@@ -69,7 +69,7 @@
                         <dd class="nhsuk-summary-list__actions">
 
                             <a asp-action="CreateAccountPersonalDetails" asp-route-returnToConfirmation="true">
-                                Change<span class="nhsuk-u-visually-hidden"> email</span>
+                                Change<span class="nhsuk-u-visually-hidden">&nbsp;email</span>
                             </a>
 
                         </dd>
@@ -87,7 +87,7 @@
                         <dd class="nhsuk-summary-list__actions @(Model.AccountCreationViewModel.CountryId == "1"? "no-bottom-border":string.Empty)">
 
                             <a asp-action="CreateAccountCountrySelection" asp-route-filterText="@Model.Country" asp-route-returnToConfirmation="true">
-                                Change<span class="nhsuk-u-visually-hidden"> country</span>
+                                Change<span class="nhsuk-u-visually-hidden">&nbsp;country</span>
                             </a>
 
                         </dd>
@@ -123,7 +123,7 @@
                         <dd class="nhsuk-summary-list__actions no-bottom-border">
 
                             <a asp-action="CreateAccountCurrentRole" asp-route-CurrentRole="@Model.AccountCreationViewModel.CurrentRole" asp-route-returnToConfirmation="true">
-                                Change<span class="nhsuk-u-visually-hidden"> role</span>
+                                Change<span class="nhsuk-u-visually-hidden">&nbsp;role</span>
                             </a>
 
                         </dd>
@@ -173,7 +173,7 @@
                             <dd class="nhsuk-summary-list__actions">
 
                                 <a asp-action="CreateAccountPrimarySpecialtySelection" asp-route-filterText="@Model.Specialty" asp-route-returnToConfirmation="true">
-                                    Change<span class="nhsuk-u-visually-hidden"> primary specialty</span>
+                                    Change<span class="nhsuk-u-visually-hidden">&nbsp;primary specialty</span>
                                 </a>
 
                             </dd>
@@ -190,7 +190,7 @@
                             <dd class="nhsuk-summary-list__actions">
 
                                 <a asp-action="CreateAccountWorkStartDate" asp-route-PrimarySpecialtyId="@Model.AccountCreationViewModel.PrimarySpecialtyId" asp-route-returnToConfirmation="true">
-                                    Change<span class="nhsuk-u-visually-hidden"> start date</span>
+                                    Change<span class="nhsuk-u-visually-hidden">&nbsp;start date</span>
                                 </a>
 
                             </dd>
@@ -207,7 +207,7 @@
                             <dd class="nhsuk-summary-list__actions">
 
                                 <a asp-action="CreateAccountWorkPlace" asp-route-returnToConfirmation="true">
-                                    Change<span class="nhsuk-u-visually-hidden"> place of work</span>
+                                    Change<span class="nhsuk-u-visually-hidden">&nbsp;place of work</span>
                                 </a>
 
                             </dd>
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml
index d9677b2d5..66ba73c5f 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml
@@ -53,7 +53,7 @@
 
                 <dd class="nhsuk-summary-list__actions">
                     <a asp-action="ChangeFirstName">
-                        Change <span class="nhsuk-u-visually-hidden">first name</span>
+                        Change<span class="nhsuk-u-visually-hidden">&nbsp;first name</span>
                     </a>
 
                 </dd>

From 9c14763a417cd30486703218527b0db37095e1a2 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Fri, 2 Aug 2024 15:20:22 +0100
Subject: [PATCH 052/143] TD-4430 :
 Issue-when-adding-duplicate-keywords-on-Keywords-section-when-contributing-resources-and-on-Admin-section

---
 .../Views/Catalogue/Edit.cshtml               | 16 ++++++++++++++
 .../components/KeyWordsEditor.vue             | 16 +++++++-------
 .../vuesrc/contribute/ContentCommon.vue       | 21 +++++++++++--------
 .../ResourceService.cs                        |  3 ++-
 4 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
index e0e81edcf..629e03c7c 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
@@ -162,6 +162,11 @@
             <span class="input-validation-error keyword-maxlength" style="display: none;">The maximum length is 50 characters.</span>
           </div>
         </div>
+        <div class="row">
+          <div class="col-12">
+            <span id="keyword-error-span" class="field-validation-error" style="display: none;"></span>
+          </div>
+        </div>
 
       </div>
       <div class="col-12">
@@ -341,6 +346,9 @@
         } else {
           $('#add-keyword').removeAttr('disabled');
         }
+
+        $('#keyword-error-span').hide();
+        $('#keyword-error-span').html('');
       });
 
       $('#add-keyword').on('click', function () {
@@ -355,6 +363,8 @@
           return item.trim();
         });
 
+        var duplicateKeywords = [];
+        $('#keyword-error-span').hide();
         values.forEach(function (value) {
           if (value && keywords.indexOf(value) === -1) {
             keywords.push(value);
@@ -368,6 +378,12 @@
               $(x).attr('name', "Keywords[" + i + "]");
             });
           }
+          else
+          {
+            duplicateKeywords.push(value);
+            $('#keyword-error-span').show();
+            $('#keyword-error-span').html('The keyword(s) have already been added : ' + duplicateKeywords.join(', '))
+          }
         });
 
         $keywordInput.val("");      
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
index bfc00c5aa..38c9c50c7 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
@@ -4,7 +4,7 @@
         <div class="row">
             <div class="form-group" v-bind:class="{ 'input-validation-error': keywordError }">
                 <div class="col-12 mb-0 error-text" v-if="keywordError">
-                    <span class="text-danger">This keyword has already been added.</span>
+                    <span class="text-danger">The keyword(s) have already been added : {{formattedkeywordErrorMessage}}</span>
                 </div>
                 <div class="col-12 mb-0 error-text" v-if="keywordLengthExceeded">
                     <span class="text-danger">
@@ -60,6 +60,7 @@
                 newKeyword: '',
                 keywordError: false,
                 keywordLengthExceeded: false,
+                keywordErrorMessage: []
             }
         },
         computed: {
@@ -69,17 +70,20 @@
             newKeywordTrimmed(): string {
                 return this.newKeyword?.trim().replace(/ +(?= )/g, '').toLowerCase();
             },
+            formattedkeywordErrorMessage(): string {
+                return this.keywordErrorMessage.join(', ');
+            },
         },
         methods: {
             keywordChange() {
                 this.keywordError = false;
                 this.keywordLengthExceeded = false;
+                this.keywordErrorMessage = [];
             },
             async addKeyword() {  
                 if (this.newKeyword && this.newKeywordTrimmed.length > 0) {
                     let allTrimmedKeyword = this.newKeywordTrimmed.toLowerCase().split(',');
                     allTrimmedKeyword = allTrimmedKeyword.filter(e => String(e).trim());
-                    if (!this.resourceDetails.resourceKeywords.find(_keyword => allTrimmedKeyword.includes(_keyword.keyword.toLowerCase()))) {
                         for (var i = 0; i < allTrimmedKeyword.length; i++) {
                             let item = allTrimmedKeyword[i];
                             if (item.length > 0 && item.length <= 50) {
@@ -90,8 +94,10 @@
                                 newKeywordObj = await resourceData.addKeyword(this.resourceVersionId, newKeywordObj);
                                 if (newKeywordObj.id > 0) {
                                     this.resourceDetails.resourceKeywords.push(newKeywordObj);
-                                    this.keywordError = false;
                                     this.newKeyword = '';
+                                } else if (newKeywordObj.id == 0) {
+                                    this.keywordError = true;
+                                    this.keywordErrorMessage.push(item);
                                 }
                                 else {
                                     this.keywordError = true;
@@ -103,10 +109,6 @@
                                 this.keywordLengthExceeded = true;
                             }
                         }
-                    }                    
-                    else {
-                        this.keywordError = true;
-                    }
                 }
             },
             async deleteKeyword(keywordId: number) {
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
index 3741814d3..2f1f07809 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
@@ -84,7 +84,7 @@
         <div class="row">
             <div class="form-group" v-bind:class="{ 'input-validation-error': keywordError }">
                 <div class="col-12 mb-0 error-text" v-if="keywordError">
-                    <span class="text-danger">This keyword has already been added.</span>
+                    <span class="text-danger">The keyword(s) have already been added : {{formattedkeywordErrorMessage}}</span>
                 </div>
                 <div class="col-12 mb-0 error-text" v-if="keywordLengthExceeded">
                     <span class="text-danger">
@@ -292,6 +292,7 @@
                 ResourceType,
                 resourceProviderId: null,
                 keywordLengthExceeded: false,
+                keywordErrorMessage:[]
             };
         },
         computed: {
@@ -340,6 +341,9 @@
                     return this.$store.state.userProviders.length > 0;
                 }
             },
+            formattedkeywordErrorMessage(): string {
+                return this.keywordErrorMessage.join(', ');
+            },
         },
         created() {
             this.setInitialValues();
@@ -485,6 +489,7 @@
                 keywordChange() {
                     this.keywordError = false;
                     this.keywordLengthExceeded = false;
+                    this.keywordErrorMessage = [];
                 },
                 resetSelectedLicence() {
                     this.resourceLicenceId = 0;
@@ -534,7 +539,6 @@
                     if (this.newKeyword && this.newKeywordTrimmed.length > 0) {
                         let allTrimmedKeyword = this.newKeywordTrimmed.toLowerCase().split(',');
                         allTrimmedKeyword = allTrimmedKeyword.filter(e => String(e).trim());
-                        if (!this.keywords.find(_keyword => allTrimmedKeyword.includes(_keyword.keyword.toLowerCase()))) {
                             for (var i = 0; i < allTrimmedKeyword.length; i++) {
                                 let item = allTrimmedKeyword[i];
                                 if (item.length > 0 && item.length <= 50) {
@@ -548,22 +552,21 @@
                                         if (this.resourceDetail.resourceVersionId == 0) {
                                             this.$store.commit('setResourceVersionId', newkeywordObj.resourceVersionId)
                                         }
-                                        this.keywordError = false;
                                         this.newKeyword = '';
-                                    } else {
+                                    } else if (newkeywordObj.id == 0) {
                                         this.keywordError = true;
-                                        break;
+                                        this.keywordErrorMessage.push(item);
                                     }
+                                    else {
+                                        this.keywordError = true;
+                                        break;
+                                }
                                 }
                                 else {
                                     this.keywordLengthExceeded = true;
                                     break;
                                 }
                             }
-                        }
-                        else {
-                            this.keywordError = true;
-                        }
                     }
                     else {
                         this.newKeyword = '';
diff --git a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
index 808bd8448..76d8df791 100644
--- a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
@@ -1772,7 +1772,8 @@ public async Task<LearningHubValidationResult> AddResourceVersionKeywordAsync(Re
             bool doesKeywordAlreadyExist = await this.resourceVersionKeywordRepository.DoesResourceVersionKeywordAlreadyExistAsync(rvk.ResourceVersionId, rvk.Keyword);
             if (doesKeywordAlreadyExist)
             {
-                return new LearningHubValidationResult(false, "This keyword has already been added.");
+                retVal.CreatedId = 0;
+                return retVal;
             }
 
             retVal.CreatedId = await this.resourceVersionKeywordRepository.CreateAsync(userId, rvk);

From db19ab29f87913c3118c151b7df372aa6eced104 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Mon, 5 Aug 2024 00:02:03 +0100
Subject: [PATCH 053/143] Correct placeholder contrast for firefox

---
 LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss
index 3bd13c109..ee83dfca6 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss
@@ -104,6 +104,10 @@
 .nhsuk-header__search {
     .nhsuk-search__input {
         width: px2rem(260);
+
+        &::-moz-placeholder {
+            opacity: 1;
+        }
     }
 
     #search > label.nhsuk-u-visually-hidden {

From 35c510c313000458a6ff9480602595bd38e9ceb5 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Mon, 5 Aug 2024 00:42:47 +0100
Subject: [PATCH 054/143] Constraint text within dom element boundaries

---
 LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss
index 3bd13c109..7957cb709 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/layout.scss
@@ -1,6 +1,10 @@
 @use "../abstracts/all" as *;
 @use "nhsuk" as *;
 
+body {
+    overflow-wrap: break-word;
+}
+
 .nhsuk-header {
     padding: 0 px2rem(32);
 }

From f08aa232d740836172229965014cea0762cc835d Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Thu, 8 Aug 2024 09:14:48 +0100
Subject: [PATCH 055/143] Apply NHS design system focus highlight style to the
 button and replace the button style with NHS Secondary Button

---
 LearningHub.Nhs.WebUI/Scripts/vuesrc/roadmap/roadmap.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/roadmap/roadmap.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/roadmap/roadmap.vue
index 21307a74e..e463627f7 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/roadmap/roadmap.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/roadmap/roadmap.vue
@@ -8,7 +8,7 @@
         </div>
         <div class="load-more" v-if="roadMapResult && roadMapResult.roadMapItems &&  roadMapResult.roadMapItems.length <  roadMapResult.totalRecords">
             <div class="mt-40">
-                <button class="btn btn-outline-custom" @click="loadUpdates()">{{ getLoadMoreText() }}</button>
+                <button class="nhsuk-button nhsuk-button--secondary" @click="loadUpdates()">{{ getLoadMoreText() }}</button>
             </div>
         </div>
     </div>

From 16242ce7d69d482328be6609e00375a9211dbf7a Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Tue, 13 Aug 2024 13:41:29 +0100
Subject: [PATCH 056/143] Correct search button focus styling

---
 .../Styles/nhsuk/pages/createaccount.scss              | 10 ++++++++++
 .../Styles/nhsuk/pages/mylearning.scss                 | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/createaccount.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/createaccount.scss
index 85f514e15..8e4fc0b4f 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/createaccount.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/createaccount.scss
@@ -48,6 +48,16 @@
         width: 52px;
         padding-top: 0;
 
+        &:focus {
+            background-color: #ffeb3b;
+            border: 0;
+            box-shadow: 0 4px 0 0 #212b32;
+            color: #212b32;
+            outline: 4px solid rgba(0,0,0,0);
+            outline-offset: 4px;
+            box-shadow: 0 -2px #ffeb3b,0 4px #212b32
+        }
+
         span.nhsuk-u-visually-hidden {
             color: $nhsuk-white;
         }
diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/mylearning.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/mylearning.scss
index 26b854a14..bebb4e2f8 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/mylearning.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/mylearning.scss
@@ -67,6 +67,16 @@
         display: block;
         height: 40px;
         width: 44px;
+
+        &:focus {
+            background-color: #ffeb3b;
+            border: 0;
+            box-shadow: 0 4px 0 0 #212b32;
+            color: #212b32;
+            outline: 4px solid rgba(0,0,0,0);
+            outline-offset: 4px;
+            box-shadow: 0 -2px #ffeb3b,0 4px #212b32
+        }
     }
 
 

From 699d9d23779b2c5db6d73b84def0ee2c55e400f1 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Fri, 23 Aug 2024 15:13:50 +0100
Subject: [PATCH 057/143] Correct page  of  the following pages "Summary List,
 Notifications, My Bookmarks, My account"

---
 .../Scripts/vuesrc/notification/notifications.vue              | 2 +-
 .../Views/Account/CreateAccountConfirmation.cshtml             | 3 +--
 LearningHub.Nhs.WebUI/Views/Bookmark/Index.cshtml              | 2 +-
 LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml             | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notifications.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notifications.vue
index 90a19a1e1..8801a8eb5 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notifications.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notifications.vue
@@ -2,7 +2,7 @@
     <div class="lh-padding-fluid bg-white">
         <div class="notifications-panel lh-container-xl">
             <div :class="[showMessage ? 'd-none' : 'd-block', 'nhsuk-u-margin-top-7 nhsuk-u-margin-bottom-7']">
-                <h1>Notifications</h1>
+                <h1>System Notifications</h1>
                 <notification ref="priorityNotification"
                               :priorityType="this.NotificationPriority.Priority"
                               :showContent="this.showPriorityContent"
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml
index 5c7601144..31121ac4f 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml
@@ -19,8 +19,7 @@
                 {
                     <vc:error-summary order-of-property-names="@(new[] { nameof(Model) })" />
                 }
-                <h1 class="nhsuk-heading-xl">Summary list</h1>
-                <h2 class="nhsuk-heading-l">Check your details</h2>
+                <h1 class="nhsuk-heading-xl">Check your details</h1>
                 <dl class="nhsuk-summary-list">
 
                     <div class="nhsuk-summary-list__row">
diff --git a/LearningHub.Nhs.WebUI/Views/Bookmark/Index.cshtml b/LearningHub.Nhs.WebUI/Views/Bookmark/Index.cshtml
index 9174cccd9..95edf55ba 100644
--- a/LearningHub.Nhs.WebUI/Views/Bookmark/Index.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Bookmark/Index.cshtml
@@ -30,7 +30,7 @@
     <div class="nhsuk-width-container app-width-container nhsuk-u-padding-bottom-9">
         <vc:back-link asp-controller="Home" asp-action="Index" link-text="Back to: Learning Hub" />
 
-        <h1>My bookmarks</h1>
+        <h1>Bookmarked learning</h1>
 
         <div class="nhsuk-grid-row">
             <div class="nhsuk-grid-column-full">
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml
index cd3cde3ac..81147e944 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml
@@ -8,7 +8,7 @@
     <div class="nhsuk-width-container app-width-container">
         <div class="nhsuk-u-reading-width">
             <div class="app-width-container">
-                <h1 class="nhsuk-heading-xl nhsuk-u-padding-top-7">My account</h1>
+                <h1 class="nhsuk-heading-xl nhsuk-u-padding-top-7">My account details</h1>
                 @if (isgeneralUser)
                 {
                   <div class="nhsuk-inset-text">

From f98210abdecfc9ca2fdf01348cc118eb76ee6137 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Fri, 23 Aug 2024 16:17:22 +0100
Subject: [PATCH 058/143] Make page focus on top-most element with validation
 error

---
 .../Shared/_ValidationScriptsPartial.cshtml   | 86 +++++++++++--------
 1 file changed, 51 insertions(+), 35 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
index aa6f89804..3bd08f428 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -1,46 +1,62 @@
 <environment include="Development">
-  <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
-  <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
+    <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
+    <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
 </environment>
 <environment exclude="Development">
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.17.0/jquery.validate.min.js"
-          asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
-          asp-fallback-test="window.jQuery && window.jQuery.validator"
-          crossorigin="anonymous"
-          integrity="sha256-F6h55Qw6sweK+t7SiOJX+2bpSAa3b/fnlrVCJvmEj1A=">
-  </script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js"
-          asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
-          asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
-          crossorigin="anonymous"
-          integrity="sha256-9GycpJnliUjJDVDqP0UEu/bsm9U+3dnQUH8+3W10vkY=">
-  </script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.17.0/jquery.validate.min.js"
+            asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator"
+            crossorigin="anonymous"
+            integrity="sha256-F6h55Qw6sweK+t7SiOJX+2bpSAa3b/fnlrVCJvmEj1A=">
+    </script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/3.2.11/jquery.validate.unobtrusive.min.js"
+            asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
+            crossorigin="anonymous"
+            integrity="sha256-9GycpJnliUjJDVDqP0UEu/bsm9U+3dnQUH8+3W10vkY=">
+    </script>
 </environment>
 <script type="text/javascript">
-  // Add/remove class 'input-validation-error' to the div containing the control with error
-  $(function () {
-    $('form').each(function () {
-      if ($(this).data("validator")) {
-        var valSettings = $(this).data("validator").settings
-        valSettings.highlight = wrap($.validator.defaults.highlight, highlightDecorator)
-        valSettings.unhighlight = wrap($.validator.defaults.unhighlight, unhighlightDecorator)
-      }
+    // Add/remove class 'input-validation-error' to the div containing the control with error
+
+    let errorElements = [];
+    let submitAttempted = false;
+    document.querySelector('form').onsubmit = () => { submitAttempted = true; }
+
+    $(function () {
+        $('form').each(function () {
+            if ($(this).data("validator")) {
+                var valSettings = $(this).data("validator").settings
+                valSettings.highlight = wrap($.validator.defaults.highlight, highlightDecorator)
+                valSettings.unhighlight = wrap($.validator.defaults.unhighlight, unhighlightDecorator)
+            }
+        });
     });
-  });
 
-  function wrap(functionToWrap, beforeFunction) {
-    return function () {
-      var args = Array.prototype.slice.call(arguments);
-      beforeFunction.apply(this, args);
-      return functionToWrap.apply(this, args);
+    function wrap(functionToWrap, beforeFunction) {
+        return function () {
+            var args = Array.prototype.slice.call(arguments);
+            beforeFunction.apply(this, args);
+
+            if (errorElements.length && submitAttempted) {
+                errorElements[0]['obj'].focus();
+                submitAttempted = false;
+            }
+
+            return functionToWrap.apply(this, args);
+        };
     };
-  };
 
-  function highlightDecorator(element, errorClass, validClass) {
-    $(element).closest("div").addClass(errorClass).removeClass(validClass);
-  }
-  function unhighlightDecorator(element, errorClass, validClass) {
-    $(element).closest("div").addClass(validClass).removeClass(errorClass);
-  }
+    function highlightDecorator(element, errorClass, validClass) {
+        $(element).closest("div").addClass(errorClass).removeClass(validClass);
+        let itemExists = errorElements.some(obj => obj['id'] == element.id);
+        if (!itemExists) {
+            errorElements.push({ 'id': element.id, 'obj': element });
+        }
+    }
+    function unhighlightDecorator(element, errorClass, validClass) {
+        $(element).closest("div").addClass(validClass).removeClass(errorClass);
+        errorElements = errorElements.filter((elm) => elm.id != element.id);
+    }
 
 </script>
\ No newline at end of file

From 85b454074bb39ad646def9750304effbc6032d41 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Wed, 28 Aug 2024 15:25:34 +0100
Subject: [PATCH 059/143] Update NMC Number field error message

---
 .../CreateAccountProfessionalRegNumber.cshtml | 73 ++++++++++---------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountProfessionalRegNumber.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountProfessionalRegNumber.cshtml
index 0bacd45eb..4cfe8e2f2 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountProfessionalRegNumber.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountProfessionalRegNumber.cshtml
@@ -3,65 +3,66 @@
 @model AccountCreationViewModel;
 
 @{
-    
+
     Layout = ViewData["Layout"].ToString();
     var routeData = new Dictionary<string, string> { { "ReturnToConfirmation", Context.Request.Query["returnToConfirmation"] } };
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     JobRoleBasicViewModel jobDetails = ViewBag.Job;
     ViewData["Title"] = $"{jobDetails.MedicalCouncilCode} Number";
 }
-@section styles{
+@section styles {
     <link rel="stylesheet" type="text/css" href="~/css/nhsuk/pages/createaccount.css" asp-append-version="true" />
 }
 <div class="create-account">
-<div class="nhsuk-width-container app-width-container">
-    <div class="nhsuk-grid-row">
+    <div class="nhsuk-width-container app-width-container">
+        <div class="nhsuk-grid-row">
             <div class="nhsuk-grid-column-two-thirds nhsuk-u-padding-bottom-2">
-            <vc:back-link asp-controller="Account" asp-action="CreateAccountCurrentRole" asp-all-route-data="@routeData" link-text="Back to: Search for your current role" />
-                    <h1 class="nhsuk-heading-xl">Enter your @jobDetails.MedicalCouncilCode number</h1>
+                <vc:back-link asp-controller="Account" asp-action="CreateAccountCurrentRole" asp-all-route-data="@routeData" link-text="Back to: Search for your current role" />
+                <h1 class="nhsuk-heading-xl">Enter your @jobDetails.MedicalCouncilCode number</h1>
+
 
-            
-           <form asp-controller="Account" asp-action="CreateAccountGradeSelection" method="get">
-                <input type="hidden" name="formSubmission" value="true">
-                @if (errorHasOccurred)
-                {
-                    <vc:error-summary order-of-property-names="@(new[] { nameof(Model.RegistrationNumber) })" />
-                }
+                <form asp-controller="Account" asp-action="CreateAccountGradeSelection" method="get">
+                    <input type="hidden" name="formSubmission" value="true">
+                    @if (errorHasOccurred)
+                    {
+                        <vc:error-summary order-of-property-names="@(new[] { nameof(Model.RegistrationNumber) })" />
+                    }
+
+                    @if (jobDetails.MedicalCouncilId > 0)
+                    {
 
-                @if (jobDetails.MedicalCouncilId > 0)
-                {
-                   
                         <div class="nhsuk-form-group">
                             <div class="nhsuk-label">Professional body</div>
                             <div id="professionalBody" class="nhsuk-hint" for="example-with-hint-text-hint">
                                 @jobDetails.MedicalCouncilName
                             </div>
                         </div>
-                 
-                  
-                    
-                }
-                <input type="hidden" name="CurrentRole" value="@Context.Request.Query["CurrentRole"]">
-                <input type="hidden" name="returnToConfirmation" value="@Context.Request.Query["returnToConfirmation"]">
 
-                        <vc:text-input asp-for="RegistrationNumber"
-                                       label="@jobDetails.MedicalCouncilCode number"
-                                       populate-with-current-value="true"
-                                       type="text"
-                                       spell-check="false"
-                                       hint-text=""
-                                       autocomplete=""
-                                       css-class="nhsuk-u-width-one-half"
-                                       required="true" />
 
 
-                <div class="nhsuk-form-group">
-                    <button type="submit" class="nhsuk-button">Continue</button>
-                </div>
+                    }
+                    <input type="hidden" name="CurrentRole" value="@Context.Request.Query["CurrentRole"]">
+                    <input type="hidden" name="returnToConfirmation" value="@Context.Request.Query["returnToConfirmation"]">
+
+                    <vc:text-input asp-for="RegistrationNumber"
+                                   label="@jobDetails.MedicalCouncilCode number"
+                                   populate-with-current-value="true"
+                                   type="text"
+                                   spell-check="false"
+                                   hint-text=""
+                                   autocomplete=""
+                                   css-class="nhsuk-u-width-one-half"
+                                   required="true"
+                                   required-client-side-error-message="@jobDetails.MedicalCouncilName Number is required" />
 
-            </form>
+
+                    <div class="nhsuk-form-group">
+                        <button type="submit" class="nhsuk-button">Continue</button>
+                    </div>
+
+                </form>
+            </div>
         </div>
     </div>
 </div>
-</div>
 

From 1d6a34bdf2ad75e8717a0557c13c16e32cdf9e1a Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Thu, 5 Sep 2024 15:17:21 +0100
Subject: [PATCH 060/143] TD-4343: Script to remove duplicate rows in
 UserUserGroup table

---
 .../LearningHub.Nhs.Database.sqlproj                     | 1 +
 .../Scripts/TD-4343_RemoveDuplicateUserGroup.sql         | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4343_RemoveDuplicateUserGroup.sql

diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
index f513b6ec7..162c5ae73 100644
--- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
+++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
@@ -522,6 +522,7 @@
     <Build Include="Stored Procedures\Resources\GetPopularDashboardResources.sql" />
     <Build Include="Stored Procedures\Resources\GetRatedDashboardResources.sql" />
     <Build Include="Stored Procedures\Resources\GetMyCertificatesDashboardResources.sql" />
+    <None Include="Scripts\Post-Deploy\Scripts\TD-4343_RemoveDuplicateUserGroup.sql" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />
diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4343_RemoveDuplicateUserGroup.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4343_RemoveDuplicateUserGroup.sql
new file mode 100644
index 000000000..0361f3869
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4343_RemoveDuplicateUserGroup.sql
@@ -0,0 +1,9 @@
+WITH CTE AS (
+    SELECT
+        id,userid, usergroupid,
+        ROW_NUMBER() OVER (PARTITION BY userid, usergroupid ORDER BY id) AS rn
+    FROM
+        [hub].[UserUserGroup] where Deleted = 0
+)
+DELETE FROM CTE WHERE rn > 1;
+GO
\ No newline at end of file

From ee58d0b6f8ec48f3835e5d6706aee7df46c74eb2 Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Mon, 9 Sep 2024 14:48:11 +0100
Subject: [PATCH 061/143] delay for image/articile

---
 LearningHub.Nhs.WebUI/Controllers/ResourceController.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
index 7775ec6cd..5df61185e 100644
--- a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
@@ -189,6 +189,9 @@ public async Task<IActionResult> Index(int resourceReferenceId, bool? acceptSens
                     ActivityStart = DateTime.UtcNow, // TODO: What about user's timezone offset when Javascript is disabled? Needs JavaScript.
                     ActivityStatus = ActivityStatusEnum.Completed,
                 };
+
+                // setting time delay to avoid  multiple records in same time-TD-4299
+                await Task.Delay(10000);
                 await this.activityService.CreateResourceActivityAsync(activity);
             }
 

From 3d88402f6952923bb5bbf74cddf4d7fd2cb76645 Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Tue, 17 Sep 2024 16:13:06 +0100
Subject: [PATCH 062/143] URL Chnage

---
 LearningHub.Nhs.WebUI/Views/Policies/PrivacyPolicy.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Policies/PrivacyPolicy.cshtml b/LearningHub.Nhs.WebUI/Views/Policies/PrivacyPolicy.cshtml
index 924eee723..b15fe9aea 100644
--- a/LearningHub.Nhs.WebUI/Views/Policies/PrivacyPolicy.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Policies/PrivacyPolicy.cshtml
@@ -140,7 +140,7 @@
                 </p>
                 <h2 class="nhsuk-heading-l">12. HOW LONG WE RETAIN YOUR PERSONAL DATA</h2>
                 <p>
-                    We will keep personal data for no longer than necessary to fulfill the purposes we collected it for, in accordance with our records management policy and the NHS records retention schedule within the NHS Records Management Code of Practice at: <a href="https://transform.england.nhs.uk/information-governance/guidance/records-management-code/records-management-code-of-practice-2021" target="_blank">https://transform.england.nhs.uk/information-governance/guidance/records-management-code/records-management-code-of-practice-2021</a> (as may be amended from time to time).
+                    We will keep personal data for no longer than necessary to fulfill the purposes we collected it for, in accordance with our records management policy and the NHS records retention schedule within the NHS Records Management Code of Practice at: <a href="https://www.england.nhs.uk/contact-us/privacy-notice/nhs-england-as-a-data-controller/" target="_blank">https://www.england.nhs.uk/contact-us/privacy-notice/nhs-england-as-a-data-controller/</a> (as may be amended from time to time).
                 </p>
                 <p>
                     In some circumstances, you can ask us to delete your data. Please see the “Your rights” section below for further information.

From f98cc68d402d23fe9ff0a0fb838e6d8482958a73 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Thu, 19 Sep 2024 09:00:51 +0100
Subject: [PATCH 063/143] Identify Radio Buttons Error Messages PT2

---
 .../Views/MyAccount/ChangeCurrentRole.cshtml               | 2 +-
 .../Views/Shared/_ValidationScriptsPartial.cshtml          | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeCurrentRole.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeCurrentRole.cshtml
index 137bcbf88..40938608d 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeCurrentRole.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/ChangeCurrentRole.cshtml
@@ -67,7 +67,7 @@
                                            populate-with-current-values="true"
                                            radios="@Model.RoleRadio().ToList()"
                                            hint-text=""
-                                           required-client-side-error-message="Select a role"
+                                           required-client-side-error-message="Error: Select a role"
                                            required="true" />
 
                             <div class="nhsuk-form-group">
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
index 3bd08f428..eb4f4485d 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -26,9 +26,9 @@
     $(function () {
         $('form').each(function () {
             if ($(this).data("validator")) {
-                var valSettings = $(this).data("validator").settings
-                valSettings.highlight = wrap($.validator.defaults.highlight, highlightDecorator)
-                valSettings.unhighlight = wrap($.validator.defaults.unhighlight, unhighlightDecorator)
+                var valSettings = $(this).data("validator").settings;
+                valSettings.highlight = wrap($.validator.defaults.highlight, highlightDecorator);
+                valSettings.unhighlight = wrap($.validator.defaults.unhighlight, unhighlightDecorator);
             }
         });
     });
@@ -37,7 +37,6 @@
         return function () {
             var args = Array.prototype.slice.call(arguments);
             beforeFunction.apply(this, args);
-
             if (errorElements.length && submitAttempted) {
                 errorElements[0]['obj'].focus();
                 submitAttempted = false;

From 6a6a7e5955bfdabb0046f03300c356df344a5ca2 Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Thu, 19 Sep 2024 09:29:00 +0100
Subject: [PATCH 064/143] Add title attribute to iframe element

---
 LearningHub.Nhs.WebUI/Views/LearningSessions/Scorm.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/LearningSessions/Scorm.cshtml b/LearningHub.Nhs.WebUI/Views/LearningSessions/Scorm.cshtml
index ee6596f92..c00b9bc1d 100644
--- a/LearningHub.Nhs.WebUI/Views/LearningSessions/Scorm.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/LearningSessions/Scorm.cshtml
@@ -90,7 +90,7 @@
 
     <script type="text/javascript" src="~/js/bundle/scormcontainer.js"></script>
     <div class="viewer">
-        <iframe id="tree" name="tree" src="@ViewBag.FilePath" frameborder="0" marginheight="0" marginwidth="0" width="100%" height="100%" scrolling="auto" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
+        <iframe id="tree" name="tree" title="Scorm Resource Viewer" src="@ViewBag.FilePath" frameborder="0" marginheight="0" marginwidth="0" width="100%" height="100%" scrolling="auto" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
     </div>
 
     @if (this.ViewBag.UseTraceWindow)

From 09b97373de0ed49ff52435d665d1a0322c691125 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Fri, 27 Sep 2024 14:20:26 +0100
Subject: [PATCH 065/143] TD-4704: LH Live: Issue not showing the 'elfh' logo
 on 'Catalogue details' screen when accessed 'Search' & 'Catalogue cards'
 screens

---
 .../Views/Catalogue/Index.cshtml              | 20 +++++++++----------
 .../CatalogueService.cs                       |  1 +
 .../DashboardService.cs                       | 11 +++++++++-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
index 4a62262bc..c3dbb7e45 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml
@@ -34,15 +34,6 @@
     return string.Empty;
   }
 
-  string GetBadgeUrl()
-  {
-    if (!string.IsNullOrEmpty(Model.Catalogue.BadgeUrl))
-    {
-      return GetFileLink(Model.Catalogue.BadgeUrl);
-    }
-    return string.Empty;
-  }
-
   string GetFileLink(string fileName)
   {
     return "/api/catalogue/download-image/" + Uri.EscapeDataString(fileName);
@@ -82,6 +73,9 @@
         CatalogueAccessRequest = Model.CatalogueAccessRequest,
         UserGroups = Model.UserGroups
       };
+
+   var provider = Model.Catalogue.Providers?.FirstOrDefault();
+   var hasBadge = !string.IsNullOrWhiteSpace(Model.Catalogue.BadgeUrl);
 }
 
 @section styles{
@@ -124,9 +118,13 @@
       }
 
       <div class="catalogue-title nhsuk-u-margin-bottom-7">
-        @if (!string.IsNullOrEmpty(Model.Catalogue.BadgeUrl))
+        @if (provider != null)
+        {
+           <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name catalogue badge" class="provider-badge" />
+        }
+        else if (hasBadge)
         {
-          <img alt="Provider's catalogue badge" src="@GetBadgeUrl()" class="catalogue-badge" />
+           <img src="@("/api/catalogue/download-image/" + Uri.EscapeDataString(Model.Catalogue.BadgeUrl))" alt="Provider's catalogue badgeTest" class="catalogue-card-badge" />
         }
 
         <h1 class="heading-lg title nhsuk-u-margin-bottom-0">@(ViewBag.ActiveTab == "browse" && Model.NodeDetails != null ? Model.NodeDetails.Name : Model.Catalogue.Name)</h1>
diff --git a/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs b/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs
index a074e2b99..bf47b2e6d 100644
--- a/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/CatalogueService.cs
@@ -198,6 +198,7 @@ public async Task<CatalogueViewModel> GetCatalogueAsync(string reference, int us
             var bookmark = this.bookmarkRepository.GetAll().Where(b => b.NodeId == catalogue.NodeId && b.UserId == userId).FirstOrDefault();
             catalogueVM.BookmarkId = bookmark?.Id;
             catalogueVM.IsBookmarked = !bookmark?.Deleted ?? false;
+            catalogueVM.Providers = await this.providerService.GetByCatalogueVersionIdAsync(catalogueVM.Id);
             return catalogueVM;
         }
 
diff --git a/WebAPI/LearningHub.Nhs.Services/DashboardService.cs b/WebAPI/LearningHub.Nhs.Services/DashboardService.cs
index e4d5fb1bc..2da064c3e 100644
--- a/WebAPI/LearningHub.Nhs.Services/DashboardService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/DashboardService.cs
@@ -51,6 +51,15 @@ public async Task<DashboardMyLearningResponseViewModel> GetMyAccessLearnings(str
 
             var cataloguesResponse = dashboardType.ToLower() == "my-catalogues" ? this.catalogueNodeVersionRepository.GetCatalogues(dashboardType, pageNumber, userId) : (TotalCount: 0, Catalogues: new List<DashboardCatalogueDto>());
 
+            var catalogueList = cataloguesResponse.Catalogues.Any() ? this.mapper.Map<List<DashboardCatalogueViewModel>>(cataloguesResponse.Catalogues) : new List<DashboardCatalogueViewModel>();
+            if (catalogueList.Any())
+            {
+                foreach (var catalogue in catalogueList)
+                {
+                    catalogue.Providers = await this.providerService.GetByCatalogueVersionIdAsync(catalogue.NodeVersionId);
+                }
+            }
+
             var resourceList = resources.Any() ? this.mapper.Map<List<DashboardResourceViewModel>>(resources) : new List<DashboardResourceViewModel>();
             if (resourceList.Any())
             {
@@ -64,7 +73,7 @@ public async Task<DashboardMyLearningResponseViewModel> GetMyAccessLearnings(str
             {
                 Type = dashboardType,
                 Resources = resourceList,
-                Catalogues = cataloguesResponse.Catalogues.Any() ? this.mapper.Map<List<DashboardCatalogueViewModel>>(cataloguesResponse.Catalogues) : new List<DashboardCatalogueViewModel>(),
+                Catalogues = catalogueList,
                 TotalCount = dashboardType.ToLower() == "my-catalogues" ? cataloguesResponse.TotalCount : resourceCount,
                 CurrentPage = pageNumber,
             };

From 8cc79d8ab357bad5c7a1b042fd406b14d8e5ed8f Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Mon, 30 Sep 2024 13:26:02 +0100
Subject: [PATCH 066/143] TD-4726: Issue showing blank screen when clicked the
 'Go back' link on 'Manage catalogue' screen

---
 .../Scripts/vuesrc/catalogue/managecatalogue.vue     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/catalogue/managecatalogue.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/catalogue/managecatalogue.vue
index 371ac968b..e72eb5b05 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/catalogue/managecatalogue.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/catalogue/managecatalogue.vue
@@ -14,10 +14,14 @@
                 <div class="lh-padding-fluid">
                     <div class="lh-container-xl">
                         <div class="nhsuk-back-link">
-                            <router-link :to="'/Catalogue/' + reference" class="nhsuk-back-link__link" id="goBackLink"><svg class="nhsuk-icon nhsuk-icon__chevron-left" 
-                                xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true">
-                                <path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
-                                </svg> Go back</router-link>
+
+                            <a :href="'/catalogue/' + reference" class="nhsuk-back-link__link" id="goBackLink">
+                                <svg class="nhsuk-icon nhsuk-icon__chevron-left"
+                                     xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true">
+                                    <path d="M8.5 12c0-.3.1-.5.3-.7l5-5c.4-.4 1-.4 1.4 0s.4 1 0 1.4L10.9 12l4.3 4.3c.4.4.4 1 0 1.4s-1 .4-1.4 0l-5-5c-.2-.2-.3-.4-.3-.7z"></path>
+                                </svg>
+                                Go back
+                            </a>
                         </div>
                         <h1>Catalogue Management</h1>
                         <div class="nhsuk-grid-row">

From 54eccb50d522076b3400ddb8e2fba780486b56e9 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Tue, 1 Oct 2024 10:58:26 +0100
Subject: [PATCH 067/143] TD-4432: Issue with the 'Keywords' when given in
 upper case changed to lowercase letters on Contributing resources screens

---
 .../contribute-resource/components/KeyWordsEditor.vue     | 6 +++---
 .../Scripts/vuesrc/contribute/ContentCommon.vue           | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
index bfc00c5aa..79b6231f6 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
@@ -67,7 +67,7 @@
                 return this.resourceDetails.resourceVersionId;
             },
             newKeywordTrimmed(): string {
-                return this.newKeyword?.trim().replace(/ +(?= )/g, '').toLowerCase();
+                return this.newKeyword?.trim().replace(/ +(?= )/g, '');
             },
         },
         methods: {
@@ -77,9 +77,9 @@
             },
             async addKeyword() {  
                 if (this.newKeyword && this.newKeywordTrimmed.length > 0) {
-                    let allTrimmedKeyword = this.newKeywordTrimmed.toLowerCase().split(',');
+                    let allTrimmedKeyword = this.newKeywordTrimmed.split(',');
                     allTrimmedKeyword = allTrimmedKeyword.filter(e => String(e).trim());
-                    if (!this.resourceDetails.resourceKeywords.find(_keyword => allTrimmedKeyword.includes(_keyword.keyword.toLowerCase()))) {
+                    if (!this.resourceDetails.resourceKeywords.find(_keyword => allTrimmedKeyword.includes(_keyword.keyword))) {
                         for (var i = 0; i < allTrimmedKeyword.length; i++) {
                             let item = allTrimmedKeyword[i];
                             if (item.length > 0 && item.length <= 50) {
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
index 3741814d3..33c6b58d2 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
@@ -331,7 +331,7 @@
                     !Boolean(this.$route.query.initialCreate);                                 // or if the user is editing an existing draft (initialCreate=false)
             },
             newKeywordTrimmed(): string {
-                return this.newKeyword?.trim().replace(/ +(?= )/g, '').toLowerCase();
+                return this.newKeyword?.trim().replace(/ +(?= )/g, '');
             },
             showProviders(): boolean {
                 if (!this.$store.state.userProviders) {
@@ -393,7 +393,7 @@
                 this.keywords = this.resourceDetail.resourceKeywords.map(obj => {
                     let kw = new KeywordModel();
                     kw.id = obj.id;
-                    kw.keyword = obj.keyword.toLowerCase();
+                    kw.keyword = obj.keyword;
                     return kw;
                 });
                 if (this.resourceDetail.resourceProviderId > 0) {
@@ -532,9 +532,9 @@
                 },
             async addKeyword() {
                     if (this.newKeyword && this.newKeywordTrimmed.length > 0) {
-                        let allTrimmedKeyword = this.newKeywordTrimmed.toLowerCase().split(',');
+                        let allTrimmedKeyword = this.newKeywordTrimmed.split(',');
                         allTrimmedKeyword = allTrimmedKeyword.filter(e => String(e).trim());
-                        if (!this.keywords.find(_keyword => allTrimmedKeyword.includes(_keyword.keyword.toLowerCase()))) {
+                        if (!this.keywords.find(_keyword => allTrimmedKeyword.includes(_keyword.keyword))) {
                             for (var i = 0; i < allTrimmedKeyword.length; i++) {
                                 let item = allTrimmedKeyword[i];
                                 if (item.length > 0 && item.length <= 50) {

From 190478dc9b2ce708d4115a300e1b48545b2fdcb3 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Fri, 4 Oct 2024 10:47:06 +0100
Subject: [PATCH 068/143] TD-4738: Issue showing console errors on 'Learning
 hub' home page when clicked the search button in Mobile view

---
 .../Views/Shared/Tenant/LearningHub/_Layout.cshtml              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
index a6d0fd64d..4c2ce4e1f 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
@@ -72,7 +72,9 @@
     </div>
 
     <header class="nhsuk-header" role="banner">
+    <div id="content-header">
         <partial name="~/Views/Shared/_NavPartial.cshtml" />
+    </div>
     </header>
 
     <div class="nhsuk-width-container app-width-container beta-banner">

From 149d7e489dd8a0a37f098bbcec228c0185a285ee Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Fri, 4 Oct 2024 10:57:26 +0100
Subject: [PATCH 069/143] Fixed the console errors

---
 .../Views/Shared/Tenant/LearningHub/_Layout.cshtml              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
index 4c2ce4e1f..a04f48277 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
@@ -71,7 +71,7 @@
         <partial name="_CookieConsentPartial" />
     </div>
 
-    <header class="nhsuk-header" role="banner">
+    <header class="nhsuk-header" role="banner" id="header">
     <div id="content-header">
         <partial name="~/Views/Shared/_NavPartial.cshtml" />
     </div>

From 4070549033636c09476677bc7d564dfb7a36d9d8 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Fri, 11 Oct 2024 11:23:40 +0100
Subject: [PATCH 070/143] TD-4261: Duplicate entries for the assessment
 results(elearning) in the My Learning page

---
 .../Activity/GetUserLatestActivityCheck.sql   | 57 +++-------------
 .../Activity/GetUserLearningActivities.sql    | 68 ++++++-------------
 .../GetUserLearningActivitiesCount.sql        | 65 +++++-------------
 3 files changed, 47 insertions(+), 143 deletions(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql
index 1e83fc9b8..edb56b5ad 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql	
@@ -8,6 +8,7 @@
 -- Sarathlal	20-02-2024
 -- Sarathlal	23-04-2024 TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
 -- Sarathlal	25-04-2024 TD-4067: Resource with muliple version issue resolved
+-- Arunima		11-10-2024	TD-4261: Duplicate entries for the assessment results(elearning) in the My Learning page
 -------------------------------------------------------------------------------
 
 CREATE PROCEDURE [activity].[GetUserLatestActivityCheck] (
@@ -175,58 +176,22 @@ FROM (
 ) AS [t2]
 LEFT JOIN [resources].[VideoResourceVersion] AS [VideoResourceVersion] ON [t2].[Id1] = [VideoResourceVersion].[ResourceVersionId]
 LEFT JOIN [resources].[AudioResourceVersion] AS [AudeoResourceVersion] ON [t2].[Id1] = [AudeoResourceVersion].[ResourceVersionId]
-LEFT JOIN (
-    SELECT [ScormResourceVersion2].[Id], [ScormResourceVersion2].[AmendDate], [ScormResourceVersion2].[AmendUserId], [ScormResourceVersion2].[CanDownload], [ScormResourceVersion2].[ClearSuspendData], [ScormResourceVersion2].[ContentFilePath], [ScormResourceVersion2].[CreateDate], [ScormResourceVersion2].[CreateUserId], [ScormResourceVersion2].[Deleted], [ScormResourceVersion2].[DevelopmentId], [ScormResourceVersion2].[EsrLinkTypeId], [ScormResourceVersion2].[FileId], [ScormResourceVersion2].[PopupHeight], [ScormResourceVersion2].[PopupWidth], [ScormResourceVersion2].[ResourceVersionId]
-    FROM [resources].[ScormResourceVersion] AS [ScormResourceVersion2]
-    WHERE [ScormResourceVersion2].[Deleted] = 0
-) AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId]
-LEFT JOIN (
-    SELECT [ScormResourceVersionManifest3].[Id], [ScormResourceVersionManifest3].[AmendDate], [ScormResourceVersionManifest3].[AmendUserId], [ScormResourceVersionManifest3].[Author], [ScormResourceVersionManifest3].[CatalogEntry], [ScormResourceVersionManifest3].[Copyright], [ScormResourceVersionManifest3].[CreateDate], [ScormResourceVersionManifest3].[CreateUserId], [ScormResourceVersionManifest3].[Deleted], [ScormResourceVersionManifest3].[Description], [ScormResourceVersionManifest3].[Duration], [ScormResourceVersionManifest3].[ItemIdentifier], [ScormResourceVersionManifest3].[Keywords], [ScormResourceVersionManifest3].[LaunchData], [ScormResourceVersionManifest3].[ManifestURL], [ScormResourceVersionManifest3].[MasteryScore], [ScormResourceVersionManifest3].[MaxTimeAllowed], [ScormResourceVersionManifest3].[QuicklinkId], [ScormResourceVersionManifest3].[ResourceIdentifier], [ScormResourceVersionManifest3].[ScormResourceVersionId], [ScormResourceVersionManifest3].[TemplateVersion], [ScormResourceVersionManifest3].[TimeLimitAction], [ScormResourceVersionManifest3].[Title]
-    FROM [resources].[ScormResourceVersionManifest] AS [ScormResourceVersionManifest3]
-    WHERE [ScormResourceVersionManifest3].[Deleted] = 0
-) AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId]
-LEFT JOIN (
-    SELECT [BlockCollection].[Id], [BlockCollection].[AmendDate], [BlockCollection].[AmendUserId], [BlockCollection].[CreateDate], [BlockCollection].[CreateUserId], [BlockCollection].[Deleted]
-    FROM [resources].[BlockCollection] AS [BlockCollection]
-    WHERE [BlockCollection].[Deleted] = 0
-) AS [t5] ON [t2].[AssessmentContentId] = [t5].[Id]
-INNER JOIN (
-    SELECT [NodePath].[Id], [NodePath].[AmendDate], [NodePath].[AmendUserId], [NodePath].[CatalogueNodeId], [NodePath].[CreateDate], [NodePath].[CreateUserId], [NodePath].[Deleted], [NodePath].[IsActive], [NodePath].[NodeId], [NodePath].[NodePath]
-    FROM [hierarchy].[NodePath] AS [NodePath]
-    WHERE [NodePath].[Deleted] = 0
-) AS [t6] ON [t2].[NodePathId] = [t6].[Id]
-LEFT JOIN (
-    SELECT [ResourceReference5].[Id], [ResourceReference5].[AmendDate], [ResourceReference5].[AmendUserId], [ResourceReference5].[CreateDate], [ResourceReference5].[CreateUserId], [ResourceReference5].[Deleted], [ResourceReference5].[NodePathId], [ResourceReference5].[OriginalResourceReferenceId], [ResourceReference5].[ResourceId]
-    FROM [resources].[ResourceReference] AS [ResourceReference5]
-    WHERE [ResourceReference5].[Deleted] = 0
-) AS [t7] ON [t2].[Id0] = [t7].[ResourceId]
-LEFT JOIN (
-    SELECT [MediaResourceActivity3].[Id], [MediaResourceActivity3].[ActivityStart], [MediaResourceActivity3].[AmendDate], [MediaResourceActivity3].[AmendUserID], [MediaResourceActivity3].[CreateDate], [MediaResourceActivity3].[CreateUserID], [MediaResourceActivity3].[Deleted], [MediaResourceActivity3].[PercentComplete], [MediaResourceActivity3].[ResourceActivityId], [MediaResourceActivity3].[SecondsPlayed]
-    FROM [activity].[MediaResourceActivity] AS [MediaResourceActivity3]
-    WHERE [MediaResourceActivity3].[Deleted] = 0
-) AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId]
-LEFT JOIN (
-    SELECT [ScormActivity4].[Id], [ScormActivity4].[AmendDate], [ScormActivity4].[AmendUserID], [ScormActivity4].[CmiCoreExit], [ScormActivity4].[CmiCoreLesson_location], [ScormActivity4].[CmiCoreLesson_status], [ScormActivity4].[CmiCoreScoreMax], [ScormActivity4].[CmiCoreScoreMin], [ScormActivity4].[CmiCoreScoreRaw], [ScormActivity4].[CmiCoreSession_time], [ScormActivity4].[CmiSuspend_data], [ScormActivity4].[CreateDate], [ScormActivity4].[CreateUserID], [ScormActivity4].[Deleted], [ScormActivity4].[DurationSeconds], [ScormActivity4].[ResourceActivityId]
-    FROM [activity].[ScormActivity] AS [ScormActivity4]
-    WHERE [ScormActivity4].[Deleted] = 0
-) AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId]
-LEFT JOIN (
-    SELECT [Block0].[Id], [Block0].[AmendDate], [Block0].[AmendUserId], [Block0].[BlockCollectionId], [Block0].[BlockType], [Block0].[CreateDate], [Block0].[CreateUserId], [Block0].[Deleted], [Block0].[Order], [Block0].[Title]
-    FROM [resources].[Block] AS [Block0]
-    WHERE [Block0].[Deleted] = 0
-) AS [t10] ON [t5].[Id] = [t10].[BlockCollectionId]
+LEFT JOIN [resources].[ScormResourceVersion] AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId] and t3.Deleted=0
+LEFT JOIN [resources].[ScormResourceVersionManifest] AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId] and [t4].[Deleted] = 0
+LEFT JOIN [resources].[BlockCollection]  AS [t5] ON [t2].[AssessmentContentId] = [t5].[Id] AND [t5].[Deleted] = 0
+INNER JOIN [hierarchy].[NodePath] AS [t6] ON [t2].[NodePathId] = [t6].[Id] AND [t6].[Deleted] = 0
+LEFT JOIN [resources].[ResourceReference] AS [t7] ON [t2].[Id0] = [t7].[ResourceId] AND [t7].[Deleted] = 0
+LEFT JOIN [activity].[MediaResourceActivity] AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId] AND [t8].[Deleted] = 0
+LEFT JOIN [activity].[ScormActivity] AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId] AND [t9].[Deleted] = 0
+LEFT JOIN [resources].[Block] AS [t10] ON [t5].[Id] = [t10].[BlockCollectionId] AND [t10].[Deleted] = 0
 LEFT JOIN (
     SELECT [AssessmentResourceActivity5].[Id], [AssessmentResourceActivity5].[AmendDate], [AssessmentResourceActivity5].[AmendUserID], [AssessmentResourceActivity5].[CreateDate], [AssessmentResourceActivity5].[CreateUserID], [AssessmentResourceActivity5].[Deleted], [AssessmentResourceActivity5].[Reason], [AssessmentResourceActivity5].[ResourceActivityId], [AssessmentResourceActivity5].[Score], [t12].[Id] AS [Id0], [t12].[AmendDate] AS [AmendDate0], [t12].[AmendUserID] AS [AmendUserID0], [t12].[AssessmentResourceActivityId], [t12].[CreateDate] AS [CreateDate0], [t12].[CreateUserID] AS [CreateUserID0], [t12].[Deleted] AS [Deleted0], [t12].[QuestionBlockId]
     FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5]
-    LEFT JOIN (
-        SELECT [AssessmentResourceActivityInteraction6].[Id], [AssessmentResourceActivityInteraction6].[AmendDate], [AssessmentResourceActivityInteraction6].[AmendUserID], [AssessmentResourceActivityInteraction6].[AssessmentResourceActivityId], [AssessmentResourceActivityInteraction6].[CreateDate], [AssessmentResourceActivityInteraction6].[CreateUserID], [AssessmentResourceActivityInteraction6].[Deleted], [AssessmentResourceActivityInteraction6].[QuestionBlockId]
-        FROM [activity].[AssessmentResourceActivityInteraction] AS [AssessmentResourceActivityInteraction6]
-        WHERE [AssessmentResourceActivityInteraction6].[Deleted] = 0
-    ) AS [t12] ON [AssessmentResourceActivity5].[Id] = [t12].[AssessmentResourceActivityId]
+	LEFT JOIN [activity].[AssessmentResourceActivityInteraction] AS [t12] ON [AssessmentResourceActivity5].[Id] = [t12].[AssessmentResourceActivityId] AND [t12].[Deleted] = 0
     WHERE [AssessmentResourceActivity5].[Deleted] = 0
 ) AS [t11] ON [t2].[Id] = [t11].[ResourceActivityId]
 WHERE t2.ResourceVersionId=@ResourceVersionId
 ORDER BY [t2].[ActivityStart] DESC, [t2].[Id], [t2].[Id0], [t2].[Id1], [t2].[Id2], [VideoResourceVersion].[Id], [AudeoResourceVersion].[Id], [t3].[Id], [t4].[Id], [t5].[Id], [t6].[Id], [t7].[Id], [t8].[Id], [t9].[Id], [t10].[Id], [t11].[Id]
 	
 	
-END
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql
index 15272dc4e..0738ac2ac 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
@@ -10,7 +10,8 @@
 -- Sarathlal	08-03-2024
 -- Sarathlal	23-04-2024 TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
 -- Sarathlal	25-04-2024 TD-4067: Resource with muliple version issue resolved
--- Arunima	26-07-2024 TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
+-- Arunima		26-07-2024 TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
+-- Arunima		11-10-2024 TD-4261: Duplicate entries for the assessment results(elearning) in the My Learning page
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [activity].[GetUserLearningActivities] (
 	 @userId INT	
@@ -215,7 +216,7 @@ FROM (
                      WHERE  ([ScormActivity].[Deleted] = 0 AND [ResourceActivity].[Id] = [ScormActivity].[ResourceActivityId])										 
 				) 
 					IS NULL
-			)		
+			)
 		AND   
 				(
 					(
@@ -227,12 +228,17 @@ FROM (
 								))
 					)
 				OR  
+				(
 					-- or launch resource activity completed
 					EXISTS
 					(
 							SELECT 1	FROM   [activity].[ResourceActivity] AS [ResAct2]
 							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] in (3,7,5,4)
 					)
+					AND
+					(
+						[Res].[ResourceTypeId] <> 6)
+					)
 					
 				)
 			AND
@@ -358,7 +364,7 @@ FROM (
 												(
 													(SELECT TOP(1) [ScormActivity1].[CmiCoreLesson_status]
 													FROM   [activity].[ScormActivity] AS [ScormActivity1]
-													WHERE [ScormActivity1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ScormActivity1].[ResourceActivityId]) = 2
+													WHERE [ScormActivity1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ScormActivity1].[ResourceActivityId]) = 7
 												)
 										)
 			
@@ -481,56 +487,20 @@ FROM (
 ) AS [t2]
 LEFT JOIN [resources].[VideoResourceVersion] AS [VideoResourceVersion] ON [t2].[Id1] = [VideoResourceVersion].[ResourceVersionId]
 LEFT JOIN [resources].[AudioResourceVersion] AS [AudeoResourceVersion] ON [t2].[Id1] = [AudeoResourceVersion].[ResourceVersionId]
-LEFT JOIN (
-    SELECT [ScormResourceVersion2].[Id], [ScormResourceVersion2].[AmendDate], [ScormResourceVersion2].[AmendUserId], [ScormResourceVersion2].[CanDownload], [ScormResourceVersion2].[ClearSuspendData], [ScormResourceVersion2].[ContentFilePath], [ScormResourceVersion2].[CreateDate], [ScormResourceVersion2].[CreateUserId], [ScormResourceVersion2].[Deleted], [ScormResourceVersion2].[DevelopmentId], [ScormResourceVersion2].[EsrLinkTypeId], [ScormResourceVersion2].[FileId], [ScormResourceVersion2].[PopupHeight], [ScormResourceVersion2].[PopupWidth], [ScormResourceVersion2].[ResourceVersionId]
-    FROM [resources].[ScormResourceVersion] AS [ScormResourceVersion2]
-    WHERE [ScormResourceVersion2].[Deleted] = 0
-) AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId]
-LEFT JOIN (
-    SELECT [ScormResourceVersionManifest3].[Id], [ScormResourceVersionManifest3].[AmendDate], [ScormResourceVersionManifest3].[AmendUserId], [ScormResourceVersionManifest3].[Author], [ScormResourceVersionManifest3].[CatalogEntry], [ScormResourceVersionManifest3].[Copyright], [ScormResourceVersionManifest3].[CreateDate], [ScormResourceVersionManifest3].[CreateUserId], [ScormResourceVersionManifest3].[Deleted], [ScormResourceVersionManifest3].[Description], [ScormResourceVersionManifest3].[Duration], [ScormResourceVersionManifest3].[ItemIdentifier], [ScormResourceVersionManifest3].[Keywords], [ScormResourceVersionManifest3].[LaunchData], [ScormResourceVersionManifest3].[ManifestURL], [ScormResourceVersionManifest3].[MasteryScore], [ScormResourceVersionManifest3].[MaxTimeAllowed], [ScormResourceVersionManifest3].[QuicklinkId], [ScormResourceVersionManifest3].[ResourceIdentifier], [ScormResourceVersionManifest3].[ScormResourceVersionId], [ScormResourceVersionManifest3].[TemplateVersion], [ScormResourceVersionManifest3].[TimeLimitAction], [ScormResourceVersionManifest3].[Title]
-    FROM [resources].[ScormResourceVersionManifest] AS [ScormResourceVersionManifest3]
-    WHERE [ScormResourceVersionManifest3].[Deleted] = 0
-) AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId]
-LEFT JOIN (
-    SELECT [BlockCollection].[Id], [BlockCollection].[AmendDate], [BlockCollection].[AmendUserId], [BlockCollection].[CreateDate], [BlockCollection].[CreateUserId], [BlockCollection].[Deleted]
-    FROM [resources].[BlockCollection] AS [BlockCollection]
-    WHERE [BlockCollection].[Deleted] = 0
-) AS [t5] ON [t2].[AssessmentContentId] = [t5].[Id]
-INNER JOIN (
-    SELECT [NodePath].[Id], [NodePath].[AmendDate], [NodePath].[AmendUserId], [NodePath].[CatalogueNodeId], [NodePath].[CreateDate], [NodePath].[CreateUserId], [NodePath].[Deleted], [NodePath].[IsActive], [NodePath].[NodeId], [NodePath].[NodePath]
-    FROM [hierarchy].[NodePath] AS [NodePath]
-    WHERE [NodePath].[Deleted] = 0
-) AS [t6] ON [t2].[NodePathId] = [t6].[Id]
-LEFT JOIN (
-    SELECT [ResourceReference5].[Id], [ResourceReference5].[AmendDate], [ResourceReference5].[AmendUserId], [ResourceReference5].[CreateDate], [ResourceReference5].[CreateUserId], [ResourceReference5].[Deleted], [ResourceReference5].[NodePathId], [ResourceReference5].[OriginalResourceReferenceId], [ResourceReference5].[ResourceId]
-    FROM [resources].[ResourceReference] AS [ResourceReference5]
-    WHERE [ResourceReference5].[Deleted] = 0
-) AS [t7] ON [t2].[Id0] = [t7].[ResourceId]
-LEFT JOIN (
-    SELECT [MediaResourceActivity3].[Id], [MediaResourceActivity3].[ActivityStart], [MediaResourceActivity3].[AmendDate], [MediaResourceActivity3].[AmendUserID], [MediaResourceActivity3].[CreateDate], [MediaResourceActivity3].[CreateUserID], [MediaResourceActivity3].[Deleted], [MediaResourceActivity3].[PercentComplete], [MediaResourceActivity3].[ResourceActivityId], [MediaResourceActivity3].[SecondsPlayed]
-    FROM [activity].[MediaResourceActivity] AS [MediaResourceActivity3]
-    WHERE [MediaResourceActivity3].[Deleted] = 0
-) AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId]
-LEFT JOIN (
-    SELECT [ScormActivity4].[Id], [ScormActivity4].[AmendDate], [ScormActivity4].[AmendUserID], [ScormActivity4].[CmiCoreExit], [ScormActivity4].[CmiCoreLesson_location], [ScormActivity4].[CmiCoreLesson_status], [ScormActivity4].[CmiCoreScoreMax], [ScormActivity4].[CmiCoreScoreMin], [ScormActivity4].[CmiCoreScoreRaw], [ScormActivity4].[CmiCoreSession_time], [ScormActivity4].[CmiSuspend_data], [ScormActivity4].[CreateDate], [ScormActivity4].[CreateUserID], [ScormActivity4].[Deleted], [ScormActivity4].[DurationSeconds], [ScormActivity4].[ResourceActivityId]
-    FROM [activity].[ScormActivity] AS [ScormActivity4]
-    WHERE [ScormActivity4].[Deleted] = 0
-) AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId]
-LEFT JOIN (
-    SELECT [Block0].[Id], [Block0].[AmendDate], [Block0].[AmendUserId], [Block0].[BlockCollectionId], [Block0].[BlockType], [Block0].[CreateDate], [Block0].[CreateUserId], [Block0].[Deleted], [Block0].[Order], [Block0].[Title]
-    FROM [resources].[Block] AS [Block0]
-    WHERE [Block0].[Deleted] = 0
-) AS [t10] ON [t5].[Id] = [t10].[BlockCollectionId]
+LEFT JOIN [resources].[ScormResourceVersion] AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId] and t3.Deleted=0
+LEFT JOIN [resources].[ScormResourceVersionManifest] AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId] and [t4].[Deleted] = 0
+LEFT JOIN [resources].[BlockCollection]  AS [t5] ON [t2].[AssessmentContentId] = [t5].[Id] AND [t5].[Deleted] = 0
+INNER JOIN [hierarchy].[NodePath] AS [t6] ON [t2].[NodePathId] = [t6].[Id] AND [t6].[Deleted] = 0
+LEFT JOIN [resources].[ResourceReference] AS [t7] ON [t2].[Id0] = [t7].[ResourceId] AND [t7].[Deleted] = 0
+LEFT JOIN [activity].[MediaResourceActivity] AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId] AND [t8].[Deleted] = 0
+LEFT JOIN [activity].[ScormActivity] AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId] AND [t9].[Deleted] = 0
+LEFT JOIN [resources].[Block] AS [t10] ON [t5].[Id] = [t10].[BlockCollectionId] AND [t10].[Deleted] = 0
 LEFT JOIN (
     SELECT [AssessmentResourceActivity5].[Id], [AssessmentResourceActivity5].[AmendDate], [AssessmentResourceActivity5].[AmendUserID], [AssessmentResourceActivity5].[CreateDate], [AssessmentResourceActivity5].[CreateUserID], [AssessmentResourceActivity5].[Deleted], [AssessmentResourceActivity5].[Reason], [AssessmentResourceActivity5].[ResourceActivityId], [AssessmentResourceActivity5].[Score], [t12].[Id] AS [Id0], [t12].[AmendDate] AS [AmendDate0], [t12].[AmendUserID] AS [AmendUserID0], [t12].[AssessmentResourceActivityId], [t12].[CreateDate] AS [CreateDate0], [t12].[CreateUserID] AS [CreateUserID0], [t12].[Deleted] AS [Deleted0], [t12].[QuestionBlockId]
     FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5]
-    LEFT JOIN (
-        SELECT [AssessmentResourceActivityInteraction6].[Id], [AssessmentResourceActivityInteraction6].[AmendDate], [AssessmentResourceActivityInteraction6].[AmendUserID], [AssessmentResourceActivityInteraction6].[AssessmentResourceActivityId], [AssessmentResourceActivityInteraction6].[CreateDate], [AssessmentResourceActivityInteraction6].[CreateUserID], [AssessmentResourceActivityInteraction6].[Deleted], [AssessmentResourceActivityInteraction6].[QuestionBlockId]
-        FROM [activity].[AssessmentResourceActivityInteraction] AS [AssessmentResourceActivityInteraction6]
-        WHERE [AssessmentResourceActivityInteraction6].[Deleted] = 0
-    ) AS [t12] ON [AssessmentResourceActivity5].[Id] = [t12].[AssessmentResourceActivityId]
+	LEFT JOIN [activity].[AssessmentResourceActivityInteraction] AS [t12] ON [AssessmentResourceActivity5].[Id] = [t12].[AssessmentResourceActivityId] AND [t12].[Deleted] = 0
     WHERE [AssessmentResourceActivity5].[Deleted] = 0
 ) AS [t11] ON [t2].[Id] = [t11].[ResourceActivityId]
 ORDER BY [t2].[ActivityStart] DESC, [t2].[Id], [t2].[Id0], [t2].[Id1], [t2].[Id2], [VideoResourceVersion].[Id], [AudeoResourceVersion].[Id], [t3].[Id], [t4].[Id], [t5].[Id], [t6].[Id], [t7].[Id], [t8].[Id], [t9].[Id], [t10].[Id], [t11].[Id]
 		
-END
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql
index 7ce53f78c..255339687 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
@@ -9,7 +9,8 @@
 -- Sarathlal	18-12-2023
 -- Sarathlal	08-03-2024
 -- Sarathlal	23-04-2024	TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
--- Arunima	26-07-2024  TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
+-- Arunima		26-07-2024  TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
+-- Arunima		11-10-2024	TD-4261: Duplicate entries for the assessment results(elearning) in the My Learning page
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [activity].[GetUserLearningActivitiesCount] (
 	 @userId INT	
@@ -142,12 +143,16 @@ FROM (
 								))
 					)
 				OR  
+				(
 					-- or launch resource activity completed
 					EXISTS
 					(
 							SELECT 1	FROM   [activity].[ResourceActivity] AS [ResAct2]
 							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] in (3,7,5,4)
 					)
+					AND
+					([Res].[ResourceTypeId] <> 6)
+					)
 					
 				)
 			AND
@@ -273,7 +278,7 @@ FROM (
 												(
 													(SELECT TOP(1) [ScormActivity1].[CmiCoreLesson_status]
 													FROM   [activity].[ScormActivity] AS [ScormActivity1]
-													WHERE [ScormActivity1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ScormActivity1].[ResourceActivityId]) = 2
+													WHERE [ScormActivity1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ScormActivity1].[ResourceActivityId]) = 7
 												)
 										)
 			
@@ -393,56 +398,20 @@ FROM (
 ) AS [t2]
 LEFT JOIN [resources].[VideoResourceVersion] AS [VideoResourceVersion] ON [t2].[Id1] = [VideoResourceVersion].[ResourceVersionId]
 LEFT JOIN [resources].[AudioResourceVersion] AS [AudeoResourceVersion] ON [t2].[Id1] = [AudeoResourceVersion].[ResourceVersionId]
-LEFT JOIN (
-    SELECT [ScormResourceVersion2].[Id], [ScormResourceVersion2].[AmendDate], [ScormResourceVersion2].[AmendUserId], [ScormResourceVersion2].[CanDownload], [ScormResourceVersion2].[ClearSuspendData], [ScormResourceVersion2].[ContentFilePath], [ScormResourceVersion2].[CreateDate], [ScormResourceVersion2].[CreateUserId], [ScormResourceVersion2].[Deleted], [ScormResourceVersion2].[DevelopmentId], [ScormResourceVersion2].[EsrLinkTypeId], [ScormResourceVersion2].[FileId], [ScormResourceVersion2].[PopupHeight], [ScormResourceVersion2].[PopupWidth], [ScormResourceVersion2].[ResourceVersionId]
-    FROM [resources].[ScormResourceVersion] AS [ScormResourceVersion2]
-    WHERE [ScormResourceVersion2].[Deleted] = 0
-) AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId]
-LEFT JOIN (
-    SELECT [ScormResourceVersionManifest3].[Id], [ScormResourceVersionManifest3].[AmendDate], [ScormResourceVersionManifest3].[AmendUserId], [ScormResourceVersionManifest3].[Author], [ScormResourceVersionManifest3].[CatalogEntry], [ScormResourceVersionManifest3].[Copyright], [ScormResourceVersionManifest3].[CreateDate], [ScormResourceVersionManifest3].[CreateUserId], [ScormResourceVersionManifest3].[Deleted], [ScormResourceVersionManifest3].[Description], [ScormResourceVersionManifest3].[Duration], [ScormResourceVersionManifest3].[ItemIdentifier], [ScormResourceVersionManifest3].[Keywords], [ScormResourceVersionManifest3].[LaunchData], [ScormResourceVersionManifest3].[ManifestURL], [ScormResourceVersionManifest3].[MasteryScore], [ScormResourceVersionManifest3].[MaxTimeAllowed], [ScormResourceVersionManifest3].[QuicklinkId], [ScormResourceVersionManifest3].[ResourceIdentifier], [ScormResourceVersionManifest3].[ScormResourceVersionId], [ScormResourceVersionManifest3].[TemplateVersion], [ScormResourceVersionManifest3].[TimeLimitAction], [ScormResourceVersionManifest3].[Title]
-    FROM [resources].[ScormResourceVersionManifest] AS [ScormResourceVersionManifest3]
-    WHERE [ScormResourceVersionManifest3].[Deleted] = 0
-) AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId]
-LEFT JOIN (
-    SELECT [BlockCollection].[Id], [BlockCollection].[AmendDate], [BlockCollection].[AmendUserId], [BlockCollection].[CreateDate], [BlockCollection].[CreateUserId], [BlockCollection].[Deleted]
-    FROM [resources].[BlockCollection] AS [BlockCollection]
-    WHERE [BlockCollection].[Deleted] = 0
-) AS [t5] ON [t2].[AssessmentContentId] = [t5].[Id]
-INNER JOIN (
-    SELECT [NodePath].[Id], [NodePath].[AmendDate], [NodePath].[AmendUserId], [NodePath].[CatalogueNodeId], [NodePath].[CreateDate], [NodePath].[CreateUserId], [NodePath].[Deleted], [NodePath].[IsActive], [NodePath].[NodeId], [NodePath].[NodePath]
-    FROM [hierarchy].[NodePath] AS [NodePath]
-    WHERE [NodePath].[Deleted] = 0
-) AS [t6] ON [t2].[NodePathId] = [t6].[Id]
-LEFT JOIN (
-    SELECT [ResourceReference5].[Id], [ResourceReference5].[AmendDate], [ResourceReference5].[AmendUserId], [ResourceReference5].[CreateDate], [ResourceReference5].[CreateUserId], [ResourceReference5].[Deleted], [ResourceReference5].[NodePathId], [ResourceReference5].[OriginalResourceReferenceId], [ResourceReference5].[ResourceId]
-    FROM [resources].[ResourceReference] AS [ResourceReference5]
-    WHERE [ResourceReference5].[Deleted] = 0
-) AS [t7] ON [t2].[Id0] = [t7].[ResourceId]
-LEFT JOIN (
-    SELECT [MediaResourceActivity3].[Id], [MediaResourceActivity3].[ActivityStart], [MediaResourceActivity3].[AmendDate], [MediaResourceActivity3].[AmendUserID], [MediaResourceActivity3].[CreateDate], [MediaResourceActivity3].[CreateUserID], [MediaResourceActivity3].[Deleted], [MediaResourceActivity3].[PercentComplete], [MediaResourceActivity3].[ResourceActivityId], [MediaResourceActivity3].[SecondsPlayed]
-    FROM [activity].[MediaResourceActivity] AS [MediaResourceActivity3]
-    WHERE [MediaResourceActivity3].[Deleted] = 0
-) AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId]
-LEFT JOIN (
-    SELECT [ScormActivity4].[Id], [ScormActivity4].[AmendDate], [ScormActivity4].[AmendUserID], [ScormActivity4].[CmiCoreExit], [ScormActivity4].[CmiCoreLesson_location], [ScormActivity4].[CmiCoreLesson_status], [ScormActivity4].[CmiCoreScoreMax], [ScormActivity4].[CmiCoreScoreMin], [ScormActivity4].[CmiCoreScoreRaw], [ScormActivity4].[CmiCoreSession_time], [ScormActivity4].[CmiSuspend_data], [ScormActivity4].[CreateDate], [ScormActivity4].[CreateUserID], [ScormActivity4].[Deleted], [ScormActivity4].[DurationSeconds], [ScormActivity4].[ResourceActivityId]
-    FROM [activity].[ScormActivity] AS [ScormActivity4]
-    WHERE [ScormActivity4].[Deleted] = 0
-) AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId]
-LEFT JOIN (
-    SELECT [Block0].[Id], [Block0].[AmendDate], [Block0].[AmendUserId], [Block0].[BlockCollectionId], [Block0].[BlockType], [Block0].[CreateDate], [Block0].[CreateUserId], [Block0].[Deleted], [Block0].[Order], [Block0].[Title]
-    FROM [resources].[Block] AS [Block0]
-    WHERE [Block0].[Deleted] = 0
-) AS [t10] ON [t5].[Id] = [t10].[BlockCollectionId]
+LEFT JOIN [resources].[ScormResourceVersion] AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId] and t3.Deleted=0
+LEFT JOIN [resources].[ScormResourceVersionManifest] AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId] and [t4].[Deleted] = 0
+LEFT JOIN [resources].[BlockCollection]  AS [t5] ON [t2].[AssessmentContentId] = [t5].[Id] AND [t5].[Deleted] = 0
+INNER JOIN [hierarchy].[NodePath] AS [t6] ON [t2].[NodePathId] = [t6].[Id] AND [t6].[Deleted] = 0
+LEFT JOIN [resources].[ResourceReference] AS [t7] ON [t2].[Id0] = [t7].[ResourceId] AND [t7].[Deleted] = 0
+LEFT JOIN [activity].[MediaResourceActivity] AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId] AND [t8].[Deleted] = 0
+LEFT JOIN [activity].[ScormActivity] AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId] AND [t9].[Deleted] = 0
+LEFT JOIN [resources].[Block] AS [t10] ON [t5].[Id] = [t10].[BlockCollectionId] AND [t10].[Deleted] = 0
 LEFT JOIN (
     SELECT [AssessmentResourceActivity5].[Id], [AssessmentResourceActivity5].[AmendDate], [AssessmentResourceActivity5].[AmendUserID], [AssessmentResourceActivity5].[CreateDate], [AssessmentResourceActivity5].[CreateUserID], [AssessmentResourceActivity5].[Deleted], [AssessmentResourceActivity5].[Reason], [AssessmentResourceActivity5].[ResourceActivityId], [AssessmentResourceActivity5].[Score], [t12].[Id] AS [Id0], [t12].[AmendDate] AS [AmendDate0], [t12].[AmendUserID] AS [AmendUserID0], [t12].[AssessmentResourceActivityId], [t12].[CreateDate] AS [CreateDate0], [t12].[CreateUserID] AS [CreateUserID0], [t12].[Deleted] AS [Deleted0], [t12].[QuestionBlockId]
     FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5]
-    LEFT JOIN (
-        SELECT [AssessmentResourceActivityInteraction6].[Id], [AssessmentResourceActivityInteraction6].[AmendDate], [AssessmentResourceActivityInteraction6].[AmendUserID], [AssessmentResourceActivityInteraction6].[AssessmentResourceActivityId], [AssessmentResourceActivityInteraction6].[CreateDate], [AssessmentResourceActivityInteraction6].[CreateUserID], [AssessmentResourceActivityInteraction6].[Deleted], [AssessmentResourceActivityInteraction6].[QuestionBlockId]
-        FROM [activity].[AssessmentResourceActivityInteraction] AS [AssessmentResourceActivityInteraction6]
-        WHERE [AssessmentResourceActivityInteraction6].[Deleted] = 0
-    ) AS [t12] ON [AssessmentResourceActivity5].[Id] = [t12].[AssessmentResourceActivityId]
+	LEFT JOIN [activity].[AssessmentResourceActivityInteraction] AS [t12] ON [AssessmentResourceActivity5].[Id] = [t12].[AssessmentResourceActivityId] AND [t12].[Deleted] = 0
     WHERE [AssessmentResourceActivity5].[Deleted] = 0
 ) AS [t11] ON [t2].[Id] = [t11].[ResourceActivityId]
 GROUP BY [t2].[Id]	
 ) tbl)
-END
+END
\ No newline at end of file

From 9d6b807362a41a2dc4c0e357a15ca86a2791f235 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Tue, 22 Oct 2024 11:43:04 +0100
Subject: [PATCH 071/143] TD-2396: Add ability to insert Dev ID

---
 .../Controllers/ResourceController.cs         |   41 +-
 .../Interfaces/IResourceService.cs            |   23 +-
 .../LearningHub.Nhs.AdminUI.csproj            |    2 +-
 .../Services/ResourceService.cs               |   84 +
 .../Views/Resource/Details.cshtml             | 1657 +++++++++--------
 .../Views/Resource/_DevIdDetails.cshtml       |   22 +
 .../LearningHub.Nhs.WebUI.csproj              |    2 +-
 .../LearningHub.Nhs.OpenApi.Models.csproj     |    2 +-
 ...gHub.Nhs.OpenApi.Services.Interface.csproj |    2 +-
 .../LearningHub.Nhs.OpenApi.Services.csproj   |    2 +-
 .../Controllers/ResourceController.cs         |   37 +
 .../LearningHub.Nhs.Api.csproj                |    2 +-
 .../LearningHub.Nhs.Api.Shared.csproj         |    2 +-
 .../LearningHub.Nhs.Api.UnitTests.csproj      |    2 +-
 .../LearningHub.Nhs.Database.sqlproj          |    1 +
 .../TD-2396-Add_DevId_ResourceVersion.sql     |    2 +
 .../ResourceVersionCreateDuplicate.sql        |    5 +-
 .../Resources/ResourceVersionCreateNext.sql   |    5 +-
 ...earningHub.Nhs.Repository.Interface.csproj |    2 +-
 .../Resources/IResourceVersionRepository.cs   |   24 +-
 .../LearningHub.Nhs.Repository.csproj         |    2 +-
 .../Resources/ResourceVersionRepository.cs    |   41 +
 .../IResourceService.cs                       |   22 +
 .../LearningHub.Nhs.Services.Interface.csproj |    2 +-
 .../LearningHub.Nhs.Services.UnitTests.csproj |    2 +-
 .../LearningHub.Nhs.Services.csproj           |    2 +-
 .../ResourceService.cs                        |   50 +-
 ...earningHub.Nhs.Migration.ConsoleApp.csproj |    2 +-
 ...LearningHub.Nhs.Migration.Interface.csproj |    2 +-
 .../LearningHub.Nhs.Migration.Models.csproj   |    2 +-
 ...ub.Nhs.Migration.Staging.Repository.csproj |    2 +-
 ...LearningHub.Nhs.Migration.UnitTests.csproj |    2 +-
 .../LearningHub.Nhs.Migration.csproj          |    2 +-
 33 files changed, 1218 insertions(+), 834 deletions(-)
 create mode 100644 AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/_DevIdDetails.cshtml
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Scripts/TD-2396-Add_DevId_ResourceVersion.sql

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs
index 2338e457c..1a662d524 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs
@@ -91,11 +91,15 @@ public ResourceController(
         /// The Details.
         /// </summary>
         /// <param name="id">The id<see cref="int"/>.</param>
+        /// <param name="activeTab">The activeTab<see cref="string"/>.</param>
+        /// <param name="status">The status<see cref="string"/>.</param>
         /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
         [HttpGet]
-        public async Task<IActionResult> Details(int id)
+        public async Task<IActionResult> Details(int id, string activeTab = "details", string status = "")
         {
             var resource = await this.resourceService.GetResourceVersionExtendedViewModelAsync(id);
+            this.ViewBag.ActiveTab = activeTab;
+            this.ViewBag.Status = status;
             return this.View(resource);
         }
 
@@ -138,6 +142,41 @@ public async Task<IActionResult> GetValidationResults(int resourceVersionId)
             return this.PartialView("_ValidationResults", vm);
         }
 
+        /// <summary>
+        /// The GetDevIdDetails.
+        /// </summary>
+        /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpPost]
+        public async Task<IActionResult> GetDevIdDetails(int resourceVersionId)
+        {
+            var vm = await this.resourceService.GetResourceVersionDevIdDetailsAsync(resourceVersionId);
+
+            return this.PartialView("_DevIdDetails", vm);
+        }
+
+        /// <summary>
+        /// The update the dev Id details.
+        /// </summary>
+        /// <param name="model">The model.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpPost]
+        public async Task<IActionResult> UpdateDevIdDetails(ResourceVersionDevIdViewModel model)
+        {
+            var message = string.Empty;
+            if (await this.resourceService.DoesDevIdExistsAsync(model.DevId))
+            {
+                message = "Duplicate";
+            }
+            else
+            {
+                await this.resourceService.UpdateDevIdDetailsAsync(model);
+                message = "Success";
+            }
+
+            return this.RedirectToAction("Details", new { id = model.ResourceVersionId, activeTab = "devId", status = message });
+        }
+
         /// <summary>
         /// The Index.
         /// </summary>
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IResourceService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IResourceService.cs
index 826c98b55..703be694e 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IResourceService.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IResourceService.cs
@@ -32,9 +32,30 @@ public interface IResourceService
         /// The GetResourceVersionValidationResultAsync.
         /// </summary>
         /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
-        /// <returns>The <see cref="Task{ResourceVersionEventViewModel}}"/>.</returns>
+        /// <returns>The <see cref="Task{ResourceVersionValidationResultViewModel}}"/>.</returns>
         Task<ResourceVersionValidationResultViewModel> GetResourceVersionValidationResultAsync(int resourceVersionId);
 
+        /// <summary>
+        /// The GetResourceVersionDevIdDetailsAsync.
+        /// </summary>
+        /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
+        /// <returns>The <see cref="Task{ResourceVersionDevIdViewModel}}"/>.</returns>
+        Task<ResourceVersionDevIdViewModel> GetResourceVersionDevIdDetailsAsync(int resourceVersionId);
+
+        /// <summary>
+        /// Check dev id already exist against a resource.
+        /// </summary>
+        /// <param name="devId">string devId.</param>
+        /// <returns>The <see cref="Task{bool}"/>.</returns>
+        Task<bool> DoesDevIdExistsAsync(string devId);
+
+        /// <summary>
+        /// To update dev id details for a resource.
+        /// </summary>
+        /// <param name="model">the ResourceVersionDevIdViewModel.</param>
+        /// <returns>The <see cref="Task{ResourceVersionDevIdViewModel}}"/>.</returns>
+        Task UpdateDevIdDetailsAsync(ResourceVersionDevIdViewModel model);
+
         /// <summary>
         /// The GetResourceVersionExtendedViewModelAsync.
         /// </summary>
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
index 4ea6a2e6a..798171c31 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
+++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
@@ -89,7 +89,7 @@
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 	<PackageReference Include="IdentityModel" Version="4.4.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/ResourceService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/ResourceService.cs
index d0d595b52..4c6e3fe46 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Services/ResourceService.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/ResourceService.cs
@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Net;
     using System.Net.Http;
     using System.Text;
     using System.Threading.Tasks;
@@ -130,6 +131,89 @@ public async Task<ResourceVersionValidationResultViewModel> GetResourceVersionVa
             return viewmodel;
         }
 
+        /// <summary>
+        /// The GetResourceVersionDevIdDetailsAsync.
+        /// </summary>
+        /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
+        /// <returns>The <see cref="List{ResourceVersionDevIdViewModel}"/>.</returns>
+        public async Task<ResourceVersionDevIdViewModel> GetResourceVersionDevIdDetailsAsync(int resourceVersionId)
+        {
+            ResourceVersionDevIdViewModel viewmodel = null;
+
+            var client = await this.LearningHubHttpClient.GetClientAsync();
+
+            var request = $"Resource/GetResourceVersionDevIdDetails/{resourceVersionId.ToString()}";
+            var response = await client.GetAsync(request).ConfigureAwait(false);
+
+            if (response.IsSuccessStatusCode)
+            {
+                var result = response.Content.ReadAsStringAsync().Result;
+                viewmodel = JsonConvert.DeserializeObject<ResourceVersionDevIdViewModel>(result);
+            }
+            else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized
+                        ||
+                     response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+            {
+                throw new Exception("AccessDenied");
+            }
+
+            return viewmodel;
+        }
+
+        /// <summary>
+        /// The GetResourceVersionDevIdDetailsAsync.
+        /// </summary>
+        /// <param name="devId">The devId<see cref="string"/>.</param>
+        /// <returns>The <see cref="List{ResourceVersionDevIdViewModel}"/>.</returns>
+        public async Task<bool> DoesDevIdExistsAsync(string devId)
+        {
+            var client = await this.LearningHubHttpClient.GetClientAsync();
+
+            var request = $"Resource/DoesDevIdExists/{devId}";
+            var response = await client.GetAsync(request).ConfigureAwait(false);
+            var doesDevIdExist = false;
+            if (response.IsSuccessStatusCode)
+            {
+                var result = response.Content.ReadAsStringAsync().Result;
+                doesDevIdExist = JsonConvert.DeserializeObject<bool>(result);
+            }
+            else if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized
+                        ||
+                     response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+            {
+                throw new Exception("AccessDenied");
+            }
+
+            return doesDevIdExist;
+        }
+
+        /// <summary>
+        /// Update dev id details for a resource.
+        /// </summary>
+        /// <param name="model">The model.</param>
+        /// <returns>The <see cref="List{ResourceVersionDevIdViewModel}"/>.</returns>
+        /// <exception cref="Exception">the exception.</exception>
+        public async Task UpdateDevIdDetailsAsync(ResourceVersionDevIdViewModel model)
+        {
+            var json = JsonConvert.SerializeObject(model);
+            var stringContent = new StringContent(json, UnicodeEncoding.UTF8, "application/json");
+
+            var client = await this.LearningHubHttpClient.GetClientAsync();
+
+            var request = $"Resource/UpdateDevId";
+            var response = await client.PutAsync(request, stringContent).ConfigureAwait(false);
+
+            if (response.StatusCode == HttpStatusCode.Unauthorized || response.StatusCode == HttpStatusCode.Forbidden)
+            {
+                throw new Exception("AccessDenied");
+            }
+
+            if (!response.IsSuccessStatusCode)
+            {
+                throw new Exception("Update first name failed!");
+            }
+        }
+
         /// <summary>
         /// The GetResourceVersionExtendedViewModelAsync.
         /// </summary>
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/Details.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/Details.cshtml
index a2df6a2c6..44b2f9b11 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/Details.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/Details.cshtml
@@ -5,862 +5,913 @@
 @inject IOptions<WebSettings> webSettings
 
 @{
-    ViewData["Title"] = "Details";
+  ViewData["Title"] = "Details";
+  var activetab = this.ViewBag.ActiveTab;
 }
 
 @section Styles{
-    <link href="~/css/Pages/resource_details.css" type="text/css" rel="stylesheet" />
+  <link href="~/css/Pages/resource_details.css" type="text/css" rel="stylesheet" />
 }
 
 <div class="panel-body admin-body resource-admin">
 
-    <!-- Alert Text -->
-    <div class="d-flex ml-5 my-2">
-        <div id="alertInfo" class="alert"></div>
+  <!-- Alert Text -->
+  <div class="d-flex ml-5 my-2">
+    <div id="alertInfo" class="alert"></div>
+  </div>
+  <!-- /.Alert Text -->
+  @if (Model.ResourceVersionId == 0)
+  {
+    <div class="m-4">Resource Version not found</div>
+  }
+  else
+  {
+    <div class="admin-title d-flex flex-row justify-content-between col-12">
+      <div>@Model.Title (<span id="versionStatusDescription" class="@(Model.VersionStatusEnum == VersionStatusEnum.Publishing ? "info-highlight" : "")">@Model.VersionStatusDescription</span>)</div>
+      <div id="actions" class="right-side">
+        @if (Model.VersionStatusEnum == VersionStatusEnum.Published)
+        {
+          <button id="unpublishAction" type="button" class="btn btn-admin" data-toggle="modal" data-target="#unpublish">Unpublish</button>
+        }
+        @if (Model.VersionStatusEnum == VersionStatusEnum.Publishing || Model.VersionStatusEnum == VersionStatusEnum.FailedToPublish)
+        {
+          <button id="revertToDraftAction" type="button" class="btn btn-admin" data-toggle="modal" data-target="#revertToDraft">Revert to Draft</button>
+        }
+        <button id="transferResourceAction" type="button" class="btn btn-admin" data-toggle="modal" data-target="#transferResource">Transfer Resource</button>
+      </div>
     </div>
-    <!-- /.Alert Text -->
-    @if (Model.ResourceVersionId == 0)
-    {
-        <div class="m-4">Resource Version not found</div>
-    }
-    else
-    {
-        <div class="admin-title d-flex flex-row justify-content-between col-12">
-            <div>@Model.Title (<span id="versionStatusDescription" class="@(Model.VersionStatusEnum == VersionStatusEnum.Publishing ? "info-highlight" : "")">@Model.VersionStatusDescription</span>)</div>
-            <div id="actions" class="right-side">
-                @if (Model.VersionStatusEnum == VersionStatusEnum.Published)
-                {
-                    <button id="unpublishAction" type="button" class="btn btn-admin" data-toggle="modal" data-target="#unpublish">Unpublish</button>
-                }
-                @if (Model.VersionStatusEnum == VersionStatusEnum.Publishing || Model.VersionStatusEnum == VersionStatusEnum.FailedToPublish)
-                {
-                    <button id="revertToDraftAction" type="button" class="btn btn-admin" data-toggle="modal" data-target="#revertToDraft">Revert to Draft</button>
-                }
-                <button id="transferResourceAction" type="button" class="btn btn-admin" data-toggle="modal" data-target="#transferResource">Transfer Resource</button>
-            </div>
-        </div>
 
-        <div id="unpublish" ref="unpublishResourceModal" class="modal unpublish-modal" tabindex="-1" role="dialog" data-backdrop="static" data-keyboad="false">
-            <div class="modal-dialog modal-dialog-centered modal-md" role="document">
-                <div class="modal-content">
-                    <div class="modal-header text-center">
-                        <h1 class="heading-lg w-100">Unpublish Resource</h1>
-                    </div>
-
-                    <div class="modal-body">
-                        <form id="unpublishForm">
-                            <div class="mt-3">If you unpublish this resource learners will not be able to find or access it.</div>
-                            <div class="mt-3">Please provide a reason for unpublishing this resource (<span class="info-danger">everything you write here can be seen by the contributor of the resource</span>).</div>
-                            <textarea name="flag" id="flag" class="mt-3 w-100 form-control"
-                                  rows="5"
-                                  data-val-required="A reason for unpublishing is required."
-                                  data-val-maxlength-max="1024"
-                                  data-val-maxlength="The reason for unpublishing has a maximum length of '1024' characters."
-                                  data-val="true"></textarea>
-                            <span class="field-validation-valid" data-valmsg-for="flag" data-valmsg-replace="true"></span>
-                        </form>
-                    </div>
-
-                    <div class="modal-footer">
-                        <button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
-                        <button class="btn btn-unpublish" onclick="unpublish()">Unpublish</button>
-                    </div>
-                </div>
-            </div>
+    <div id="unpublish" ref="unpublishResourceModal" class="modal unpublish-modal" tabindex="-1" role="dialog" data-backdrop="static" data-keyboad="false">
+      <div class="modal-dialog modal-dialog-centered modal-md" role="document">
+        <div class="modal-content">
+          <div class="modal-header text-center">
+            <h1 class="heading-lg w-100">Unpublish Resource</h1>
+          </div>
+
+          <div class="modal-body">
+            <form id="unpublishForm">
+              <div class="mt-3">If you unpublish this resource learners will not be able to find or access it.</div>
+              <div class="mt-3">Please provide a reason for unpublishing this resource (<span class="info-danger">everything you write here can be seen by the contributor of the resource</span>).</div>
+              <textarea name="flag" id="flag" class="mt-3 w-100 form-control"
+                        rows="5"
+                        data-val-required="A reason for unpublishing is required."
+                        data-val-maxlength-max="1024"
+                        data-val-maxlength="The reason for unpublishing has a maximum length of '1024' characters."
+                        data-val="true"></textarea>
+              <span class="field-validation-valid" data-valmsg-for="flag" data-valmsg-replace="true"></span>
+            </form>
+          </div>
+
+          <div class="modal-footer">
+            <button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
+            <button class="btn btn-unpublish" onclick="unpublish()">Unpublish</button>
+          </div>
         </div>
+      </div>
+    </div>
 
-        <div id="revertToDraft" ref="revertToDraftModal" class="modal revert-to-draft-modal" tabindex="-1" role="dialog" data-backdrop="static" data-keyboad="false">
-            <div class="modal-dialog modal-dialog-centered modal-md" role="document">
-                <div class="modal-content">
-                    <div class="modal-header text-center">
-                        <h1 class="heading-lg w-100">Revert to Draft</h1>
-                    </div>
-
-                    <div class="modal-body">
-                        <form id="revertToDraftForm">
-                            <div class="mt-3">Please confirm that you wish to revert this Resource Version to a status of 'Draft'.</div>
-                        </form>
-                    </div>
-
-                    <div class="modal-footer">
-                        <button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
-                        <button class="btn btn-revert" onclick="revertToDraft()">Revert to Draft</button>
-                    </div>
-                </div>
-            </div>
+    <div id="revertToDraft" ref="revertToDraftModal" class="modal revert-to-draft-modal" tabindex="-1" role="dialog" data-backdrop="static" data-keyboad="false">
+      <div class="modal-dialog modal-dialog-centered modal-md" role="document">
+        <div class="modal-content">
+          <div class="modal-header text-center">
+            <h1 class="heading-lg w-100">Revert to Draft</h1>
+          </div>
+
+          <div class="modal-body">
+            <form id="revertToDraftForm">
+              <div class="mt-3">Please confirm that you wish to revert this Resource Version to a status of 'Draft'.</div>
+            </form>
+          </div>
+
+          <div class="modal-footer">
+            <button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
+            <button class="btn btn-revert" onclick="revertToDraft()">Revert to Draft</button>
+          </div>
         </div>
+      </div>
+    </div>
 
-        <div id="transferResource" ref="transferResourceModal" class="modal transfer-resource-modal" tabindex="-1" role="dialog" data-backdrop="static" data-keyboad="false">
-            <div class="modal-dialog modal-dialog-centered modal-md" role="document">
-                <div class="modal-content">
-                    <div class="modal-header text-center">
-                        <h1 class="heading-lg w-100">Transfer Resource</h1>
-                    </div>
-
-                    <div class="modal-body">
-                        <form id="transferResourceForm">
-                            <div class="mt-3">On transferring a resource it will appear under 'My contributions' of the new Owner.</div>
-                            <div class="mt-3">If the Username exists in the e-LfH Hub but the User had not yet logged into the Learning Hub then their User details will be registered in the Learning Hub as part of the transfer.</div>
-                            <div class="mt-3">Resource: '@Model.Title (@Model.ResourceTypeDescription)'</div>
-                            <div class="mt-3">Current Owner Username: <span id="transferFromUser">@Model.CreateUser</span></div>
-                            <div class="mt-3">Please provide the <b>Username</b> of the new Owner:</div>
-                            <input type="text" id="newResourceOwner" name="newResourceOwner" class="mt-3 w-100 form-control"
-                               data-val-required="New Resource Owner is required."
-                               data-val-maxlength-max="50"
-                               data-val-maxlength="New Resource Owner has a maximum length of '50' characters."
-                               data-val="true">
-                            <span class="field-validation-valid" data-valmsg-for="newResourceOwner" data-valmsg-replace="true"></span>
-                        </form>
-                    </div>
-
-                    <div class="modal-footer">
-                        <button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
-                        <button class="btn btn-transfer" onclick="transferResource()">Transfer Resource</button>
-                    </div>
-                </div>
-            </div>
+    <div id="transferResource" ref="transferResourceModal" class="modal transfer-resource-modal" tabindex="-1" role="dialog" data-backdrop="static" data-keyboad="false">
+      <div class="modal-dialog modal-dialog-centered modal-md" role="document">
+        <div class="modal-content">
+          <div class="modal-header text-center">
+            <h1 class="heading-lg w-100">Transfer Resource</h1>
+          </div>
+
+          <div class="modal-body">
+            <form id="transferResourceForm">
+              <div class="mt-3">On transferring a resource it will appear under 'My contributions' of the new Owner.</div>
+              <div class="mt-3">If the Username exists in the e-LfH Hub but the User had not yet logged into the Learning Hub then their User details will be registered in the Learning Hub as part of the transfer.</div>
+              <div class="mt-3">Resource: '@Model.Title (@Model.ResourceTypeDescription)'</div>
+              <div class="mt-3">Current Owner Username: <span id="transferFromUser">@Model.CreateUser</span></div>
+              <div class="mt-3">Please provide the <b>Username</b> of the new Owner:</div>
+              <input type="text" id="newResourceOwner" name="newResourceOwner" class="mt-3 w-100 form-control"
+                     data-val-required="New Resource Owner is required."
+                     data-val-maxlength-max="50"
+                     data-val-maxlength="New Resource Owner has a maximum length of '50' characters."
+                     data-val="true">
+              <span class="field-validation-valid" data-valmsg-for="newResourceOwner" data-valmsg-replace="true"></span>
+            </form>
+          </div>
+
+          <div class="modal-footer">
+            <button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
+            <button class="btn btn-transfer" onclick="transferResource()">Transfer Resource</button>
+          </div>
         </div>
+      </div>
+    </div>
 
-        <div class="tabsbar" id="tabsbar">
-            <ul class="nav nav-tabs" id="myTab" role="tablist">
-                <li class="tab-item large">
-                    <a class="tab-link active" id="details-tab" data-toggle="tab" href="#details" role="tab" aria-controls="details" aria-selected="true">Details</a>
-                </li>
-                <li class="tab-item">
-                    <a class="tab-link" id="resource-tab" data-toggle="tab" href="#resource" role="tab" aria-controls="resource" aria-selected="false">Resource</a>
-                </li>
-                <li class="tab-item">
-                    <a class="tab-link" id="events-tab" href="#events" role="tab" aria-controls="events" aria-selected="false">Event History</a>
-                </li>
-                <li class="tab-item">
-                    <a class="tab-link" id="history-tab" href="#history" role="tab" aria-controls="events" aria-selected="false">Version History</a>
-                </li>
-                @if (Model.HasValidationErrors)
+    <div class="tabsbar" id="tabsbar">
+      <ul class="nav nav-tabs" id="myTab" role="tablist">
+        <li class="tab-item large">
+          <a class="tab-link @(ViewBag.ActiveTab == "details" ? "active" : "")" id="details-tab" data-toggle="tab" href="#details" role="tab" aria-controls="details" aria-selected="true">Details</a>
+        </li>
+        <li class="tab-item">
+          <a class="tab-link" id="resource-tab" data-toggle="tab" href="#resource" role="tab" aria-controls="resource" aria-selected="false">Resource</a>
+        </li>
+        <li class="tab-item">
+          <a class="tab-link" id="events-tab" href="#events" role="tab" aria-controls="events" aria-selected="false">Event History</a>
+        </li>
+        <li class="tab-item">
+          <a class="tab-link" id="history-tab" href="#history" role="tab" aria-controls="events" aria-selected="false">Version History</a>
+        </li>
+        <li class="tab-item">
+          <a class="tab-link @(ViewBag.ActiveTab == "devId" ? "active" : "")" id="devId-tab" href="#devId" role="tab" aria-controls="DevIds" aria-selected="false">Dev ID</a>
+        </li>
+        @if (Model.HasValidationErrors)
+        {
+          <li class="tab-item">
+            <a class="tab-link" id="validation-tab" href="#validationResult" role="tab" aria-controls="events" aria-selected="false">Validation Errors</a>
+          </li>
+        }
+      </ul>
+    </div>
+
+    <div class="tab-content" id="myTabContent">
+
+      <div class="tab-pane fade  @(ViewBag.ActiveTab == "details" ? "show active" : "")" id="details" role="tabpanel" aria-labelledby="details-tab">
+        <div class="admin-section">
+          <div class="col-12">
+            <div class="id-container">Resource Version ID: @Model.ResourceVersionId</div>
+            <dl>
+              @if (Model.Providers != null && Model.Providers.Count > 0)
+              {
+                <dt>Developed with</dt>
+                @foreach (var provider in Model.Providers)
                 {
-                    <li class="tab-item">
-                        <a class="tab-link" id="validation-tab" href="#validationResult" role="tab" aria-controls="events" aria-selected="false">Validation Errors</a>
-                    </li>
+                  <dd>
+                    @Html.DisplayFor(model =>provider.Name)
+                  </dd>
                 }
-            </ul>
+              }
+              @if (Model.VersionStatusEnum == VersionStatusEnum.Published)
+              {
+                <dt>URL</dt>
+                <dd>
+                  <a href="@String.Format("{0}Resource/{1}", webSettings.Value.LearningHubUrl, Model.DefaultResourceReferenceId)" target="_blank">
+                    @String.Format("{0}Resource/{1}", webSettings.Value.LearningHubUrl, Model.DefaultResourceReferenceId)
+                  </a>
+                </dd>
+              }
+              <dt>Resource Type</dt>
+              <dd>
+                @Html.DisplayFor(model => model.ResourceTypeDescription)
+              </dd>
+              <dt>Audience Access Level</dt>
+              <dd>
+                @ResourceAccessiblityHelper.GetResourceAccessibilityLevelText(Model.ResourceAccessibilityEnum)
+              </dd>
+              <dt>Title</dt>
+              <dd>
+                @Html.DisplayFor(model => model.Title)
+              </dd>
+              <dt>Description</dt>
+              <dd>
+                @Html.Raw(Model.Description)
+              </dd>
+              <dt>Additional Information</dt>
+              <dd>
+                @Html.Raw(Model.AdditionalInformation)
+              </dd>
+              <dt>Authors</dt>
+              <dd>
+                @Html.Raw(Model.Authors.Any() ? string.Join(",", Model.Authors) : "None specified")
+              </dd>
+              <dt>Keywords</dt>
+              <dd>
+                @Html.Raw(Model.Keywords.Any() ? string.Join(",", Model.Keywords) : "None specified")
+              </dd>
+              @if (Model.VersionStatusEnum == VersionStatusEnum.Published
+             || Model.VersionStatusEnum == VersionStatusEnum.Unpublished)
+              {
+                <dt>Version</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.VersionDescription)
+                </dd>
+              }
+              <dt>Version Status</dt>
+              <dd>
+                @Html.DisplayFor(model => model.VersionStatusDescription)
+              </dd>
+              <dt>Create User</dt>
+              <dd id="createUserName">
+                @Html.DisplayFor(model => model.CreateUser)
+              </dd>
+              <dt>Create Date</dt>
+              <dd>
+                @Model.CreateDate.DateTime
+              </dd>
+            </dl>
+          </div>
         </div>
-
-        <div class="tab-content" id="myTabContent">
-
-            <div class="tab-pane fade show active" id="details" role="tabpanel" aria-labelledby="details-tab">
-                <div class="admin-section">
-                    <div class="col-12">
-                        <div class="id-container">Resource Version ID: @Model.ResourceVersionId</div>
-                        <dl>
-                            @if (Model.Providers != null && Model.Providers.Count > 0)
-                            {
-                                <dt>Developed with</dt>
-                                @foreach (var provider in Model.Providers)
-                                {
-                                <dd>
-                                    @Html.DisplayFor(model =>provider.Name)
-                                </dd>
-                                }
-                            }
-                            @if (Model.VersionStatusEnum == VersionStatusEnum.Published)
-                            {
-                                <dt>URL</dt>
-                                <dd>
-                                    <a href="@String.Format("{0}Resource/{1}", webSettings.Value.LearningHubUrl, Model.DefaultResourceReferenceId)" target="_blank">
-                                        @String.Format("{0}Resource/{1}", webSettings.Value.LearningHubUrl, Model.DefaultResourceReferenceId)
-                                    </a>
-                                </dd>
-                            }
-                            <dt>Resource Type</dt>
-                            <dd>
-                                @Html.DisplayFor(model => model.ResourceTypeDescription)
-                            </dd>
-                            <dt>Audience Access Level</dt>
-                            <dd>
-                                @ResourceAccessiblityHelper.GetResourceAccessibilityLevelText(Model.ResourceAccessibilityEnum)
-                            </dd>
-                            <dt>Title</dt>
-                            <dd>
-                                @Html.DisplayFor(model => model.Title)
-                            </dd>
-                            <dt>Description</dt>
-                            <dd>
-                                @Html.Raw(Model.Description)
-                            </dd>
-                            <dt>Additional Information</dt>
-                            <dd>
-                                @Html.Raw(Model.AdditionalInformation)
-                            </dd>
-                            <dt>Authors</dt>
-                            <dd>
-                                @Html.Raw(Model.Authors.Any() ? string.Join(",", Model.Authors) : "None specified")
-                            </dd>
-                            <dt>Keywords</dt>
-                            <dd>
-                                @Html.Raw(Model.Keywords.Any() ? string.Join(",", Model.Keywords) : "None specified")
-                            </dd>
-                            @if (Model.VersionStatusEnum == VersionStatusEnum.Published
-                           || Model.VersionStatusEnum == VersionStatusEnum.Unpublished)
-                            {
-                                <dt>Version</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.VersionDescription)
-                                </dd>
-                            }
-                            <dt>Version Status</dt>
-                            <dd>
-                                @Html.DisplayFor(model => model.VersionStatusDescription)
-                            </dd>
-                            <dt>Create User</dt>
-                            <dd id="createUserName">
-                                @Html.DisplayFor(model => model.CreateUser)
-                            </dd>
-                            <dt>Create Date</dt>
-                            <dd>
-                                @Model.CreateDate.DateTime
-                            </dd>
-                        </dl>
-                    </div>
-                </div>
+      </div>
+
+      <div class="tab-pane fade show" id="resource" role="tabpanel" aria-labelledby="resource-tab">
+        <div class="admin-section">
+
+          @if (Model.ResourceTypeEnum == ResourceTypeEnum.Article)
+          {
+            <div class="col-12">
+              <div class="id-container">Resource Version ID: @Model.ResourceVersionId</div>
+              <dl>
+                <dt>Resource Version Id</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceVersionId)
+                </dd>
+                <dt>Resource Type</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceTypeDescription)
+                </dd>
+                <dt>Content</dt>
+                <dd>
+                  @Html.Raw(Model.ArticleDetails.Content)
+                </dd>
+                <dt>Attachments</dt>
+                <dd>
+                  @if (Model.ArticleDetails.Files.Any())
+                  {
+                    @(await Html.PartialAsync("_Files", Model.ArticleDetails.Files))
+                  }
+                  else
+                  {
+                    @Html.Raw("None")
+                  }
+                </dd>
+              </dl>
             </div>
-
-            <div class="tab-pane fade show" id="resource" role="tabpanel" aria-labelledby="resource-tab">
-                <div class="admin-section">
-
-                    @if (Model.ResourceTypeEnum == ResourceTypeEnum.Article)
-                    {
-                        <div class="col-12">
-                            <div class="id-container">Resource Version ID: @Model.ResourceVersionId</div>
-                            <dl>
-                                <dt>Resource Version Id</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceVersionId)
-                                </dd>
-                                <dt>Resource Type</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceTypeDescription)
-                                </dd>
-                                <dt>Content</dt>
-                                <dd>
-                                    @Html.Raw(Model.ArticleDetails.Content)
-                                </dd>
-                                <dt>Attachments</dt>
-                                <dd>
-                                    @if (Model.ArticleDetails.Files.Any())
-                                    {
-                                        @(await Html.PartialAsync("_Files", Model.ArticleDetails.Files))
-                                    }
-                                    else
-                                    {
-                                        @Html.Raw("None")
-                                    }
-                                </dd>
-                            </dl>
-                        </div>
-                    }
-
-                    @if (Model.ResourceTypeEnum == ResourceTypeEnum.Audio)
-                    {
-                        <div class="col-12">
-                            @if (Model.AudioDetails.File == null || Model.AudioDetails.TranscriptFile == null)
-                            {
-                                <div class="alert alert-danger">
-                                    @if (Model.AudioDetails.File == null)
-                                    {
-                                        @Html.Raw("No Audio File is associated with this Resource Version")
-                                    }
-                                    @if (Model.AudioDetails.TranscriptFile == null)
-                                    {
-                                        @Html.Raw("No Transcript File is associated with this Resource Version")
-                                    }
-                                </div>
-                            }
-                            <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
-                            <dl>
-                                <dt>Resource Version Id</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceVersionId)
-                                </dd>
-                                <dt>Resource Type</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceTypeDescription)
-                                </dd>
-                                @if (@Model.AudioDetails.File != null)
-                                {
-                                    <dt>Audio File</dt>
-                                    <dd>
-                                        <a href="@String.Format("{0}Media/DownloadInputAsset/{1}/{2}", webSettings.Value.LearningHubAdminUrl, @Model.AudioDetails.File.FilePath, Model.AudioDetails.File.FileName)" target="_blank" download>@Model.AudioDetails.File.FileName</a>
-                                    </dd>
-                                    <dt>Audio File Path</dt>
-                                    <dd>
-                                        @Model.AudioDetails.File.FilePath
-                                    </dd>
-                                }
-                                @if (@Model.AudioDetails.TranscriptFile != null)
-                                {
-                                    <dt>Transcript File</dt>
-                                    <dd>
-                                        <a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.AudioDetails.TranscriptFile.FilePath, Model.AudioDetails.TranscriptFile.FileName)" target="_blank" download>@Model.AudioDetails.TranscriptFile.FileName</a>
-                                    </dd>
-                                    <dt>Transcript File Path</dt>
-                                    <dd>
-                                        @Model.AudioDetails.TranscriptFile.FilePath
-                                    </dd>
-                                }
-                            </dl>
-                        </div>
-                    }
-
-                    @if (Model.ResourceTypeEnum == ResourceTypeEnum.Case)
-                    {
-                        <div class="col-12">
-                            <div class="id-container">Resource Version ID: @Model.ResourceVersionId</div>
-                            <dl>
-                                <dt>Resource Version Id</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceVersionId)
-                                </dd>
-                                <dt>Resource Type</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceTypeDescription)
-                                </dd>
-                                @if (Model.CaseDetails is { BlockCollection: { } })
-                                {
-                                    if (Model.CaseDetails.BlockCollection.Blocks != null)
-                                    {
-                                        <dt>Number of Blocks</dt>
-                                        <dd>
-                                            @Html.DisplayFor(model => model.CaseDetails.BlockCollection.Blocks.Count)
-                                        </dd>
-                                    }
-                                }
-                            </dl>
-
-                            @if (Model.CaseDetails is { BlockCollection: { } })
-                            {
-                                <partial name="~/Views/Resource/BlockCollectionDetails.cshtml" model="@Model.CaseDetails.BlockCollection" />
-                            }
-                        </div>
-                    }
-
-                    @if (Model.ResourceTypeEnum == ResourceTypeEnum.Embedded)
-                    {
-                        <div class="col-12">
-                            <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
-                            <dl>
-                                <dt>Resource Version Id</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceVersionId)
-                                </dd>
-                                <dt>Resource Type</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceTypeDescription)
-                                </dd>
-                                <dt>Embed Code</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.EmbedCodeDetails.EmbedCode)
-                                </dd>
-                            </dl>
-                        </div>
-                    }
-
-                    @if (Model.ResourceTypeEnum == ResourceTypeEnum.GenericFile)
-                    {
-                        <div class="col-12">
-                            @if (Model.GenericFileDetails == null || Model.GenericFileDetails.File == null)
-                            {
-                                <div class="alert alert-danger">
-                                    @Html.Raw("No File is associated with this Resource Version")
-                                </div>
-                            }
-                            <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
-                            <dl>
-                                <dt>Resource Version Id</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceVersionId)
-                                </dd>
-                                <dt>Resource Type</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceTypeDescription)
-                                </dd>
-                                @if (Model.GenericFileDetails != null && @Model.GenericFileDetails.File != null)
-                                {
-                                    <dt>File</dt>
-                                    <dd>
-                                        <a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.GenericFileDetails.File.FilePath, Model.GenericFileDetails.File.FileName)" target="_blank" download>@Model.GenericFileDetails.File.FileName</a>
-                                        (@Model.GenericFileDetails.File.FileType.Name)
-                                    </dd>
-                                    <dt>File Path</dt>
-                                    <dd>
-                                        @Model.GenericFileDetails.File.FilePath
-                                    </dd>
-                                    <dt>
-                                        <label for="chkScormAicc" class="control-label mb-0">Scorm / AICC Content</label>
-                                    </dt>
-                                    <dd>
-                                        <input id="chkScormAicc" class="check-box" disabled="disabled" type="checkbox" checked="@Model.GenericFileDetails.ScormAiccContent" />
-                                    </dd>
-                                }
-                            </dl>
-                        </div>
-                    }
-
-                    @if (Model.ResourceTypeEnum == ResourceTypeEnum.Image)
-                    {
-                        <div class="col-12">
-                            @if (Model.ImageDetails.File == null)
-                            {
-                                <div class="alert alert-danger">
-                                    @if (Model.ImageDetails.File == null)
-                                    {
-                                        @Html.Raw("No Image File is associated with this Resource Version")
-                                    }
-                                </div>
-                            }
-                            <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
-                            <dl>
-                                <dt>Resource Version Id</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceVersionId)
-                                </dd>
-                                <dt>Resource Type</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceTypeDescription)
-                                </dd>
-                                @if (@Model.ImageDetails.File != null)
-                                {
-                                    <dt>Image File</dt>
-                                    <dd>
-                                        <a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.ImageDetails.File.FilePath, Model.ImageDetails.File.FileName)" target="_blank" download>@Model.ImageDetails.File.FileName</a>
-                                        (@Model.ImageDetails.File.FileType.Name)
-                                    </dd>
-                                    <dt>Image File Path</dt>
-                                    <dd>
-                                        @Model.ImageDetails.File.FilePath
-                                    </dd>
-                                }
-                                <dt>Alt Tag</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ImageDetails.AltTag)
-                                </dd>
-                            </dl>
-                        </div>
-                    }
-
-                    @if (Model.ResourceTypeEnum == ResourceTypeEnum.Video)
-                    {
-                        <div class="col-12">
-                            @if (Model.VideoDetails.File == null || Model.VideoDetails.TranscriptFile == null || Model.VideoDetails.ClosedCaptionsFile == null)
-                            {
-                                <div class="alert alert-danger">
-                                    @if (Model.VideoDetails.File == null)
-                                    {
-                                        @Html.Raw("<li>No Video File is associated with this Resource Version</li>")
-                                    }
-                                    @if (Model.VideoDetails.TranscriptFile == null)
-                                    {
-                                        @Html.Raw("<li>No Transcript File is associated with this Resource Version</li>")
-                                    }
-                                    @if (Model.VideoDetails.ClosedCaptionsFile == null)
-                                    {
-                                        @Html.Raw("<li>No Closed Captions File is associated with this Resource Version</li>")
-                                    }
-                                </div>
-                            }
-                            <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
-                            <dl>
-                                <dt>Resource Version Id</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceVersionId)
-                                </dd>
-                                <dt>Resource Type</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceTypeDescription)
-                                </dd>
-                                @if (@Model.VideoDetails.File != null)
-                                {
-                                    <dt>Video File</dt>
-                                    <dd>
-                                        <a href="@String.Format("{0}Media/DownloadInputAsset/{1}/{2}", webSettings.Value.LearningHubAdminUrl, @Model.VideoDetails.File.FilePath, Model.VideoDetails.File.FileName)" target="_blank" download>@Model.VideoDetails.File.FileName</a>
-                                    </dd>
-                                    <dt>Video File Path</dt>
-                                    <dd>
-                                        @Model.VideoDetails.File.FilePath
-                                    </dd>
-                                }
-                                @if (@Model.VideoDetails.TranscriptFile != null)
-                                {
-                                    <dt>Transcript File</dt>
-                                    <dd>
-                                        <a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.VideoDetails.TranscriptFile.FilePath, Model.VideoDetails.TranscriptFile.FileName)" target="_blank" download>@Model.VideoDetails.TranscriptFile.FileName</a>
-                                    </dd>
-                                    <dt>Transcript File Path</dt>
-                                    <dd>
-                                        @Model.VideoDetails.TranscriptFile.FilePath
-                                    </dd>
-                                }
-                                @if (@Model.VideoDetails.ClosedCaptionsFile != null)
-                                {
-                                    <dt>Closed Captions File</dt>
-                                    <dd>
-                                        <a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.VideoDetails.ClosedCaptionsFile.FilePath, Model.VideoDetails.ClosedCaptionsFile.FileName)" target="_blank" download>@Model.VideoDetails.ClosedCaptionsFile.FileName</a>
-                                    </dd>
-                                    <dt>Closed Captions File Path</dt>
-                                    <dd>
-                                        @Model.VideoDetails.ClosedCaptionsFile.FilePath
-                                    </dd>
-                                }
-                            </dl>
-                        </div>
-                    }
-
-                    @if (Model.ResourceTypeEnum == ResourceTypeEnum.WebLink)
-                    {
-                        <div class="col-12">
-                            <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
-                            <dl>
-                                <dt>Resource Version Id</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceVersionId)
-                                </dd>
-                                <dt>Resource Type</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceTypeDescription)
-                                </dd>
-                                <dt>Url</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.WebLinkDetails.Url)
-                                </dd>
-                                <dt>Display Text</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.WebLinkDetails.DisplayText)
-                                </dd>
-                            </dl>
-                        </div>
-                    }
-
-                    @if (Model.ResourceTypeEnum == ResourceTypeEnum.Scorm)
-                    {
-                        <div class="col-12">
-                            <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
-                            <dl>
-                                <dt>Resource Version Id</dt>
-                                <dd>@Html.DisplayFor(model => model.ResourceVersionId)</dd>
-                                <dt>Resource Type</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceTypeDescription)
-                                </dd>
-                                <dt>ESR Link</dt>
-                                <dd><a href="@Model.ScormDetails.HostedContentUrl" target="_blank">@Model.ScormDetails.HostedContentUrl</a></dd>
-                                <dt>Zip File</dt>
-                                <dd>
-                                    <a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.ScormDetails.File.FilePath, Model.ScormDetails.File.FileName)" target="_blank" download>@Model.ScormDetails.File.FileName</a>
-                                </dd>
-                                <dt>Allowed Download</dt>
-                                <dd>@(Model.ScormDetails.CanDownload ? "Yes" : "No")</dd>
-                                <dt>Forced clearing of user suspend data</dt>
-                                <dd>@(Model.ScormDetails.ClearSuspendData ? "Yes" : "No")</dd>
-                                <dt>Content Folder</dt>
-                                <dd>@Model.ScormDetails.ContentFilePath</dd>
-                            </dl>
-                        </div>
-                    }
-
-                    @if (Model.ResourceTypeEnum == ResourceTypeEnum.Assessment)
-                    {
-                        <div class="col-12">
-                            <div class="id-container">Resource Version ID: @Model.ResourceVersionId</div>
-                            <dl>
-                                <dt>Resource Version Id</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceVersionId)
-                                </dd>
-                                <dt>Resource Type</dt>
-                                <dd>
-                                    @Html.DisplayFor(model => model.ResourceTypeDescription)
-                                </dd>
-                                @if (Model.AssessmentDetails is { AssessmentContent: { } })
-                                {
-                                    <dt>Assessment Type</dt>
-                                    <dd>
-                                        @Html.DisplayFor(model => model.AssessmentDetails.AssessmentType)
-                                    </dd>
-                                    if (Model.AssessmentDetails.PassMark != null)
-                                    {
-                                        <dt>Pass Mark</dt>
-                                        <dd>
-                                            @Html.DisplayFor(model => model.AssessmentDetails.PassMark)
-                                        </dd>
-                                    }
-                                    if (Model.AssessmentDetails.MaximumAttempts != null)
-                                    {
-                                        <dt>Maximum Attempts</dt>
-                                        <dd>
-                                            @Html.DisplayFor(model => model.AssessmentDetails.MaximumAttempts)
-                                        </dd>
-                                    }
-                                    <dt>Answer in order</dt>
-                                    <dd>
-                                        @(Model.AssessmentDetails.AnswerInOrder ? "Yes" : "No")
-                                    </dd>
-                                }
-                            </dl>
-                            @if (Model.AssessmentDetails is { EndGuidance: { } } && Model.AssessmentDetails.EndGuidance.Blocks != null)
-                            {
-                                <dl>
-                                    <dt>End Guidance: Number of Blocks</dt>
-                                    <dd>
-                                        @Html.DisplayFor(model => model.AssessmentDetails.EndGuidance.Blocks.Count)
-                                    </dd>
-                                    <partial name="~/Views/Resource/BlockCollectionDetails.cshtml" model="@Model.AssessmentDetails.EndGuidance" />
-                                </dl>
-                            }
-
-                            @if (Model.AssessmentDetails is { AssessmentContent: { } } && Model.AssessmentDetails.AssessmentContent.Blocks != null)
-                            {
-                                <dl>
-                                    <dt>Content: Number of Blocks</dt>
-                                    <dd>
-                                        @Html.DisplayFor(model => model.AssessmentDetails.AssessmentContent.Blocks.Count)
-                                    </dd>
-                                    <partial name="~/Views/Resource/BlockCollectionDetails.cshtml" model="@Model.AssessmentDetails.AssessmentContent" />
-                                </dl>
-                            }
-                        </div>
-                    }
+          }
+
+          @if (Model.ResourceTypeEnum == ResourceTypeEnum.Audio)
+          {
+            <div class="col-12">
+              @if (Model.AudioDetails.File == null || Model.AudioDetails.TranscriptFile == null)
+              {
+                <div class="alert alert-danger">
+                  @if (Model.AudioDetails.File == null)
+                  {
+                    @Html.Raw("No Audio File is associated with this Resource Version")
+                  }
+                  @if (Model.AudioDetails.TranscriptFile == null)
+                  {
+                    @Html.Raw("No Transcript File is associated with this Resource Version")
+                  }
                 </div>
+              }
+              <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
+              <dl>
+                <dt>Resource Version Id</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceVersionId)
+                </dd>
+                <dt>Resource Type</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceTypeDescription)
+                </dd>
+                @if (@Model.AudioDetails.File != null)
+                {
+                  <dt>Audio File</dt>
+                  <dd>
+                    <a href="@String.Format("{0}Media/DownloadInputAsset/{1}/{2}", webSettings.Value.LearningHubAdminUrl, @Model.AudioDetails.File.FilePath, Model.AudioDetails.File.FileName)" target="_blank" download>@Model.AudioDetails.File.FileName</a>
+                  </dd>
+                  <dt>Audio File Path</dt>
+                  <dd>
+                    @Model.AudioDetails.File.FilePath
+                  </dd>
+                }
+                @if (@Model.AudioDetails.TranscriptFile != null)
+                {
+                  <dt>Transcript File</dt>
+                  <dd>
+                    <a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.AudioDetails.TranscriptFile.FilePath, Model.AudioDetails.TranscriptFile.FileName)" target="_blank" download>@Model.AudioDetails.TranscriptFile.FileName</a>
+                  </dd>
+                  <dt>Transcript File Path</dt>
+                  <dd>
+                    @Model.AudioDetails.TranscriptFile.FilePath
+                  </dd>
+                }
+              </dl>
             </div>
+          }
+
+          @if (Model.ResourceTypeEnum == ResourceTypeEnum.Case)
+          {
+            <div class="col-12">
+              <div class="id-container">Resource Version ID: @Model.ResourceVersionId</div>
+              <dl>
+                <dt>Resource Version Id</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceVersionId)
+                </dd>
+                <dt>Resource Type</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceTypeDescription)
+                </dd>
+                @if (Model.CaseDetails is { BlockCollection: { } })
+                {
+                  if (Model.CaseDetails.BlockCollection.Blocks != null)
+                  {
+                    <dt>Number of Blocks</dt>
+                    <dd>
+                      @Html.DisplayFor(model => model.CaseDetails.BlockCollection.Blocks.Count)
+                    </dd>
+                  }
+                }
+              </dl>
 
-            <div class="tab-pane fade" id="events" role="tabpanel" aria-labelledby="events-tab">
-                <div class="admin-section">
-                    <div id="eventsList" class="pl-2"></div>
+              @if (Model.CaseDetails is { BlockCollection: { } })
+              {
+                <partial name="~/Views/Resource/BlockCollectionDetails.cshtml" model="@Model.CaseDetails.BlockCollection" />
+              }
+            </div>
+          }
+
+          @if (Model.ResourceTypeEnum == ResourceTypeEnum.Embedded)
+          {
+            <div class="col-12">
+              <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
+              <dl>
+                <dt>Resource Version Id</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceVersionId)
+                </dd>
+                <dt>Resource Type</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceTypeDescription)
+                </dd>
+                <dt>Embed Code</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.EmbedCodeDetails.EmbedCode)
+                </dd>
+              </dl>
+            </div>
+          }
+
+          @if (Model.ResourceTypeEnum == ResourceTypeEnum.GenericFile)
+          {
+            <div class="col-12">
+              @if (Model.GenericFileDetails == null || Model.GenericFileDetails.File == null)
+              {
+                <div class="alert alert-danger">
+                  @Html.Raw("No File is associated with this Resource Version")
                 </div>
+              }
+              <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
+              <dl>
+                <dt>Resource Version Id</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceVersionId)
+                </dd>
+                <dt>Resource Type</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceTypeDescription)
+                </dd>
+                @if (Model.GenericFileDetails != null && @Model.GenericFileDetails.File != null)
+                {
+                  <dt>File</dt>
+                  <dd>
+                    <a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.GenericFileDetails.File.FilePath, Model.GenericFileDetails.File.FileName)" target="_blank" download>@Model.GenericFileDetails.File.FileName</a>
+                    (@Model.GenericFileDetails.File.FileType.Name)
+                  </dd>
+                  <dt>File Path</dt>
+                  <dd>
+                    @Model.GenericFileDetails.File.FilePath
+                  </dd>
+                  <dt>
+                    <label for="chkScormAicc" class="control-label mb-0">Scorm / AICC Content</label>
+                  </dt>
+                  <dd>
+                    <input id="chkScormAicc" class="check-box" disabled="disabled" type="checkbox" checked="@Model.GenericFileDetails.ScormAiccContent" />
+                  </dd>
+                }
+              </dl>
             </div>
-
-            <div class="tab-pane fade" id="history" role="tabpanel" aria-labelledby="history-tab">
-                <div class="admin-section">
-                    <div id="historyList" class="pl-2"></div>
+          }
+
+          @if (Model.ResourceTypeEnum == ResourceTypeEnum.Image)
+          {
+            <div class="col-12">
+              @if (Model.ImageDetails.File == null)
+              {
+                <div class="alert alert-danger">
+                  @if (Model.ImageDetails.File == null)
+                  {
+                    @Html.Raw("No Image File is associated with this Resource Version")
+                  }
                 </div>
+              }
+              <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
+              <dl>
+                <dt>Resource Version Id</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceVersionId)
+                </dd>
+                <dt>Resource Type</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceTypeDescription)
+                </dd>
+                @if (@Model.ImageDetails.File != null)
+                {
+                  <dt>Image File</dt>
+                  <dd>
+                    <a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.ImageDetails.File.FilePath, Model.ImageDetails.File.FileName)" target="_blank" download>@Model.ImageDetails.File.FileName</a>
+                    (@Model.ImageDetails.File.FileType.Name)
+                  </dd>
+                  <dt>Image File Path</dt>
+                  <dd>
+                    @Model.ImageDetails.File.FilePath
+                  </dd>
+                }
+                <dt>Alt Tag</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ImageDetails.AltTag)
+                </dd>
+              </dl>
             </div>
-            @if (Model.HasValidationErrors)
-            {
-                <div class="tab-pane fade" id="validationResult" role="tabpanel" aria-labelledby="validation-tab">
-                    <div class="admin-section">
-                        <div id="validationResultList" class="pl-2"></div>
-                    </div>
+          }
+
+          @if (Model.ResourceTypeEnum == ResourceTypeEnum.Video)
+          {
+            <div class="col-12">
+              @if (Model.VideoDetails.File == null || Model.VideoDetails.TranscriptFile == null || Model.VideoDetails.ClosedCaptionsFile == null)
+              {
+                <div class="alert alert-danger">
+                  @if (Model.VideoDetails.File == null)
+                  {
+                    @Html.Raw("<li>No Video File is associated with this Resource Version</li>")
+                  }
+                  @if (Model.VideoDetails.TranscriptFile == null)
+                  {
+                    @Html.Raw("<li>No Transcript File is associated with this Resource Version</li>")
+                  }
+                  @if (Model.VideoDetails.ClosedCaptionsFile == null)
+                  {
+                    @Html.Raw("<li>No Closed Captions File is associated with this Resource Version</li>")
+                  }
                 </div>
-            }
+              }
+              <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
+              <dl>
+                <dt>Resource Version Id</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceVersionId)
+                </dd>
+                <dt>Resource Type</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceTypeDescription)
+                </dd>
+                @if (@Model.VideoDetails.File != null)
+                {
+                  <dt>Video File</dt>
+                  <dd>
+                    <a href="@String.Format("{0}Media/DownloadInputAsset/{1}/{2}", webSettings.Value.LearningHubAdminUrl, @Model.VideoDetails.File.FilePath, Model.VideoDetails.File.FileName)" target="_blank" download>@Model.VideoDetails.File.FileName</a>
+                  </dd>
+                  <dt>Video File Path</dt>
+                  <dd>
+                    @Model.VideoDetails.File.FilePath
+                  </dd>
+                }
+                @if (@Model.VideoDetails.TranscriptFile != null)
+                {
+                  <dt>Transcript File</dt>
+                  <dd>
+                    <a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.VideoDetails.TranscriptFile.FilePath, Model.VideoDetails.TranscriptFile.FileName)" target="_blank" download>@Model.VideoDetails.TranscriptFile.FileName</a>
+                  </dd>
+                  <dt>Transcript File Path</dt>
+                  <dd>
+                    @Model.VideoDetails.TranscriptFile.FilePath
+                  </dd>
+                }
+                @if (@Model.VideoDetails.ClosedCaptionsFile != null)
+                {
+                  <dt>Closed Captions File</dt>
+                  <dd>
+                    <a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.VideoDetails.ClosedCaptionsFile.FilePath, Model.VideoDetails.ClosedCaptionsFile.FileName)" target="_blank" download>@Model.VideoDetails.ClosedCaptionsFile.FileName</a>
+                  </dd>
+                  <dt>Closed Captions File Path</dt>
+                  <dd>
+                    @Model.VideoDetails.ClosedCaptionsFile.FilePath
+                  </dd>
+                }
+              </dl>
+            </div>
+          }
+
+          @if (Model.ResourceTypeEnum == ResourceTypeEnum.WebLink)
+          {
+            <div class="col-12">
+              <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
+              <dl>
+                <dt>Resource Version Id</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceVersionId)
+                </dd>
+                <dt>Resource Type</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceTypeDescription)
+                </dd>
+                <dt>Url</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.WebLinkDetails.Url)
+                </dd>
+                <dt>Display Text</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.WebLinkDetails.DisplayText)
+                </dd>
+              </dl>
+            </div>
+          }
+
+          @if (Model.ResourceTypeEnum == ResourceTypeEnum.Scorm)
+          {
+            <div class="col-12">
+              <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
+              <dl>
+                <dt>Resource Version Id</dt>
+                <dd>@Html.DisplayFor(model => model.ResourceVersionId)</dd>
+                <dt>Resource Type</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceTypeDescription)
+                </dd>
+                <dt>ESR Link</dt>
+                <dd><a href="@Model.ScormDetails.HostedContentUrl" target="_blank">@Model.ScormDetails.HostedContentUrl</a></dd>
+                <dt>Zip File</dt>
+                <dd>
+                  <a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.ScormDetails.File.FilePath, Model.ScormDetails.File.FileName)" target="_blank" download>@Model.ScormDetails.File.FileName</a>
+                </dd>
+                <dt>Allowed Download</dt>
+                <dd>@(Model.ScormDetails.CanDownload ? "Yes" : "No")</dd>
+                <dt>Forced clearing of user suspend data</dt>
+                <dd>@(Model.ScormDetails.ClearSuspendData ? "Yes" : "No")</dd>
+                <dt>Content Folder</dt>
+                <dd>@Model.ScormDetails.ContentFilePath</dd>
+              </dl>
+            </div>
+          }
+
+          @if (Model.ResourceTypeEnum == ResourceTypeEnum.Assessment)
+          {
+            <div class="col-12">
+              <div class="id-container">Resource Version ID: @Model.ResourceVersionId</div>
+              <dl>
+                <dt>Resource Version Id</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceVersionId)
+                </dd>
+                <dt>Resource Type</dt>
+                <dd>
+                  @Html.DisplayFor(model => model.ResourceTypeDescription)
+                </dd>
+                @if (Model.AssessmentDetails is { AssessmentContent: { } })
+                {
+                  <dt>Assessment Type</dt>
+                  <dd>
+                    @Html.DisplayFor(model => model.AssessmentDetails.AssessmentType)
+                  </dd>
+                  if (Model.AssessmentDetails.PassMark != null)
+                  {
+                    <dt>Pass Mark</dt>
+                    <dd>
+                      @Html.DisplayFor(model => model.AssessmentDetails.PassMark)
+                    </dd>
+                  }
+                  if (Model.AssessmentDetails.MaximumAttempts != null)
+                  {
+                    <dt>Maximum Attempts</dt>
+                    <dd>
+                      @Html.DisplayFor(model => model.AssessmentDetails.MaximumAttempts)
+                    </dd>
+                  }
+                  <dt>Answer in order</dt>
+                  <dd>
+                    @(Model.AssessmentDetails.AnswerInOrder ? "Yes" : "No")
+                  </dd>
+                }
+              </dl>
+              @if (Model.AssessmentDetails is { EndGuidance: { } } && Model.AssessmentDetails.EndGuidance.Blocks != null)
+              {
+                <dl>
+                  <dt>End Guidance: Number of Blocks</dt>
+                  <dd>
+                    @Html.DisplayFor(model => model.AssessmentDetails.EndGuidance.Blocks.Count)
+                  </dd>
+                  <partial name="~/Views/Resource/BlockCollectionDetails.cshtml" model="@Model.AssessmentDetails.EndGuidance" />
+                </dl>
+              }
+
+              @if (Model.AssessmentDetails is { AssessmentContent: { } } && Model.AssessmentDetails.AssessmentContent.Blocks != null)
+              {
+                <dl>
+                  <dt>Content: Number of Blocks</dt>
+                  <dd>
+                    @Html.DisplayFor(model => model.AssessmentDetails.AssessmentContent.Blocks.Count)
+                  </dd>
+                  <partial name="~/Views/Resource/BlockCollectionDetails.cshtml" model="@Model.AssessmentDetails.AssessmentContent" />
+                </dl>
+              }
+            </div>
+          }
         </div>
-    }
+      </div>
+
+      <div class="tab-pane fade" id="events" role="tabpanel" aria-labelledby="events-tab">
+        <div class="admin-section">
+          <div id="eventsList" class="pl-2"></div>
+        </div>
+      </div>
+
+      <div class="tab-pane fade" id="history" role="tabpanel" aria-labelledby="history-tab">
+        <div class="admin-section">
+          <div id="historyList" class="pl-2"></div>
+        </div>
+      </div>
+      <div class="tab-pane fade @(ViewBag.ActiveTab == "devId" ? "show active" : "")" id="devId" role="tabpanel" aria-labelledby="devId-tab">
+        <div class="admin-section">
+          @if (this.ViewBag.Status == "Success")
+          {
+            <!-- Alert Text -->
+            <div class="d-flex ml-5 my-2">
+              <div id="alertInfo" class="alert alert-success">Successfully updated the details</div>
+            </div>
+          }
+          @if (this.ViewBag.Status == "Duplicate")
+          {
+            <div class="d-flex ml-5 my-2">
+              <div id="alertInfo" class="alert alert-danger">Dev Id already exists.</div>
+            </div>
+          }
+          <div id="devIdDetails" class="pl-2">
+          </div>
+        </div>
+      </div>
+      @if (Model.HasValidationErrors)
+      {
+        <div class="tab-pane fade" id="validationResult" role="tabpanel" aria-labelledby="validation-tab">
+          <div class="admin-section">
+            <div id="validationResultList" class="pl-2"></div>
+          </div>
+        </div>
+      }
+    </div>
+  }
 </div>
 
 @section Scripts{
-    <script>
-        $(document).ready(function () {
-
-            $('#myTab a[href="#events"]').click(function (e) {
-                e.preventDefault();
-                $(this).tab('show');
-                loadEventHistory();
-            });
-
-            $('#myTab a[href="#history"]').click(function (e) {
-                e.preventDefault();
-                $(this).tab('show');
-                loadVersionHistory();
-            });
-
-            $('#myTab a[href="#validationResult"]').click(function (e) {
-                e.preventDefault();
-                $(this).tab('show');
-                loadValidationResults();
-            });
-
-        });
+  <script>
+    $(document).ready(function () {
+      var activeTab = '@ViewBag.ActiveTab';
+      $('#myTab a[href="#events"]').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+        loadEventHistory();
+      });
+
+      $('#myTab a[href="#history"]').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+        loadVersionHistory();
+      });
+
+      $('#myTab a[href="#devId"]').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+        loadDevIdDetails();
+      });
+
+      $('#myTab a[href="#validationResult"]').click(function (e) {
+        e.preventDefault();
+        $(this).tab('show');
+        loadValidationResults();
+      });
+
+      // Check if the active tab is devId and load details
+      if (activeTab === 'devId') {
+        loadDevIdDetails();
+      }
+    });
+
+    function loadEventHistory() {
+
+      var resourceVersionId = @Model.ResourceVersionId;
+
+      $.ajax({
+        cache: false,
+        type: "POST",
+        url: "/Resource/GetEvents",
+        data: { resourceVersionId: resourceVersionId },
+        success: function (data) {
+          $('#eventsList').html(data);
+        },
+        error: function () {
+          showErrorAlert('Error performing action: loadEventHistory');
+        }
+      });
+    }
 
-        function loadEventHistory() {
+    function loadVersionHistory() {
 
-            var resourceVersionId = @Model.ResourceVersionId;
+      var resourceId = @Model.ResourceId;
 
-            $.ajax({
-                cache: false,
-                type: "POST",
-                url: "/Resource/GetEvents",
-                data: { resourceVersionId: resourceVersionId },
-                success: function (data) {
-                    $('#eventsList').html(data);
-                },
-                error: function () {
-                    showErrorAlert('Error performing action: loadEventHistory');
-                }
-            });
+      $.ajax({
+        cache: false,
+        type: "POST",
+        url: "/Resource/GetVersionHistory",
+        data: { resourceId: resourceId },
+        success: function (data) {
+          $('#historyList').html(data);
+        },
+        error: function () {
+          showErrorAlert('Error performing action: loadVersionHistory');
         }
+      });
+    }
 
-        function loadVersionHistory() {
+    function loadDevIdDetails() {
 
-            var resourceId = @Model.ResourceId;
+      var resourceVersionId = @Model.ResourceVersionId;
 
-            $.ajax({
-                cache: false,
-                type: "POST",
-                url: "/Resource/GetVersionHistory",
-                data: { resourceId: resourceId },
-                success: function (data) {
-                    $('#historyList').html(data);
-                },
-                error: function () {
-                    showErrorAlert('Error performing action: loadVersionHistory');
-                }
-            });
+      $.ajax({
+        cache: false,
+        type: "POST",
+        url: "/Resource/GetDevIdDetails",
+        data: { resourceVersionId: resourceVersionId },
+        success: function (data) {
+          $('#devIdDetails').html(data);
+        },
+        error: function () {
+          showErrorAlert('Error performing action: loadDevIdDetails');
         }
+      });
+    }
 
-        function loadValidationResults() {
+    function loadValidationResults() {
 
-            var resourceVersionId = @Model.ResourceVersionId;
+      var resourceVersionId = @Model.ResourceVersionId;
 
-            $.ajax({
-                cache: false,
-                type: "POST",
-                url: "/Resource/GetValidationResults",
-                data: { resourceVersionId: resourceVersionId },
-                success: function (data) {
-                    $('#validationResultList').html(data);
-                },
-                error: function () {
-                    showErrorAlert('Error performing action: loadEventHistory');
-                }
-            });
+      $.ajax({
+        cache: false,
+        type: "POST",
+        url: "/Resource/GetValidationResults",
+        data: { resourceVersionId: resourceVersionId },
+        success: function (data) {
+          $('#validationResultList').html(data);
+        },
+        error: function () {
+          showErrorAlert('Error performing action: loadEventHistory');
         }
+      });
+    }
 
-        function unpublish() {
-
-            var form = $('#unpublishForm')
-                .removeData("validator")
-                .removeData("unobtrusiveValidation");
-            $.validator.unobtrusive.parse(form);
-            form.validate();
-
-            var resourceVersionId = @Model.ResourceVersionId;
-            var flag = $.trim($('#flag').val());
-
-            if (form.valid()) {
-                $.ajax({
-                    cache: false,
-                    type: "POST",
-                    url: "/Resource/Unpublish",
-                    data: { resourceVersionId: resourceVersionId, details: flag },
-                    success: function (data) {
-                        if (data.success) {
-                            hideAlerts();
-                            showSuccessAlert(data.details);
-                            $('#versionStatusDescription').text("Unpublished");
-                            $('#unpublishAction').hide();
-                        }
-                        else {
-                            hideAlerts();
-                            showErrorAlert(data.details);
-                        }
-                        $('#unpublish').modal('hide');
-                    },
-                    error: function () {
-                        showErrorAlert('Unexpected error performing action: Unpublish');
-                    }
-                });
+    function unpublish() {
+
+      var form = $('#unpublishForm')
+        .removeData("validator")
+        .removeData("unobtrusiveValidation");
+      $.validator.unobtrusive.parse(form);
+      form.validate();
+
+      var resourceVersionId = @Model.ResourceVersionId;
+      var flag = $.trim($('#flag').val());
+
+      if (form.valid()) {
+        $.ajax({
+          cache: false,
+          type: "POST",
+          url: "/Resource/Unpublish",
+          data: { resourceVersionId: resourceVersionId, details: flag },
+          success: function (data) {
+            if (data.success) {
+              hideAlerts();
+              showSuccessAlert(data.details);
+              $('#versionStatusDescription').text("Unpublished");
+              $('#unpublishAction').hide();
             }
-        }
-
-        function revertToDraft() {
-
-            var resourceVersionId = @Model.ResourceVersionId;
-
-            $.ajax({
-                cache: false,
-                type: "POST",
-                url: "/Resource/RevertToDraft",
-                data: { resourceVersionId: resourceVersionId },
-                success: function (data) {
-                    if (data.success) {
-                        hideAlerts();
-                        showSuccessAlert(data.details);
-                        $('#versionStatusDescription').text("Draft");
-                        $('#revertToDraftAction').hide();
-                    }
-                    else {
-                        hideAlerts();
-                        showErrorAlert(data.details);
-                    }
-                    $('#revertToDraft').modal('hide');
-                },
-                error: function () {
-                    showErrorAlert('Unexpected error performing action: Revert to Draft.');
-                }
-            });
+            else {
+              hideAlerts();
+              showErrorAlert(data.details);
+            }
+            $('#unpublish').modal('hide');
+          },
+          error: function () {
+            showErrorAlert('Unexpected error performing action: Unpublish');
+          }
+        });
+      }
+    }
 
+    function revertToDraft() {
+
+      var resourceVersionId = @Model.ResourceVersionId;
+
+      $.ajax({
+        cache: false,
+        type: "POST",
+        url: "/Resource/RevertToDraft",
+        data: { resourceVersionId: resourceVersionId },
+        success: function (data) {
+          if (data.success) {
+            hideAlerts();
+            showSuccessAlert(data.details);
+            $('#versionStatusDescription').text("Draft");
+            $('#revertToDraftAction').hide();
+          }
+          else {
+            hideAlerts();
+            showErrorAlert(data.details);
+          }
+          $('#revertToDraft').modal('hide');
+        },
+        error: function () {
+          showErrorAlert('Unexpected error performing action: Revert to Draft.');
         }
+      });
 
-        function transferResource() {
-
-            var form = $('#transferResourceForm')
-                .removeData("validator")
-                .removeData("unobtrusiveValidation");
-            $.validator.unobtrusive.parse(form);
-            form.validate();
-
-            var resourceId = @Model.ResourceId;
-            var newResourceOwner = $.trim($('#newResourceOwner').val());
-
-            if (form.valid()) {
-                $.ajax({
-                    cache: false,
-                    type: "POST",
-                    url: "/Resource/TransferResourceOwnership",
-                    data: { resourceId: resourceId, newResourceOwner: newResourceOwner },
-                    success: function (data) {
-                        if (data.success) {
-                            hideAlerts();
-                            showSuccessAlert(data.details);
-                            $('#createUserName').text(newResourceOwner);
-                            $('#transferFromUser').text(newResourceOwner);
-                        }
-                        else {
-                            hideAlerts();
-                            showErrorAlert(data.details);
-                        }
-                        $('#newResourceOwner').val('');
-                        $('#transferResource').modal('hide');
-                    },
-                    error: function () {
-                        showErrorAlert('Unexpected error performing action: Transfer Resource');
-                    }
-                });
-            }
-        }
+    }
 
-        $('#newResourceOwner').keydown(function (e) {
-            if (e.keyCode == 13) {
-                e.preventDefault();
-                transferResource();
-                return false;
+    function transferResource() {
+
+      var form = $('#transferResourceForm')
+        .removeData("validator")
+        .removeData("unobtrusiveValidation");
+      $.validator.unobtrusive.parse(form);
+      form.validate();
+
+      var resourceId = @Model.ResourceId;
+      var newResourceOwner = $.trim($('#newResourceOwner').val());
+
+      if (form.valid()) {
+        $.ajax({
+          cache: false,
+          type: "POST",
+          url: "/Resource/TransferResourceOwnership",
+          data: { resourceId: resourceId, newResourceOwner: newResourceOwner },
+          success: function (data) {
+            if (data.success) {
+              hideAlerts();
+              showSuccessAlert(data.details);
+              $('#createUserName').text(newResourceOwner);
+              $('#transferFromUser').text(newResourceOwner);
+            }
+            else {
+              hideAlerts();
+              showErrorAlert(data.details);
             }
+            $('#newResourceOwner').val('');
+            $('#transferResource').modal('hide');
+          },
+          error: function () {
+            showErrorAlert('Unexpected error performing action: Transfer Resource');
+          }
         });
+      }
+    }
 
-        function hideAlerts() {
-            $('#alertInfo').hide();
-        }
+    $('#newResourceOwner').keydown(function (e) {
+      if (e.keyCode == 13) {
+        e.preventDefault();
+        transferResource();
+        return false;
+      }
+    });
 
-        function showSuccessAlert(alertText) {
-            $('#alertInfo')
-                .removeClass("alert-danger")
-                .addClass("alert-success")
-                .html(alertText)
-                .show();
-        }
+    function hideAlerts() {
+      $('#alertInfo').hide();
+    }
 
-        function showErrorAlert(alertText) {
-            $('#alertInfo').removeClass("alert-success")
-                .addClass("alert-danger")
-                .html(alertText)
-                .show();
-        }
+    function showSuccessAlert(alertText) {
+      $('#alertInfo')
+        .removeClass("alert-danger")
+        .addClass("alert-success")
+        .html(alertText)
+        .show();
+    }
+
+    function showErrorAlert(alertText) {
+      $('#alertInfo').removeClass("alert-success")
+        .addClass("alert-danger")
+        .html(alertText)
+        .show();
+    }
 
-    </script>
+  </script>
 }
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/_DevIdDetails.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/_DevIdDetails.cshtml
new file mode 100644
index 000000000..7e6c5bf71
--- /dev/null
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/_DevIdDetails.cshtml
@@ -0,0 +1,22 @@
+@model LearningHub.Nhs.Models.Resource.ResourceVersionDevIdViewModel
+
+@{
+  ViewData["Title"] = "Add development Id ";
+  var errorHasOccurred = !ViewData.ModelState.IsValid;
+}
+<div class="pt-4">
+  <form asp-controller="Resource" asp-action="UpdateDevIdDetails" method="post">
+    <div class="row m-0">
+      <div class="form-group col-4">
+        <label asp-for="DevId" class="control-label">Development Id</label>
+        <input asp-for="DevId" class="form-control" />
+        <input type="hidden" asp-for="ResourceVersionId" />
+      </div>
+    </div>
+    <div class="form-group col-lg-2 d-flex flex-row justify-content-between">
+      <div>
+        <button type="submit" class="btn btn-common btn-success">Save</button>
+      </div>  
+    </div>
+  </form>
+</div>
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index 78ab26256..3f3f09de7 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -108,7 +108,7 @@
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
 		<PackageReference Include="IdentityModel" Version="4.3.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
 		<PackageReference Include="linqtotwitter" Version="6.9.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
index 0af6830e4..6062a7b7a 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.39" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
       <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
     </ItemGroup>
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
index 55ce79f06..3d46e57aa 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.39" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
index dece11f1c..26457744e 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
@@ -24,7 +24,7 @@
     <ItemGroup>
       <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
       <PackageReference Include="IdentityModel" Version="4.3.0" />
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.39" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
index b556e211d..83ba526b3 100644
--- a/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
+++ b/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
@@ -858,6 +858,43 @@ public async Task<ActionResult> GetResourceVersionValidationResultAsync(int reso
             return this.Ok(await this.resourceService.GetResourceVersionValidationResultAsync(resourceVersionId));
         }
 
+        /// <summary>
+        /// The get resource version Dev Id details.
+        /// </summary>
+        /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
+        /// <returns>The <see cref="Task{ActionResult}"/>.</returns>
+        [HttpGet]
+        [Route("GetResourceVersionDevIdDetails/{resourceVersionId}")]
+        public async Task<ActionResult> GetResourceVersionDevIdDetails(int resourceVersionId)
+        {
+            return this.Ok(await this.resourceService.GetResourceVersionDevIdDetailsAync(resourceVersionId));
+        }
+
+        /// <summary>
+        /// To check devId already exists against a resource.
+        /// </summary>
+        /// <param name="devId">The devId<see cref="string"/>.</param>
+        /// <returns>The <see cref="Task{ActionResult}"/>.</returns>
+        [HttpGet]
+        [Route("DoesDevIdExists/{devId}")]
+        public async Task<ActionResult> DoesDevIdExists(string devId)
+        {
+            return this.Ok(await this.resourceService.DoesDevIdExistsAync(devId));
+        }
+
+        /// <summary>
+        /// Update dev Id details.
+        /// </summary>
+        /// <param name="resourceVersionDevIdViewModel">The ResourceVersionDevIdViewModel<see cref="ResourceVersionDevIdViewModel"/>.</param>
+        /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
+        [HttpPut]
+        [Route("UpdateDevId")]
+        public async Task<IActionResult> UpdateDevId([FromBody] ResourceVersionDevIdViewModel resourceVersionDevIdViewModel)
+        {
+            await this.resourceService.UpdateDevIdDetailsAsync(resourceVersionDevIdViewModel, this.CurrentUserId);
+            return this.Ok();
+        }
+
         /// <summary>
         /// The get resource version flags.
         /// </summary>
diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
index 82b88c37a..b1b3f6e95 100644
--- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
+++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
@@ -27,7 +27,7 @@
 	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
 	<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
 	<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
 	<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 	<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
index f38e0260e..4a089b9a3 100644
--- a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
index f61e84c2f..02c58af7b 100644
--- a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
index 2a0f76452..792327ae2 100644
--- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
+++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
@@ -527,6 +527,7 @@
     <None Include="Scripts\Post-Deploy\Scripts\PPSXFileType.sql" />
     <Build Include="Stored Procedures\Resources\GetMyLearningCertificatesDashboardResources.sql" />
     <None Include="Scripts\Post-Deploy\Scripts\TD-4343_RemoveDuplicateUserGroup.sql" />
+    <None Include="Scripts\Pre-Deploy\Scripts\TD-2396-Add_DevId_ResourceVersion.sql" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />
diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Scripts/TD-2396-Add_DevId_ResourceVersion.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Scripts/TD-2396-Add_DevId_ResourceVersion.sql
new file mode 100644
index 000000000..e0ea212b9
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Scripts/TD-2396-Add_DevId_ResourceVersion.sql
@@ -0,0 +1,2 @@
+ALTER TABLE resources.Resourceversion 
+ADD DevId NVARCHAR(30) NULL;
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/ResourceVersionCreateDuplicate.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/ResourceVersionCreateDuplicate.sql
index aeaa8045e..24b1a7a7b 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/ResourceVersionCreateDuplicate.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/ResourceVersionCreateDuplicate.sql	
@@ -8,6 +8,7 @@
 -- 12-08-2021  Julian Ng	    Initial Revision
 -- 13-08-2021  Julian Ng	    Extract Case Resource duplication to stored proc
 -- 20-09-2021  Malina Slevoaca  Allow duplicating Assessment resource type
+-- 22-10-2024  SA               Added column Dev Id 
 -------------------------------------------------------------------------------
 CREATE TYPE [resources].[CurrentBlockIdsType] 
 AS TABLE (
@@ -114,8 +115,8 @@ BEGIN
             SELECT @NewResourceId = SCOPE_IDENTITY()
     
             -- Populate the ResourceVersions common details
-            INSERT INTO resources.ResourceVersion (ResourceId, VersionStatusId,ResourceAccessibilityId, PublicationId, MajorVersion, MinorVersion, Title, Description, AdditionalInformation, ReviewDate, HasCost, Cost, ResourceLicenceId, SensitiveContent, CertificateEnabled, Deleted, CreateUserId, CreateDate, AmendUserId, AmendDate)
-            SELECT	@NewResourceId, 1,ResourceAccessibilityId, null, null, null, 'Copy of ' + Title, Description, AdditionalInformation, null, 0, null, ResourceLicenceId, SensitiveContent, CertificateEnabled, 0, @UserId, @AmendDate, @UserId, @AmendDate
+            INSERT INTO resources.ResourceVersion (ResourceId, VersionStatusId,ResourceAccessibilityId, PublicationId, MajorVersion, MinorVersion, Title, Description, AdditionalInformation, ReviewDate, HasCost, Cost, ResourceLicenceId, SensitiveContent, CertificateEnabled, Deleted, CreateUserId, CreateDate, AmendUserId, AmendDate,DevId)
+            SELECT	@NewResourceId, 1,ResourceAccessibilityId, null, null, null, 'Copy of ' + Title, Description, AdditionalInformation, null, 0, null, ResourceLicenceId, SensitiveContent, CertificateEnabled, 0, @UserId, @AmendDate, @UserId, @AmendDate,DevId
             FROM	resources.ResourceVersion
             WHERE	id = @CurrentResourceVersionId
             SELECT  @ResourceVersionId = SCOPE_IDENTITY()
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/ResourceVersionCreateNext.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/ResourceVersionCreateNext.sql
index f754bd113..c63eb9521 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/ResourceVersionCreateNext.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/ResourceVersionCreateNext.sql	
@@ -10,6 +10,7 @@
 -- 29 Sep 2020 Dave Brown	Addition of NodeResource records
 -- 11-01-2021  Dharmendra Verma	Card-6516, Set correct timezone information 
 -- 17-08-2023  Jignesh Jetghwani Card-1318, Addition of ResourceNodeVersion Provider
+-- 22-10-2023  SA           Added column Dev Id 
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [resources].[ResourceVersionCreateNext]
 (
@@ -51,8 +52,8 @@ BEGIN
 
 		BEGIN TRAN
 
-		INSERT INTO resources.ResourceVersion (ResourceId, VersionStatusId,ResourceAccessibilityId, PublicationId, MajorVersion, MinorVersion, Title, Description, AdditionalInformation, ReviewDate, HasCost, Cost, ResourceLicenceId, SensitiveContent, CertificateEnabled, Deleted, CreateUserId, CreateDate, AmendUserId, AmendDate)
-		SELECT	ResourceId, 1 /* Draft */,ResourceAccessibilityId, null, MajorVersion, MinorVersion, Title, Description, AdditionalInformation, ReviewDate, HasCost, Cost, ResourceLicenceId, SensitiveContent, CertificateEnabled, 0, @UserId, @AmendDate, @UserId, @AmendDate
+		INSERT INTO resources.ResourceVersion (ResourceId, VersionStatusId,ResourceAccessibilityId, PublicationId, MajorVersion, MinorVersion, Title, Description, AdditionalInformation, ReviewDate, HasCost, Cost, ResourceLicenceId, SensitiveContent, CertificateEnabled, Deleted, CreateUserId, CreateDate, AmendUserId, AmendDate,DevId)
+		SELECT	ResourceId, 1 /* Draft */,ResourceAccessibilityId, null, MajorVersion, MinorVersion, Title, Description, AdditionalInformation, ReviewDate, HasCost, Cost, ResourceLicenceId, SensitiveContent, CertificateEnabled, 0, @UserId, @AmendDate, @UserId, @AmendDate,DevId
 		FROM	resources.ResourceVersion
 		WHERE	id = @CurrentResourceVersionId
 		SELECT @ResourceVersionId = SCOPE_IDENTITY()
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
index a2ac5f308..a6c146998 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
    <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IResourceVersionRepository.cs b/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IResourceVersionRepository.cs
index 2a96c845e..2c12c45bc 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IResourceVersionRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IResourceVersionRepository.cs
@@ -66,6 +66,20 @@ public interface IResourceVersionRepository : IGenericRepository<ResourceVersion
         /// <returns>The <see cref="Task"/>.</returns>
         Task<ResourceVersion> GetCurrentResourceDetailsAsync(int resourceId);
 
+        /// <summary>
+        /// The get resource version details by id async.
+        /// </summary>
+        /// <param name="resourceVersionId">The resourceVersionId.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<ResourceVersion> GetByResourceVersionByIdAsync(int resourceVersionId);
+
+        /// <summary>
+        /// The check dev id already exists in the table async.
+        /// </summary>
+        /// <param name="devId">The devId.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<ResourceVersion> DoesDevIdExistsAync(string devId);
+
         /// <summary>
         /// The get current published for resource async.
         /// </summary>
@@ -211,7 +225,7 @@ public interface IResourceVersionRepository : IGenericRepository<ResourceVersion
         /// </summary>
         /// <param name="resourceVersionId">The resource version id.</param>
         /// <param name="userId">The user id.</param>
-        void Publishing(int resourceVersionId,  int userId);
+        void Publishing(int resourceVersionId, int userId);
 
         /// <summary>
         /// "Failed to publish".
@@ -277,5 +291,13 @@ public interface IResourceVersionRepository : IGenericRepository<ResourceVersion
         /// <param name="userId">userId.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
         Task<ExternalContentDetailsViewModel> GetExternalContentDetails(int resourceVersionId, int userId);
+
+        /// <summary>
+        /// To update dev id details.
+        /// </summary>
+        /// <param name="userId">The userId.</param>
+        /// <param name="resourceVersionDevIdViewModel">The resourceVersionDevIdViewModel.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task UpdateDevIdAsync(int userId, ResourceVersionDevIdViewModel resourceVersionDevIdViewModel);
     }
 }
diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
index 0f94d7953..3173c4895 100644
--- a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs
index cee3e6a07..bb07ad06f 100644
--- a/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs
@@ -184,6 +184,26 @@ public async Task<ResourceVersion> GetCurrentResourceDetailsAsync(int resourceId
                                                  && !r.Deleted);
         }
 
+        /// <summary>
+        /// The get resource version details by id async.
+        /// </summary>
+        /// <param name="resourceVersionId">The resourceVersionId.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task<ResourceVersion> GetByResourceVersionByIdAsync(int resourceVersionId)
+        {
+            return await this.DbContext.ResourceVersion.OrderByDescending(r => r.Id).FirstOrDefaultAsync(x => x.Id == resourceVersionId);
+        }
+
+        /// <summary>
+        /// The check dev id already exists in the table async.
+        /// </summary>
+        /// <param name="devId">The devId.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task<ResourceVersion> DoesDevIdExistsAync(string devId)
+        {
+            return await this.DbContext.ResourceVersion.OrderByDescending(r => r.Id).FirstOrDefaultAsync(x => x.DevId == devId);
+        }
+
         /// <summary>
         /// The get current published for resource async.
         /// </summary>
@@ -343,6 +363,27 @@ public async Task<List<ResourceVersion>> GetResourceVersionsAsync(int resourceId
             await this.DbContext.SaveChangesAsync();
         }
 
+        /// <summary>
+        /// The update async.
+        /// </summary>
+        /// <param name="userId">The user id.</param>
+        /// <param name="resourceVersionDevIdViewModel">The resourceVersionDevIdViewModel.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task UpdateDevIdAsync(int userId, ResourceVersionDevIdViewModel resourceVersionDevIdViewModel)
+        {
+            var resourceVersionUpdate = this.DbContext.ResourceVersion
+                .SingleOrDefault(r => r.Id == resourceVersionDevIdViewModel.ResourceVersionId);
+
+            if (resourceVersionUpdate != null)
+            {
+                // Update Resource Version
+                resourceVersionUpdate.DevId = resourceVersionDevIdViewModel.DevId;
+                this.SetAuditFieldsForUpdate(userId, resourceVersionUpdate);
+            }
+
+            await this.DbContext.SaveChangesAsync();
+        }
+
         /// <summary>
         /// The set resource type.
         /// </summary>
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs b/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs
index c149110b9..9b2e8e9d4 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs
@@ -692,6 +692,28 @@ Task<AssessmentProgressViewModel> GetAssessmentProgress(
         /// <returns>The <see cref="Task{ResourceVersionEventViewModel}"/>.</returns>
         Task<ResourceVersionValidationResultViewModel> GetResourceVersionValidationResultAsync(int resourceVersionId);
 
+        /// <summary>
+        /// The GetResourceVersionDevIdDetailsAync.
+        /// </summary>
+        /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
+        /// <returns>The <see cref="Task{ResourceVersionDevIdViewModel}"/>.</returns>
+        Task<ResourceVersionDevIdViewModel> GetResourceVersionDevIdDetailsAync(int resourceVersionId);
+
+        /// <summary>
+        /// The get resource version dev id async.
+        /// </summary>
+        /// <param name="devId">The devId<see cref="string"/>.</param>
+        /// <returns>The <see cref="bool"/>.</returns>
+        Task<bool> DoesDevIdExistsAync(string devId);
+
+        /// <summary>
+        /// Update Dev Id details.
+        /// </summary>
+        /// <param name="resourceVersionDevIdViewModel">The resourceVersionDevIdViewModel.</param>
+        /// <param name="currentUserId">The currentUserId.</param>
+        /// <returns>The <see cref="List{ResourceVersionDevIdViewModel}"/>.</returns>
+        Task UpdateDevIdDetailsAsync(ResourceVersionDevIdViewModel resourceVersionDevIdViewModel, int currentUserId);
+
         /// <summary>
         /// The get resource version flags async.
         /// </summary>
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
index 59748eeb8..a7a9f0048 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
@@ -16,7 +16,7 @@
 	<PackageReference Include="Azure.Storage.Queues" Version="12.11.0" />
 	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
index 7f312c998..d64166759 100644
--- a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="EntityFrameworkCore.Testing.Moq" Version="4.0.0" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
index e9fa30eef..c8b4ec333 100644
--- a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
+++ b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
     <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.28.0" />
     <PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
diff --git a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
index 76d8df791..6d71a5194 100644
--- a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
@@ -2,14 +2,12 @@ namespace LearningHub.Nhs.Services
 {
     using System;
     using System.Collections.Generic;
-    using System.Drawing.Imaging;
     using System.Globalization;
     using System.Linq;
     using System.Net.Http;
     using System.Threading.Tasks;
     using AutoMapper;
     using Azure.Storage.Blobs;
-    using Azure.Storage.Blobs.Models;
     using Azure.Storage.Blobs.Specialized;
     using LearningHub.Nhs.Api.Shared.Configuration;
     using LearningHub.Nhs.Entities.Resource;
@@ -1332,7 +1330,7 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
             {
                 if (resourceVersion.ResourceType == ResourceTypeEnum.Assessment)
                 {
-                   if (deletedResource)
+                    if (deletedResource)
                     {
                         var assessmentFiles = await this.GetResourceBlockCollectionsFilePathAsync(resourceVersionId, ResourceTypeEnum.Assessment);
                         if (assessmentFiles.Any())
@@ -1350,8 +1348,8 @@ public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, b
                         List<string> deletableFiles = null;
                         if (assessmentDetails is { EndGuidance: { } } && assessmentDetails.EndGuidance.Blocks != null)
                         {
-                           var endGuidanceFiles = this.CheckBlockFile(assessmentDetails.EndGuidance, currentAssessmentVersion.EndGuidance);
-                           if (endGuidanceFiles.Any())
+                            var endGuidanceFiles = this.CheckBlockFile(assessmentDetails.EndGuidance, currentAssessmentVersion.EndGuidance);
+                            if (endGuidanceFiles.Any())
                             {
                                 deletableFiles = await this.GetResourceBlockCollectionsFilePathAsync(rv.Id, ResourceTypeEnum.Assessment);
                                 retVal.AddRange(from entry in endGuidanceFiles
@@ -1832,6 +1830,48 @@ public async Task<ResourceVersionValidationResultViewModel> GetResourceVersionVa
             return retVal;
         }
 
+        /// <summary>
+        /// The get resource version dev id async.
+        /// </summary>
+        /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
+        /// <returns>The <see cref="List{ResourceVersionDevIdViewModel}"/>.</returns>
+        public async Task<ResourceVersionDevIdViewModel> GetResourceVersionDevIdDetailsAync(int resourceVersionId)
+        {
+            ResourceVersionDevIdViewModel resourceVersionDevIdViewModel = new ResourceVersionDevIdViewModel();
+            var res = await this.resourceVersionRepository.GetByResourceVersionByIdAsync(resourceVersionId);
+            resourceVersionDevIdViewModel.ResourceVersionId = res.Id;
+            resourceVersionDevIdViewModel.DevId = res.DevId;
+            return resourceVersionDevIdViewModel;
+        }
+
+        /// <summary>
+        /// The get resource version dev id async.
+        /// </summary>
+        /// <param name="devId">The devId<see cref="string"/>.</param>
+        /// <returns>The <see cref="bool"/>.</returns>
+        public async Task<bool> DoesDevIdExistsAync(string devId)
+        {
+            var res = await this.resourceVersionRepository.DoesDevIdExistsAync(devId);
+
+            if (res != null)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Update Dev Id details.
+        /// </summary>
+        /// <param name="resourceVersionDevIdViewModel">The resourceVersionDevIdViewModel.</param>
+        /// <param name="currentUserId">The currentUserId.</param>
+        /// <returns>The <see cref="List{ResourceVersionDevIdViewModel}"/>.</returns>
+        public async Task UpdateDevIdDetailsAsync(ResourceVersionDevIdViewModel resourceVersionDevIdViewModel, int currentUserId)
+        {
+            await this.resourceVersionRepository.UpdateDevIdAsync(currentUserId, resourceVersionDevIdViewModel);
+        }
+
         /// <summary>
         /// The get resource version flags async.
         /// </summary>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
index 539697d49..f59f836ec 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="IdentityModel" Version="5.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
index eb924766b..306bfba43 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
index 6f4c807b7..fe0eec05d 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
index df5c3c6c3..5a85cff3e 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
   </ItemGroup>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
index 16a31717c..c167e11e4 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
index 440ec325e..6c31da645 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="FluentValidation" Version="10.3.4" />
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From 6d08f96c95c1b8f789a0e3fe3728190d3e5a0f3b Mon Sep 17 00:00:00 2001
From: Dalin Akrasi <Dalin.Akrasi@hee.nhs.uk>
Date: Thu, 24 Oct 2024 15:16:53 +0100
Subject: [PATCH 072/143] Make content of Change Catalogue menu interactive

---
 .../Scripts/vuesrc/mycontributions/mycontributions.vue        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributions.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributions.vue
index 4065e9a3e..2ac4483e8 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributions.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributions.vue
@@ -11,13 +11,13 @@
                         Role: Editor
                     </div>
                 </div>
-                <div class="d-block d-md-inline-block pl-md-4 pt-3 pt-md-0" v-if="userCatalogues && userCatalogues.length>1">
+                <div class="d-block d-md-inline-block pl-md-4 pt-3 pt-md-0" v-if="userCatalogues && userCatalogues.length > 1">
                     <div class="dropdown catalogue-dropdown">
                         <a class="dropdown-toggle" href="#" role="button" id="dropdownCatalogueSelect" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             Change catalogue
                         </a>
                         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownCatalogueSelect">
-                            <a v-for="catalogue in userCatalogues" class="dropdown-item" @click="catalogueChange(catalogue.id, catalogue.nodeId)">{{getCatalogueName(catalogue)}}</a>
+                            <a v-for="(catalogue, index) in userCatalogues" class="dropdown-item" @click="catalogueChange(catalogue.id, catalogue.nodeId)" :tabindex="index">{{getCatalogueName(catalogue)}}</a>
                         </div>
                     </div>
                 </div>

From 79501e7b060c8929a63ed76e46ee676362feb200 Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Tue, 29 Oct 2024 09:01:16 +0000
Subject: [PATCH 073/143] fixes

---
 LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
index 33ccb4ceb..c2358472b 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
@@ -49,7 +49,7 @@
 
 </div>
   @if (User.Identity.IsAuthenticated) {
-    <input type="checkbox" id="header-dropdown-menu-control" aria-labelledby="close-menu toggle-menu">
+    <input type="checkbox" id="header-dropdown-menu-control" aria-labelledby="Main navigation menu">
     <nav class="nhsuk-header__navigation app-width-container" id="header-navigation" role="navigation" aria-label="Primary navigation" aria-labelledby="label-navigation">
         <p class="nhsuk-header__navigation-title"><span id="label-navigation">Menu</span>
           <label class="nhsuk-header__navigation-close" id="close-menu">

From 4e016875076a9d9b9ef1e85b0b1b8550b4eb43c8 Mon Sep 17 00:00:00 2001
From: Anju Jose <Anju.Jose@hee.nhs.uk>
Date: Tue, 29 Oct 2024 09:13:51 +0000
Subject: [PATCH 074/143] fix for menu change

---
 LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
index 821d4d152..233fd9bc9 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
@@ -49,7 +49,7 @@
 
 </div>
   @if (User.Identity.IsAuthenticated) {
-    <input type="checkbox" id="header-dropdown-menu-control" aria-labelledby="close-menu toggle-menu" role="button">
+    <input type="checkbox" id="header-dropdown-menu-control" aria-labelledby="Main navigation menu" role="button">
     <nav class="nhsuk-header__navigation app-width-container" id="header-navigation" role="navigation" aria-label="Primary navigation" aria-labelledby="label-navigation">
         <p class="nhsuk-header__navigation-title"><span id="label-navigation">Menu</span>
           <label class="nhsuk-header__navigation-close" id="close-menu">

From 722ef39010744052ee7572b418b11dc24011561f Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Tue, 29 Oct 2024 13:46:51 +0000
Subject: [PATCH 075/143] TD-4081:DIG306: Labels for form fields are missing

---
 .../vuesrc/bookmark/togglebookmark.vue        |  3 ++-
 .../catalogue/catalogueaccessrequest.vue      |  3 ++-
 .../ContributeAssessmentSettings.vue          |  4 ++--
 .../contribute-resource/ContributeTitle.vue   |  3 ++-
 .../SelectResourceTitle.vue                   | 10 +++++----
 .../questions/MatchGameAnswerOption.vue       |  5 +++--
 .../questions/SingleChoiceAnswer.vue          |  9 ++++----
 .../Scripts/vuesrc/contribute/Content.vue     |  8 +++----
 .../vuesrc/contribute/ContentAudio.vue        |  4 ++--
 .../vuesrc/contribute/ContentCommon.vue       | 20 ++++++++---------
 .../vuesrc/contribute/ContentGenericFile.vue  | 22 +++++++++----------
 .../vuesrc/contribute/ContentImage.vue        |  8 +++----
 .../vuesrc/contribute/ContentWeblink.vue      | 18 +++++++--------
 .../ExtraAssessmentAttemptRequestModal.vue    |  3 ++-
 14 files changed, 64 insertions(+), 56 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/bookmark/togglebookmark.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/bookmark/togglebookmark.vue
index bfcace2de..658024396 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/bookmark/togglebookmark.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/bookmark/togglebookmark.vue
@@ -24,7 +24,8 @@
                             <div class="modal-body-container p-3 mt-2 mb-2">
                                 <form>
                                     <div class="d-flex">
-                                        <input class="form-control input titleInput" type="text" v-model="title" v-bind:maxlength="maxAllowedTitleLength" />
+                                        <label class="nhsuk-u-visually-hidden" for="titleInput"></label>
+                                        <input class="form-control input titleInput" id="titleInput" type="text" v-model="title" v-bind:maxlength="maxAllowedTitleLength" />
                                     </div>
                                 </form>
                             </div>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/catalogue/catalogueaccessrequest.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/catalogue/catalogueaccessrequest.vue
index 1404eba89..89d5bba9d 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/catalogue/catalogueaccessrequest.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/catalogue/catalogueaccessrequest.vue
@@ -98,7 +98,8 @@
                             </div>
                             <div class="row mt-5">
                                 <div class="col">
-                                    <textarea v-model="rejectionMessage" class="form-control rejection-message-input" rows="6"></textarea>
+                                    <label class="nhsuk-u-visually-hidden" for="rejectionMessage"></label>
+                                    <textarea v-model="rejectionMessage" id="rejectionMessage" class="form-control rejection-message-input" rows="6"></textarea>
                                 </div>
                             </div>
                         </div>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue
index b828110a1..09925626c 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue
@@ -41,8 +41,8 @@
 
                         <div class="d-flex">
                             <div class="selection pr-50">
-                                <div class="mb-4">Add a pass mark for this assessment. This is the percentage that the learner must achieve in order to pass.</div>
-                                <input class="text-input" type="text" v-model="assessmentDetails.passMark"/>
+                                <div class="mb-4"><label for="passmark">Add a pass mark for this assessment. This is the percentage that the learner must achieve in order to pass.</label></div>
+                                <input class="text-input" id="passmark" name="passmark" type="text" v-model="assessmentDetails.passMark"/>
                             </div>
                             <div class="tip" v-if="assessmentDetails.assessmentType === AssessmentTypeEnum.Informal">
                                 <h3>Tip</h3>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeTitle.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeTitle.vue
index d25d545c2..f8137bffb 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeTitle.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeTitle.vue
@@ -5,7 +5,8 @@
             <div class="d-flex flex-wrap justify-content-between align-items-center mx-n12 my-n2">
                 <h1 class="nhsuk-heading-xl">
                     <span v-if="!editing" class="contribute-title-component-title">{{ title || 'Untitled' }}</span>
-                    <input type="text" v-if="editing" v-model="title" placeholder="Untitled" ref="contributeTitleInput" />
+                    <label class="nhsuk-u-visually-hidden" for="contributeTitleInput"></label>
+                    <input type="text" id="contributeTitleInput" name="contributeTitleInput" v-if="editing" v-model="title" placeholder="Untitled" ref="contributeTitleInput" />
                 </h1>
                 <LinkTextAndIcon v-if="!editing"
                                  v-on:click="editing = true"
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceTitle.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceTitle.vue
index 7a1a2e9ff..b1a283d05 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceTitle.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceTitle.vue
@@ -4,9 +4,10 @@
             <div class="lh-container-xl">
                 <CharacterCount v-model="resourceDetails.title"
                                 v-bind:characterLimit="255"
-                                v-bind:hasOtherError="isTitleRequiredAndMissing">
+                                v-bind:hasOtherError="isTitleRequiredAndMissing"
+                                v-bind:inputId ="resourceTitle">
                     <template v-slot:title class="nhsuk-heading-l">Add a title</template>
-                    <template v-slot:description>Give your resource a concise, useful title that will make sense to learners.</template>
+                    <template v-slot:description><label :for="resourceTitle">Give your resource a concise, useful title that will make sense to learners.</label></template>
                     <template v-slot:otherErrorMessage v-if="isTitleRequiredAndMissing">You must enter a title</template>
                 </CharacterCount>
             </div>
@@ -22,7 +23,8 @@
     export default Vue.extend({
         props: {
             resourceDetails: { type: Object } as PropOptions<ContributeResourceDetailModel>,
-            isTypeSelected: Boolean
+            isTypeSelected: Boolean,
+            resourceTitle: { type: String, default: 'resourceTitle' } 
         },
         components: {
             CharacterCount
@@ -30,7 +32,7 @@
         computed: {
             isTitleRequiredAndMissing(): boolean {
                 return this.isTypeSelected && this.resourceDetails.title.trim().length === 0;
-            },
+            },          
         }
     });
 </script>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/MatchGameAnswerOption.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/MatchGameAnswerOption.vue
index 27e67278e..3d3f18e46 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/MatchGameAnswerOption.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/MatchGameAnswerOption.vue
@@ -15,8 +15,9 @@
             </div>
         </div>
         <div v-if="blockType === BlockTypeEnum.Text">
-            <input type="text" class="form-control text-input" maxlength="40" v-model="answerOption"/>
-            <div class="footer-text">
+            <label for="answerOption" class="nhsuk-u-visually-hidden"></label>
+            <input type="text" form="answerOption" id="answerOption" name="answerOption" aria-describedby="answerOptionError" class="form-control text-input" maxlength="40" v-model="answerOption"/>
+            <div class="footer-text" id="answerOptionError">
                 You have {{ charactersRemaining }} characters remaining.
             </div>
         </div>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/SingleChoiceAnswer.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/SingleChoiceAnswer.vue
index 79a023852..f1379acb3 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/SingleChoiceAnswer.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/SingleChoiceAnswer.vue
@@ -27,10 +27,11 @@
             <hr class="cutoff-line">
         </div>
         <div>
-          <input type="text" class="form-control text-input" maxlength="120" v-model="message"/>
-          <div class="footer-text">
-            You have {{ charactersRemaining }} characters remaining.
-          </div>
+            <label class="nhsuk-u-visually-hidden" for="message"></label>
+            <input type="text" id="message" name="message" aria-describedby="messageError" class="form-control text-input" maxlength="120" v-model="message" />
+            <div class="footer-text" id="messageError">
+                You have {{ charactersRemaining }} characters remaining.
+            </div>
         </div>
     </div>
 </template>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
index 00d740bb2..31102a78d 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
@@ -20,8 +20,8 @@
                         <div class="row">
                             <div class="form-group col-12 mt-5">
                                 <h2 id="title-label" class="nhsuk-heading-l">Title<i v-if="$v.resourceDetailTitle.$invalid" class="warningTriangle fa-solid fa-triangle-exclamation"></i></h2>
-                                <div class="mb-3">Give your resource a concise, useful title that will make sense to learners.</div>
-                                <input type="text" class="form-control" aria-labelledby="title-label" maxlength="255" id="resourceDetail_title" v-model="resourceDetailTitle" @change="setTitle($event.target.value)" autocomplete="off" v-bind:disabled="resourceLoading">
+                                <div class="mb-3"><label for="resourceDetail_title">Give your resource a concise, useful title that will make sense to learners.</label></div>
+                                <input type="text" class="form-control" aria-labelledby="title-label" maxlength="255" id="resourceDetail_title" name="resourceDetail_title" v-model="resourceDetailTitle" @change="setTitle($event.target.value)" autocomplete="off" v-bind:disabled="resourceLoading">
                             </div>
                         </div>
                         <div class="row mt-4">
@@ -357,9 +357,9 @@
                                                         </p>
                                                     </div>
                                                     <div>
-                                                        <div class="modal-section-header">Notes</div>
+                                                        <div class="modal-section-header"><label for="notes">Notes</label></div>
                                                         <p class="mt-1">Provide information to help learners understand why this new version has been created.</p>
-                                                        <textarea class="form-control" v-bind:class="{ 'input-validation-error': $v.publishNotes.$invalid && $v.publishNotes.$dirty }" rows="4" maxlength="4000" v-model="publishNotes"></textarea>
+                                                        <textarea class="form-control"id="notes" v-bind:class="{ 'input-validation-error': $v.publishNotes.$invalid && $v.publishNotes.$dirty }" rows="4" maxlength="4000" v-model="publishNotes"></textarea>
                                                         <div class="error-text pt-3" v-if="$v.publishNotes.$invalid && $v.publishNotes.$dirty">
                                                             <span class="text-danger">Enter notes.</span>
                                                         </div>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentAudio.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentAudio.vue
index cce5ff19b..1d8fbc8ab 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentAudio.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentAudio.vue
@@ -34,7 +34,7 @@
 
         <div class="row mt-5">
             <div class="form-group col-12">
-                <h3 id="additionalinfo-label">Additional information <span class="optional">(optional)</span></h3>
+                <h3 id="additionalinfo-label"><label for="additionalinfo">Additional information <span class="optional">(optional)</span></label></h3>
             </div>
         </div>
         <div class="row">
@@ -43,7 +43,7 @@
                 for example, how it was developed or what is required for it to be used.
             </div>
             <div class="col-12 mt-3">
-                <textarea class="form-control" aria-labelledby="additionalinfo-label" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
+                <textarea class="form-control" id="additionalinfo" aria-labelledby="additionalinfo-label" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
             </div>
             <div class="col-12 footer-text">
                 You can enter a maximum of 250 characters
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
index 8304843e1..685b1083a 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
@@ -78,7 +78,7 @@
 
         <div class="row mt-5">
             <div class="form-group col-12">
-                <h2 id="keyword-label" class="nhsuk-heading-l">Keywords <i v-if="keywords.length==0" class="warningTriangle fa-solid fa-triangle-exclamation"></i></h2>
+                <h2 id="keyword-label" class="nhsuk-heading-l"><label for="newKeyword">Keywords</label> <i v-if="keywords.length==0" class="warningTriangle fa-solid fa-triangle-exclamation"></i></h2>
             </div>
         </div>
         <div class="row">
@@ -92,11 +92,11 @@
                     </span>
                 </div>
 
-                <div class="col-12">
+                <div class="col-12" id="keyworddesc">
                     To help learners find this resource, type one or more relevant keywords separated by commas and click 'Add'.
                 </div>
                 <div class="col-12 mt-4 input-with-button">
-                    <input id="newKeyword" aria-labelledby="keyword-label" type="text" class="form-control" maxlength="260" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
+                    <input id="newKeyword" aria-labelledby="keyword-label" aria-describedby="keyworddesc" type="text" class="form-control" maxlength="260" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
                     <button type="button" class="nhsuk-button nhsuk-button--secondary ml-3 nhsuk-u-margin-bottom-0" @click="addKeyword">&nbsp;Add</button>
                 </div>
                 <div class="col-12 footer-text">
@@ -165,24 +165,24 @@
                 <div class="resource-area-body" v-if="authors.length < maxAllowedAuthors">
                     <div class="form-group" v-bind:class="{ 'input-validation-error': authorError }">
                         <div class="col-12 mb-0 error-text" v-if="authorError">
-                            <span class="text-danger">Enter the author name or organisation.</span>
+                            <span class="text-danger" data-valmsg-for="authorName">Enter the author name or organisation.</span>
                         </div>
                         <div class="col-12">
                             <label class="mb-0" for="authorName">Author name</label>
                         </div>
                         <div class="col-12">
-                            <input type="text" id="authorName" class="form-control" v-bind:class="{ 'input-validation-error': authorError }" maxlength="100" v-model="authorName" v-bind:disabled="currentUserAuthor" @input="authorError=false" />
+                            <input type="text" id="authorName" name="authorName" class="form-control" aria-describedby="authorNamehint" v-bind:class="{ 'input-validation-error': authorError }" maxlength="100" v-model="authorName" v-bind:disabled="currentUserAuthor" @input="authorError=false" />
                         </div>
-                        <div class="col-12 footer-text">
+                        <div class="col-12 footer-text" id="authorNamehint">
                             You can enter a maximum of 100 characters
                         </div>
                         <div class="col-12">
                             <label class="mb-0" for="authorOganisation">Organisation</label>
                         </div>
                         <div class="col-12">
-                            <input type="text" id="authorOganisation" class="form-control" v-bind:class="{ 'input-validation-error': authorError }" maxlength="100" v-model="authorOganisation" @input="authorError=false" />
+                            <input type="text" id="authorOganisation" name="authorOganisation" aria-describedby="authorOganisationhint" class="form-control" v-bind:class="{ 'input-validation-error': authorError }" maxlength="100" v-model="authorOganisation" @input="authorError=false" />
                         </div>
-                        <div class="col-12 footer-text">
+                        <div class="col-12 footer-text" id="authorOganisationhint">
                             You can enter a maximum of 100 characters
                         </div>
                     </div>
@@ -190,9 +190,9 @@
                         <label class="mb-0" for="authorRole">Role <span class="optional">(optional)</span></label>
                     </div>
                     <div class="col-12">
-                        <input type="text" id="authorRole" class="form-control" maxlength="100" v-model="authorRole" />
+                        <input type="text" id="authorRole" name="authorRole" class="form-control" maxlength="100" v-model="authorRole" aria-describedby="authorRolehint" />
                     </div>
-                    <div class="col-12 footer-text">
+                    <div class="col-12 footer-text" id="authorRolehint">
                         You can enter a maximum of 100 characters
                     </div>
                     <div class="col-12 mt-4 input-with-button">
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentGenericFile.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentGenericFile.vue
index f1380b1ab..8b137b756 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentGenericFile.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentGenericFile.vue
@@ -30,39 +30,39 @@
         <div class="row authored-date">
             <div class="col-4 col-sm-3 col-md-2">
                 <label for="year" class="mb-0">Year</label><br />
-                <input type="text" id="year" maxlength="4" v-bind:class="{ 'input-validation-error': $v.authoredYear.$invalid && $v.authoredYear.$dirty }" class="form-control" :placeholder="currentYear" v-model="authoredYear" @blur="setProperty('authoredYear', $event.target.value)" />
+                <input type="text" id="year" name="year" aria-describedby="yearError" maxlength="4" v-bind:class="{ 'input-validation-error': $v.authoredYear.$invalid && $v.authoredYear.$dirty }" class="form-control" :placeholder="currentYear" v-model="authoredYear" @blur="setProperty('authoredYear', $event.target.value)" />
             </div>
             <div class="col-4 col-sm-3 col-md-2">
                 <label for="month" v-bind:class="{ disabled: $v.authoredYear.$invalid || !authoredYear }" class="mb-0">Month</label><br />
-                <input type="text" id="month" maxlength="2" v-bind:class="{ 'input-validation-error': $v.authoredMonth.$invalid && $v.authoredMonth.$dirty }" class="form-control" :placeholder="currentMonth" v-model="authoredMonth" v-bind:disabled="$v.authoredYear.$invalid || !authoredYear" @blur="setProperty('authoredMonth', $event.target.value)" />
+                <input type="text" id="month" name="month" aria-describedby="monthError" maxlength="2" v-bind:class="{ 'input-validation-error': $v.authoredMonth.$invalid && $v.authoredMonth.$dirty }" class="form-control" :placeholder="currentMonth" v-model="authoredMonth" v-bind:disabled="$v.authoredYear.$invalid || !authoredYear" @blur="setProperty('authoredMonth', $event.target.value)" />
             </div>
             <div class="col-4 col-sm-3 col-md-2">
                 <label for="day-of-month" v-bind:class="{ disabled: $v.authoredYear.$invalid || !authoredYear || $v.authoredMonth.$invalid || !authoredMonth }" class="mb-0">Day</label><br />
-                <input type="text" id="day-of-month" maxlength="2" v-bind:class="{ 'input-validation-error': $v.authoredDayOfMonth.$invalid && $v.authoredDayOfMonth.$dirty }" class="form-control" :placeholder="currentDayOfMonth" v-model="authoredDayOfMonth" v-bind:disabled="$v.authoredYear.$invalid || authoredYear == '' || $v.authoredMonth.$invalid || !authoredMonth" @blur="setProperty('authoredDayOfMonth', $event.target.value)" />
+                <input type="text" id="day-of-month" aria-describedby="day-of-monthError" name="day-of-month" maxlength="2" v-bind:class="{ 'input-validation-error': $v.authoredDayOfMonth.$invalid && $v.authoredDayOfMonth.$dirty }" class="form-control" :placeholder="currentDayOfMonth" v-model="authoredDayOfMonth" v-bind:disabled="$v.authoredYear.$invalid || authoredYear == '' || $v.authoredMonth.$invalid || !authoredMonth" @blur="setProperty('authoredDayOfMonth', $event.target.value)" />
             </div>
         </div>
         <div class="error-text pt-3" v-if="!$v.authoredYear.between && $v.authoredYear.$dirty">
-            <span class="text-danger">Use four numbers to enter the year.</span>
+            <span class="text-danger" id="yearError" aria-live="polite">Use four numbers to enter the year.</span>
         </div>
         <div class="error-text pt-3" v-if="$v.authoredYear.between && !$v.authoredYear.maxValue && $v.authoredYear.$dirty">
-            <span class="text-danger">The year this file was authored cannot be in the future.</span>
+            <span class="text-danger" id="yearError" aria-live="polite">The year this file was authored cannot be in the future.</span>
         </div>
         <div class="error-text pt-3" v-if="!$v.authoredYear.$invalid && (!$v.authoredMonth.between || !$v.authoredMonth.minLength) && $v.authoredMonth.$dirty">
-            <span class="text-danger">Use two numbers to enter a valid month.</span>
+            <span class="text-danger" id="monthError" aria-live="polite">Use two numbers to enter a valid month.</span>
         </div>
         <div class="error-text pt-3" v-if="!$v.authoredYear.$invalid && !$v.authoredMonth.month_in_past && $v.authoredMonth.$dirty">
-            <span class="text-danger">The month this file was authored cannot be in the future.</span>
+            <span class="text-danger" id="monthError" aria-live="polite">The month this file was authored cannot be in the future.</span>
         </div>
         <div class="error-text pt-3" v-if="!$v.authoredMonth.$invalid && (!$v.authoredDayOfMonth.between || !$v.authoredDayOfMonth.minLength) && $v.authoredDayOfMonth.$dirty">
-            <span class="text-danger">Use two numbers to enter a valid day.</span>
+            <span class="text-danger" id="day-of-monthError" aria-live="polite">Use two numbers to enter a valid day.</span>
         </div>
         <div class="error-text pt-3" v-if="!$v.authoredMonth.$invalid && !$v.authoredDayOfMonth.dayOfMonth_in_past && $v.authoredDayOfMonth.$dirty">
-            <span class="text-danger">The day this file was authored cannot be in the future.</span>
+            <span class="text-danger" id="day-of-monthError" aria-live="polite">The day this file was authored cannot be in the future.</span>
         </div>
 
         <div class="row mt-5">
             <div class="form-group col-12 my-2">
-                <h3 id="additionalinfo-label">Additional information <span class="optional">(optional)</span></h3>
+                <h3 id="additionalinfo-label"><label for="additionalinfo">Additional information <span class="optional">(optional)</span></label></h3>
             </div>
         </div>
         <div class="row">
@@ -71,7 +71,7 @@
                 for example, how it was developed or what is required for it to be used.
             </div>
             <div class="col-12 mt-3">
-                <textarea class="form-control" aria-labelledby="additionalinfo-label" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
+                <textarea class="form-control" id="additionalinfo" aria-labelledby="additionalinfo-label" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
             </div>
             <div class="col-12 footer-text">
                 You can enter a maximum of 250 characters
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentImage.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentImage.vue
index a5fe68dde..c6f2e1043 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentImage.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentImage.vue
@@ -13,7 +13,7 @@
 
         <div class="row mt-5">
             <div class="form-group col-12">
-                <h3 id="alttag-label">Alt tag <i v-if="$v.localImageDetail.altTag.$invalid" class="warningTriangle fa-solid fa-triangle-exclamation"></i></h3>
+                <h3 id="alttag-label"><label for="alttag">Alt tag</label> <i v-if="$v.localImageDetail.altTag.$invalid" class="warningTriangle fa-solid fa-triangle-exclamation"></i></h3>
             </div>
         </div>
         <div class="row">
@@ -22,7 +22,7 @@
                 This will not be shown on screen but it will help those using screen readers.
             </div>
             <div class="col-12 mt-3">
-                <textarea class="form-control" aria-labelledby="alttag-label" rows="4" maxlength="125" v-model="localImageDetail.altTag" @change="setProperty('altTag', $event.target.value)" @input="altTextKeyup"></textarea>
+                <textarea class="form-control" id="alttag" name="alttag" aria-labelledby="alttag-label" rows="4" maxlength="125" v-model="localImageDetail.altTag" @change="setProperty('altTag', $event.target.value)" @input="altTextKeyup"></textarea>
             </div>
             <div class="col-12 footer-text">
                 You can enter a maximum of 125 characters
@@ -31,7 +31,7 @@
 
         <div class="row mt-5">
             <div class="form-group col-12">
-                <h3 id="additionalinfo-label">Additional information <span class="optional">(optional)</span></h3>
+                <h3 id="additionalinfo-label"><label for="additionalinfo">Additional information <span class="optional">(optional)</span></label></h3>
             </div>
         </div>
         <div class="row">
@@ -40,7 +40,7 @@
                 for example, how it was developed or what is required for it to be used.
             </div>
             <div class="col-12 mt-3">
-                <textarea class="form-control" aria-labelledby="additionalinfo-label" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
+                <textarea class="form-control" id="additionalinfo" aria-labelledby="additionalinfo-label" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
             </div>
             <div class="col-12 footer-text">
                 You can enter a maximum of 250 characters
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentWeblink.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentWeblink.vue
index c261c16b1..ee8c78400 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentWeblink.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentWeblink.vue
@@ -2,15 +2,15 @@
     <div>
         <div class="row mt-2">
             <div class="form-group col-12 mb-1">
-                <h3 id="web-link-label">Add the address (URL) of the web link<i v-if="$v.localWeblinkDetail.url.$invalid || !urlIsAccessible" class="warningTriangle fa-solid fa-triangle-exclamation"></i></h3>
+                <h3 id="web-link-label"><label for="=web-link-text">Add the address (URL) of the web link</label><i v-if="$v.localWeblinkDetail.url.$invalid || !urlIsAccessible" class="warningTriangle fa-solid fa-triangle-exclamation"></i></h3>
             </div>
         </div>
         <div class="row">
-            <div class="col-12">
+            <div class="col-12" id="web-link-labelhint">
                 This can be found in the address bar of your browser, for example, https://www.england.nhs.uk
             </div>
             <div class="col-12 mt-3">
-                <input type="text" aria-labelledby="web-link-label" placeholder="https://" class="form-control" v-bind:class="{ 'input-validation-error': (!urlIsAccessible || $v.localWeblinkDetail.url.$invalid) && $v.localWeblinkDetail.url.$dirty }" v-model="localWeblinkDetail.url" @change="setProperty('url', $event.target.value)" @input="urlKeyup" />
+                <input type="text" id="web-link-text" name="web-link-text" aria-labelledby="web-link-label" aria-describedby="web-link-labelhint" placeholder="https://" class="form-control" v-bind:class="{ 'input-validation-error': (!urlIsAccessible || $v.localWeblinkDetail.url.$invalid) && $v.localWeblinkDetail.url.$dirty }" v-model="localWeblinkDetail.url" @change="setProperty('url', $event.target.value)" @input="urlKeyup" />
             </div>
         </div>
         <div class="error-text pt-3" v-if="!$v.localWeblinkDetail.url.url && $v.localWeblinkDetail.url.$dirty">
@@ -22,7 +22,7 @@
 
         <div class="row mt-5">
             <div class="form-group col-12 mb-1">
-                <h3 id="text-to-display-label">Text to display <span class="optional">(optional)</span></h3>
+                <h3 id="text-to-display-label"><label for="localWeblinkDetaildisplayText">Text to display <span class="optional">(optional)</span></label></h3>
             </div>
         </div>
         <div class="row">
@@ -31,16 +31,16 @@
                 you can change the way it is shown to learners so that they understand what it is for, for example, NHS England.
             </div>
             <div class="col-12 mt-3">
-                <input type="text" aria-labelledby="text-to-display-label" class="form-control" maxlength="50" v-model="localWeblinkDetail.displayText" @change="setProperty('displayText', $event.target.value)" />
+                <input type="text" id="localWeblinkDetaildisplayText" name= "localWeblinkDetaildisplayText" aria-labelledby="text-to-display-label" describedby="localWeblinkDetaildisplayTexthint" class="form-control" maxlength="50" v-model="localWeblinkDetail.displayText" @change="setProperty('displayText', $event.target.value)" />
             </div>
-            <div class="col-12 footer-text">
+            <div class="col-12 footer-text" id="localWeblinkDetaildisplayTexthint">
                 You can enter a maximum of 50 characters
             </div>
         </div>
 
         <div class="row mt-5">
             <div class="form-group col-12">
-                <h3 id="additionalinfo-label">Additional information <span class="optional">(optional)</span></h3>
+                <h3 id="additionalinfo-label"><label for="additionalinfo-label">Additional information <span class="optional">(optional)</span></label></h3>
             </div>
         </div>
         <div class="row">
@@ -49,9 +49,9 @@
                 for example, how it was developed or what is required for it to be used.
             </div>
             <div class="col-12 mt-3">
-                <textarea class="form-control" aria-labelledby="additionalinfo-label" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
+                <textarea class="form-control" id="additionalinfo-label" name="additionalinfo-label" aria-labelledby="additionalinfo-label" aria-describedby="additionalinfo-label-hint" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
             </div>
-            <div class="col-12 footer-text">
+            <div class="col-12 footer-text" id="additionalinfo-label-hint">
                 You can enter a maximum of 250 characters
             </div>
         </div>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ExtraAssessmentAttemptRequestModal.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ExtraAssessmentAttemptRequestModal.vue
index 9336a4b21..a23ab5a74 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ExtraAssessmentAttemptRequestModal.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ExtraAssessmentAttemptRequestModal.vue
@@ -12,7 +12,8 @@
         <template v-slot:form>
             <h2 class="font-weight-bold mb-5">Reason for retaking assessment</h2>
             <div class="text-box p-0">
-                <textarea class="form-control" placeholder="Add your reason..." rows="4" :maxlength="maxLength" v-model="reason"></textarea>
+                <label class="nhsuk-u-visually-hidden" for="reason"></label>
+                <textarea class="form-control" id="reason" placeholder="Add your reason..." rows="4" :maxlength="maxLength" v-model="reason"></textarea>
                 <div class="characters-count">
                     You have {{ charactersRemaining }} characters remaining
                 </div>

From f2b6f129751e06f175c8aaebbc67eb9026e3d0cd Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 30 Oct 2024 11:33:57 +0000
Subject: [PATCH 076/143] Merge RC changes to V1.0.0

---
 AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj  | 2 +-
 LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj              | 2 +-
 .../LearningHub.Nhs.OpenApi.Models.csproj                       | 2 +-
 .../LearningHub.Nhs.OpenApi.Services.Interface.csproj           | 2 +-
 .../LearningHub.Nhs.OpenApi.Services.csproj                     | 2 +-
 WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj           | 2 +-
 .../LearningHub.Nhs.Api.Shared.csproj                           | 2 +-
 .../LearningHub.Nhs.Api.UnitTests.csproj                        | 2 +-
 .../Tables/Resource/ResourceVersion.sql                         | 1 +
 .../LearningHub.Nhs.Repository.Interface.csproj                 | 2 +-
 .../LearningHub.Nhs.Repository.csproj                           | 2 +-
 .../LearningHub.Nhs.Services.Interface.csproj                   | 2 +-
 .../LearningHub.Nhs.Services.UnitTests.csproj                   | 2 +-
 WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj | 2 +-
 .../LearningHub.Nhs.Migration.ConsoleApp.csproj                 | 2 +-
 .../LearningHub.Nhs.Migration.Interface.csproj                  | 2 +-
 .../LearningHub.Nhs.Migration.Models.csproj                     | 2 +-
 .../LearningHub.Nhs.Migration.Staging.Repository.csproj         | 2 +-
 .../LearningHub.Nhs.Migration.UnitTests.csproj                  | 2 +-
 .../LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj  | 2 +-
 20 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
index f10d8aaab..0b26b9cd7 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
+++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
@@ -89,7 +89,7 @@
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 	<PackageReference Include="IdentityModel" Version="4.4.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index aff1954b5..f20842a9a 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -108,7 +108,7 @@
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
 		<PackageReference Include="IdentityModel" Version="4.3.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
 		<PackageReference Include="linqtotwitter" Version="6.9.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
index cba933a13..7a4aad8fc 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
       <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
     </ItemGroup>
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
index c5e573226..1f6967d55 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
index c33aba9c7..0ca91c767 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
@@ -24,7 +24,7 @@
     <ItemGroup>
       <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
       <PackageReference Include="IdentityModel" Version="4.3.0" />
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
index 7f7061f15..780f22f77 100644
--- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
+++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
@@ -27,7 +27,7 @@
 	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
 	<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
 	<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
 	<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 	<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
index f69ac97cf..829bad9be 100644
--- a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
index 7d71e2853..72f794c05 100644
--- a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
diff --git a/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ResourceVersion.sql b/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ResourceVersion.sql
index f503fcef4..727b244af 100644
--- a/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ResourceVersion.sql
+++ b/WebAPI/LearningHub.Nhs.Database/Tables/Resource/ResourceVersion.sql
@@ -16,6 +16,7 @@
 	[SensitiveContent] [bit] NOT NULL DEFAULT 0,
 	[CertificateEnabled] [bit] NULL,
 	[ProviderId] [int] NULL,
+	[DevId] NVARCHAR(30) NULL,
 	[Deleted] [bit] NOT NULL,
 	[CreateUserId] [int] NOT NULL,
 	[CreateDate] [datetimeoffset](7) NOT NULL,
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
index 80fddd4fe..7d7158ca5 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
    <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
index 31ccf6c32..ad69ef225 100644
--- a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
index 4b65d9473..3755bd4a9 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
@@ -16,7 +16,7 @@
 	<PackageReference Include="Azure.Storage.Queues" Version="12.11.0" />
 	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
index 6decf8ddf..97879cf14 100644
--- a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="EntityFrameworkCore.Testing.Moq" Version="4.0.0" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
index f215355b0..9b9bb5f7d 100644
--- a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
+++ b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
     <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.28.0" />
     <PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
index 63bff57fb..aef6c8475 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="IdentityModel" Version="5.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
index 802482bf1..8c01c9143 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
index b9d784dcc..a80919111 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
index 68b1ba543..c65d9208e 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
   </ItemGroup>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
index fdb0f5c61..416c85de0 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
index 977b493ac..9c68fccf6 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="FluentValidation" Version="10.3.4" />
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From 0657ee745521614ab80b74286ead8667b4ca5cf8 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Wed, 30 Oct 2024 13:03:22 +0000
Subject: [PATCH 077/143] TD-4070: Removed text from alt attribute for
 decorative images.

---
 LearningHub.Nhs.WebUI/Scripts/vuesrc/roadmap/roadmap.vue | 2 +-
 LearningHub.Nhs.WebUI/Views/Home/_CmsPageRow.cshtml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/roadmap/roadmap.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/roadmap/roadmap.vue
index e463627f7..482240820 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/roadmap/roadmap.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/roadmap/roadmap.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="roadmap-container mb-40">
         <div v-for="(item, index) in this.roadMapResult.roadMapItems" :class="getRoadMapClass(item)">
-            <img :src="downloadImage(item.imageName)" v-if="item.imageName" alt="Road map" />
+            <img :src="downloadImage(item.imageName)" v-if="item.imageName" alt="" />
             <h2>{{ item.title }}</h2>
             <p v-if="item.roadmapDate">{{ item.roadmapDate | formatDate('DD MMM YYYY') }}</p>
             <p v-html="item.description"></p>
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_CmsPageRow.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_CmsPageRow.cshtml
index 591a84472..66c7fdea9 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_CmsPageRow.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_CmsPageRow.cshtml
@@ -77,7 +77,7 @@
                                     <div class="information-page__asset-container">
                                         @if (@pageModel.PageSectionDetail?.ImageAsset != null)
                                         {
-                                            <img alt="@pageModel.PageSectionDetail.ImageAsset.AltTag" src="/file/download/@pageModel.PageSectionDetail.ImageAsset.ImageFile.FilePath/@pageModel.PageSectionDetail.ImageAsset.ImageFile.FileName" class="information-page__img">
+                                            <img alt="" src="/file/download/@pageModel.PageSectionDetail.ImageAsset.ImageFile.FilePath/@pageModel.PageSectionDetail.ImageAsset.ImageFile.FileName" class="information-page__img">
                                         }
                                     </div>
                                 </div>

From 6fdf582966a8405bb76018c1f69d671aa5f6acf2 Mon Sep 17 00:00:00 2001
From: kevwhitt-hee <kevin.whittaker@hee.nhs.uk>
Date: Thu, 31 Oct 2024 09:03:49 +0000
Subject: [PATCH 078/143] Update pull_request_template.md

---
 .github/pull_request_template.md | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index d705a4791..b276131f7 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,25 +1,25 @@
 ### JIRA link
-_TD-###_
+[TD-####](https://hee-tis.atlassian.net/browse/TD-####)
 
 ### Description
-_Describe what has changed and how that will affect the app. If relevant, add references to the resources you used. Use this as your opportunity to highlight anything odd and give people context around particular decisions._
+_Describe what has changed and how that will affect the app. If relevant, add links to any sources/documentation you used. Highlight anything unusual and give people context around particular decisions._
 
 ### Screenshots
-_Attach screenshots on mobile, tablet and desktop._
+_Paste screenshots for all views created or changed: mobile, tablet and desktop, wave analyser showing no errors._
 
 -----
 ### Developer checks
 (Leave tasks unticked if they haven't been appropriate for your ticket.)
 
 I have:
-- [ ] Run the formatter and made sure there are no IDE errors
-- [ ] Written appropriate unit tests for the changes, including:
-	- accessibility tests for new views
-	- tests for new controller methods
-	- tests for new or modified API endpoints
-- [ ] Manually tested my work with and without JavaScript
-- [ ] Tested any Views or partials created or changed with [Wave Chrome plugin](https://chrome.google.com/webstore/detail/wave-evaluation-tool/jbbplnpkjmmeebjpijfedlgcdilocofh/related) and addressed any valid accessibility issues
-- [ ] Updated/added documentation in [Confluence](https://hee-tis.atlassian.net/wiki/spaces/TP/pages/3477930003/Learning+Hub) and/or [GitHub Readme](https://github.com/TechnologyEnhancedLearning/LearningHub.Nhs.UserApi/blob/master/README.md). List of documentation links added/changed:
+- [ ] Run the IDE auto formatter on all files I’ve worked on and made sure there are no IDE errors relating to them
+- [ ] Written or updated tests for the changes (accessibility ui tests for views, tests for controller, data services, services, view models created or modified) and made sure all tests are passing
+- [ ] Manually tested my work with and without JavaScript (adding notes where functionality requires JavaScript)
+- [ ] Tested any Views or partials created or changed with [Wave Chrome plugin](https://chrome.google.com/webstore/detail/wave-evaluation-tool/jbbplnpkjmmeebjpijfedlgcdilocofh/related). Addressed any valid accessibility issues and documented any invalid errors
+- [ ] Updated my Jira ticket with testing notes, including information about other parts of the system that were touched as part of the MR and need  to be tested to ensure nothing is broken
+- [ ] Scanned over my pull request in GitHub and addressed any warnings from the GitHub Build and Test checks in the GitHub PR ‘Files Changed’ tab
+Either:
+- [ ] Documented my work in [Confluence](https://hee-tis.atlassian.net/wiki/spaces/TP/pages/3461087233/Development), updating any business rules applied or modified. Updated GitHub readme/documentation for the repository if appropriate. List of documentation links added/changed:
   - [doc_1_here](link_1_here)
-- [ ] Updated my Jira ticket with information about other parts of the system that were touched as part of the MR and have to be sanity tested to ensure nothing is broken
-- [ ] Scanned over my pull request in GitHub and addressed any warnings from the GitHub Build and Test checks.
+Or:
+- [ ] Confirmed that none of the work that I have undertaken requires any updates to documentation
\ No newline at end of file

From bf06752541a82d59940461243e6505dd21446089 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Thu, 31 Oct 2024 13:59:07 +0000
Subject: [PATCH 079/143] TD-4072: DIG201 Content has heading markup, but is
 not a heading issue fixed

---
 .../vuesrc/contribute-resource/ContributeAuthorsTab.vue     | 3 +++
 .../Scripts/vuesrc/globalcomponents/CharacterCount.vue      | 6 +++++-
 .../CharacterCountWithSaveCancelButtons.vue                 | 1 +
 .../Views/Shared/Tenant/LearningHub/_Layout.cshtml          | 4 +++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAuthorsTab.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAuthorsTab.vue
index 134084076..3454b62a0 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAuthorsTab.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAuthorsTab.vue
@@ -31,6 +31,7 @@
                                         v-bind:inputId="authorName"
                                         v-bind:characterLimit="100"
                                         v-bind:disabled="authorIsContributor"
+                                        :showTitle="false"
                                         class="mt-25">
                             <template v-slot:description>
                                 <label :for="'authorName'" class="mb-0">Author name</label>
@@ -39,6 +40,7 @@
                         <CharacterCount v-model="authorOrganisation"
                                         v-bind:inputId="authorOrganisation"
                                         v-bind:characterLimit="100"
+                                        :showTitle="false"
                                         class="mt-15">
                             <template v-slot:description>
                                 <label :for="'authorOrganisation'" class="mb-0">Organisation</label>
@@ -47,6 +49,7 @@
                         <CharacterCount v-model="authorRole"
                                         v-bind:inputId="authorRole"
                                         v-bind:characterLimit="100"
+                                        :showTitle="false"
                                         class="mt-15">
                             <template v-slot:description>
                                 <label :for="'authorRole'" class="mb-0">Role</label>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/CharacterCount.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/CharacterCount.vue
index 1f534fe3e..4d6982115 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/CharacterCount.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/CharacterCount.vue
@@ -41,7 +41,7 @@
                         'character-count-component--error': (hasOtherError),
                         'character-count-component--large': (size === 'large'),
                        }">
-        <h2 class="nhsuk-heading-l">
+        <h2 class="nhsuk-heading-l" v-if="showTitle">
             <slot name="title"></slot>
         </h2>
         <div class="mb-2">
@@ -98,6 +98,10 @@
             disabled: Boolean,
             focusOnLoad: Boolean,
             size: String,
+            showTitle: {
+                default: true,
+                type: Boolean  
+            }
         },
         data() {
             return {
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/CharacterCountWithSaveCancelButtons.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/CharacterCountWithSaveCancelButtons.vue
index d29bae1ba..3adc6a2c4 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/CharacterCountWithSaveCancelButtons.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/CharacterCountWithSaveCancelButtons.vue
@@ -3,6 +3,7 @@
         <CharacterCount v-model="inputValue"
                         v-bind:characterLimit="characterLimit"
                         v-bind:size="size"
+                        :showTitle="false"
                         focusOnLoad></CharacterCount>
         <div class="d-inline-flex">
             <Button v-on:click="save"
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
index 8d43b4034..3465856d9 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
@@ -71,11 +71,13 @@
         <partial name="_CookieConsentPartial" />
     </div>
 
-    <header class="nhsuk-header" role="banner" id="header">
+    <header class="nhsuk-header" role="banner">
     <div id="content-header">
         <partial name="~/Views/Shared/_NavPartial.cshtml" />
     </div>
     </header>
+    <div id="header">
+        </div>
 
     <div class="nhsuk-width-container app-width-container beta-banner">
         <span class="beta-banner__beta-box">BETA</span>

From f89d56803c18106ce37411049ad226175dc6d9d9 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Fri, 1 Nov 2024 15:17:13 +0000
Subject: [PATCH 080/143] TD-4080: DIG302: Placeholder text cannot be used to
 label forms

---
 .../Scripts/vuesrc/catalogue/managecatalogue.vue   |  1 +
 .../vuesrc/contribute-resource/Contribute.vue      |  5 ++++-
 .../ContributeAssessmentSettings.vue               | 10 ++++++----
 .../contribute-resource/ContributeAuthorsTab.vue   | 10 +++++++---
 .../vuesrc/contribute-resource/ContributeBlock.vue |  6 ++++--
 .../ContributeImageCarouselBlock.vue               |  6 ++++--
 .../ContributeImageCarouselBlockItem.vue           |  4 +++-
 .../ContributeWholeSlideImage.vue                  | 12 ++++++++----
 .../content-tab/MediaBlockCarouselImage.vue        |  6 ++++--
 .../components/content-tab/MediaBlockImage.vue     |  7 +++++--
 .../components/questions/MultipleChoiceAnswer.vue  | 14 ++++++++------
 .../CharacterCountWithSaveCancelButtons.vue        |  3 ++-
 .../EditSaveFieldWithCharacterCount.vue            |  2 ++
 .../resource/blocks/AnnotationFullPageEdit.vue     |  5 ++++-
 14 files changed, 62 insertions(+), 29 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/catalogue/managecatalogue.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/catalogue/managecatalogue.vue
index e72eb5b05..d76b0bef1 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/catalogue/managecatalogue.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/catalogue/managecatalogue.vue
@@ -76,6 +76,7 @@
                             <div class="row">
                                 <div class="col" style="min-width:400px; width:400px;">
                                     <div class="input-group pt-4" id="input-group-searchbar-md">
+                                        <label class="nhsuk-label nhsuk-u-visually-hidden" for="input-search-md">Find a user by their email address</label>
                                         <input class="form-control small pl-4" v-model="emailAddressFilter" type="search" placeholder="Find a user by their email address" aria-label="Search your learning activity" id="input-search-md" @change="loadUsers();" v-on:keyup="searchUsersKeyUp($event.keyCode)">
                                         <span class="input-group-append">
                                             <button class="btn btn-outline-secondary btn-search" type="button" name="button-search" aria-label="search" v-on:click="loadUsers()" style="margin-top: 0;">
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/Contribute.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/Contribute.vue
index 0f958304b..f25aa0b7f 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/Contribute.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/Contribute.vue
@@ -49,11 +49,13 @@
 
                     <div class="contribute-title-wrapper lh-padding-fluid">
                         <div class="lh-container-xl pt-20 pb-2">
+                   
                             <EditSaveFieldWithCharacterCount v-model="resourceDetails.title"
                                                              addEditLabel="title"
                                                              :characterLimit="255"
                                                              :isH1="true"
-                                                             size="large"></EditSaveFieldWithCharacterCount>
+                                                             size="large"
+                                                             :inputId="title"></EditSaveFieldWithCharacterCount>
                         </div>
                         <h3 v-if="resourceDetails.resourceType === ResourceType.ASSESSMENT"
                             class="pb-15 lh-container-xl">
@@ -290,6 +292,7 @@
     export default Vue.extend({
         props: {
             resourceVersionId: String,
+            title: { type: String, default: 'title' },
         },
         components: {
             ContributeActionsBar,
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue
index 09925626c..3c01b6050 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue
@@ -53,8 +53,8 @@
 
                         <div class="d-flex" v-if="assessmentDetails.assessmentType === AssessmentTypeEnum.Formal">
                             <div class="selection pr-50">
-                                <div class="mb-4">Define how many attempts the learner can have.</div>
-                                <input class="text-input" type="text" v-model="assessmentDetails.maximumAttempts" />
+                                <div class="mb-4"><label for="maximumAttempts">Define how many attempts the learner can have.</label></div>
+                                <input class="text-input" type="text" id="maximumAttempts" name="maximumAttempts" v-model="assessmentDetails.maximumAttempts" />
                             </div>
                             <div class="tip">
                                 <h3>Tip</h3>
@@ -65,11 +65,12 @@
 
                         <div class="d-flex">
                             <div class="selection pr-50">
-                                <div>Provide guidance for the learner at the end of this assessment. <i v-if="!IsVisible" class="warningTriangle fas fa-exclamation-triangle warm-yellow"></i></div>
+                                <div>Provide guidance for the learner at the end of this assessment.<i v-if="!IsVisible" class="warningTriangle fas fa-exclamation-triangle warm-yellow"></i></div>
                                 <EditSaveFieldWithCharacterCount v-model="assessmentDetails.endGuidance.blocks[0].title"
                                                                  addEditLabel="title"
                                                                  v-bind:characterLimit="60"
-                                                                 v-bind:isH3="true" />
+                                                                 v-bind:isH3="true" 
+                                                                 v-bind:inputId="message"/>
                                 <ckeditorwithhint v-on:blur="setEndGuidance"
                                                   v-on:inputValidity="setGuidanceValidity"
                                                   :maxLength="1000"
@@ -107,6 +108,7 @@
         props: {
             blockCollection: { type: Object } as PropOptions<BlockCollectionModel>,
             firstTimeOpen: Boolean,
+            message: { type: String, default: 'message' },
         },
         components: {
             ExpansionPanel,
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAuthorsTab.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAuthorsTab.vue
index 3454b62a0..9881f3e42 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAuthorsTab.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAuthorsTab.vue
@@ -28,7 +28,7 @@
                             </label>
                         </div>
                         <CharacterCount v-model="authorName"
-                                        v-bind:inputId="authorName"
+                                        v-bind:inputId="txtauthorName"
                                         v-bind:characterLimit="100"
                                         v-bind:disabled="authorIsContributor"
                                         :showTitle="false"
@@ -38,7 +38,7 @@
                             </template>
                         </CharacterCount>
                         <CharacterCount v-model="authorOrganisation"
-                                        v-bind:inputId="authorOrganisation"
+                                        v-bind:inputId="txtauthorOrganisation"
                                         v-bind:characterLimit="100"
                                         :showTitle="false"
                                         class="mt-15">
@@ -47,7 +47,7 @@
                             </template>
                         </CharacterCount>
                         <CharacterCount v-model="authorRole"
-                                        v-bind:inputId="authorRole"
+                                        v-bind:inputId="txtauthorRole"
                                         v-bind:characterLimit="100"
                                         :showTitle="false"
                                         class="mt-15">
@@ -86,12 +86,16 @@
         props: {
             resourceDetails: { type: Object } as PropOptions<ContributeResourceDetailModel>,
             configuration: { type: Object } as PropOptions<ContributeConfiguration>,
+            txtauthorName: { type: String, default: 'authorName' },
+            txtauthorOrganisation: { type: String, default: 'authorOrganisation' },
+            txtauthorRole: { type: String, default: 'authorRole' },
         },
         components: {
             AuthorsList,
             Button,
             CharacterCount,
             LinkTextAndIcon,
+
         },
         data() {
             return {
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeBlock.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeBlock.vue
index 4c6aa1ec4..e81dc188b 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeBlock.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeBlock.vue
@@ -28,7 +28,8 @@
                                                          v-model="block.title"
                                                          addEditLabel="title"
                                                          :characterLimit="60"
-                                                         :isH3="true"></EditSaveFieldWithCharacterCount>
+                                                         :isH3="true"
+                                                         :inputId="title"></EditSaveFieldWithCharacterCount>
                         <h3 class="my-0"
                             v-else>
                             {{ block.title }}
@@ -158,7 +159,8 @@
             enableDown: Boolean,
             resourceType: { type: Number } as PropOptions<ResourceType>,
             canBeDuplicated: Boolean,
-            selectedToDuplicate: Boolean
+            selectedToDuplicate: Boolean,
+            title: { type: String, default: 'title' },
         },
         data() {
             return {
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeImageCarouselBlock.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeImageCarouselBlock.vue
index 9c0c626bb..589e4a69a 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeImageCarouselBlock.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeImageCarouselBlock.vue
@@ -2,7 +2,7 @@
     <div class="contribute-image-carousel-block">
         <div class="contribute-image-carousel-block-description">
             <div>
-                <b>Description text</b>
+                <label for="description"> <b>Description text</b></label>
                 <Tick v-bind:complete="!!imageCarouselBlock.description"></Tick>
                 <p>
                     Provide a short description for the Carousel. This will be displayed to the user in the header bar beneath the title.
@@ -13,7 +13,8 @@
                     <EditSaveFieldWithCharacterCount v-model="imageCarouselBlock.description"
                                                      addEditLabel="Description"
                                                      v-bind:characterLimit="250"
-                                                     v-bind:isH3="true"></EditSaveFieldWithCharacterCount>
+                                                     v-bind:isH3="true"
+                                                     v-bind:inputId="description"></EditSaveFieldWithCharacterCount>
                 </div>
             </div>
         </div>
@@ -97,6 +98,7 @@
         props: {
             imageCarouselBlock: { type: Object } as PropOptions<ImageCarouselBlockModel>,
             resourceType: { type: Number } as PropOptions<ResourceType>,
+            description: { type: String, default: 'description' },
         },
         data() {
             return {
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeImageCarouselBlockItem.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeImageCarouselBlockItem.vue
index 61ef9a378..1dbaf26fb 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeImageCarouselBlockItem.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeImageCarouselBlockItem.vue
@@ -12,7 +12,8 @@
                         <EditSaveFieldWithCharacterCount v-model="block.title"
                                                          addEditLabel="title"
                                                          v-bind:characterLimit="60"
-                                                         v-bind:isH3="true"></EditSaveFieldWithCharacterCount>
+                                                         v-bind:isH3="true"
+                                                         v-bind:inputId="title"></EditSaveFieldWithCharacterCount>
                         <Tick v-bind:complete="block.isReadyToPublish()" class="p-10"></Tick>
                     </div>
                     <div class="d-flex justify-content-center icon-button">
@@ -107,6 +108,7 @@ export default Vue.extend({
         enableUp: Boolean,
         enableDown: Boolean,
         resourceType: {type: Number} as PropOptions<ResourceType>,
+        title: { type: String, default: 'title' },
     },
     data() {
         return {
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeWholeSlideImage.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeWholeSlideImage.vue
index 7e23d49d6..a42a3848b 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeWholeSlideImage.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeWholeSlideImage.vue
@@ -4,11 +4,12 @@
             <div class="d-flex flex-grow-1">
                 <Tick :complete="wholeSlideImageItem.isReadyToPublish()"
                       class="pt-20 pl-15 pr-10"></Tick>
-                <div class="flex-grow-1 mr-10">
+                <div class="flex-grow-1 mr-10">                 
                     <EditSaveFieldWithCharacterCount v-model="wholeSlideImage.title"
                                                      addEditLabel="title"
                                                      :characterLimit="60"
-                                                     :isH4="true"></EditSaveFieldWithCharacterCount>
+                                                     :isH4="true"
+                                                     :inputId="title"></EditSaveFieldWithCharacterCount>
                 </div>
             </div>
             <div class="contribute-whole-slide-image-buttons d-flex align-items-start justify-content-end">
@@ -53,13 +54,14 @@
 
                 <div v-if="!wholeSlideImage.getFileModel() && !imageZone">
                     <h3 class="flex pl-2 pt-10"
-                        v-if="showPlaceholderText">Placeholder text:</h3>
+                        v-if="showPlaceholderText"><label for="placeholder">Placeholder text:</label></h3>
                     <div class="d-flex align-items-center">
                         <EditSaveFieldWithCharacterCount
                             class="flex"
                             addEditLabel="placeholder text"
                             v-model="wholeSlideImageItem.placeholderText"
                             :characterLimit="500"
+                            :inputId="placeholder"
                             @updateIsEditing="value => isEditingPlaceholder(value)"/>
                     </div>
                     <div>
@@ -225,7 +227,9 @@
             enableUp: Boolean,
             enableDown: Boolean,
             resourceType: { type: Number } as PropOptions<ResourceType>,
-            imageZone: { type: Boolean, default: false }
+            imageZone: { type: Boolean, default: false },
+            title: { type: String, default: 'title' },
+            placeholder: { type: String, default: 'placeholder' },
         },
         data() {
             return {
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/MediaBlockCarouselImage.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/MediaBlockCarouselImage.vue
index 3d8a60792..a2985f4e4 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/MediaBlockCarouselImage.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/MediaBlockCarouselImage.vue
@@ -20,13 +20,14 @@
                     </picture>
                 </div>
                 <div class="carousel-text-editor">
-                    <b>Description text</b> (Optional)
+                    <label for="description"> <b>Description text</b> (Optional)</label>
                     <p>
                         Provide a short description of the image, which will be displayed to the user under the image in the carousel.
                     </p>
                     <EditSaveFieldWithCharacterCount v-model="image.description"
                                                      addEditLabel="Description"
                                                      v-bind:characterLimit="150"
+                                                     v-bind:inputId="description"
                                                      block-view/>
                 </div>
                 <div class="carousel-text-editor">
@@ -39,7 +40,7 @@
                     <EditSaveFieldWithCharacterCount v-model="image.altText"
                                                      addEditLabel="alt text"
                                                      v-bind:characterLimit="125"
-                                                     block-view/>
+                                                     block-view />
                 </div>
             </div>
         </div>
@@ -71,6 +72,7 @@
         },
         props: {
             image: { type: Object } as PropOptions<ImageModel>,
+             description: { type: String, default: 'description' },
         },
         data() {
             return {
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/MediaBlockImage.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/MediaBlockImage.vue
index b4bdea73a..367086f17 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/MediaBlockImage.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/content-tab/MediaBlockImage.vue
@@ -14,7 +14,8 @@
                 <div v-if="withLabel">
                     <EditSaveFieldWithCharacterCount v-model="image.description"
                                                      addEditLabel="label"
-                                                     v-bind:characterLimit="descriptionCharacterLimit"/>
+                                                     v-bind:characterLimit="descriptionCharacterLimit"
+                                                     v-bind:inputId="imageAltText"/>
                 </div>
             </div>
             <div v-else class="d-flex flex-column align-items-center justify-content-center">
@@ -36,6 +37,7 @@
                 <EditSaveFieldWithCharacterCount v-model="image.altText"
                                                  addEditLabel="alt text"
                                                  v-bind:characterLimit="125"
+                                                 v-bind:inputId="alttext"
                                                  block-view/>
             </div>
         </div>
@@ -71,7 +73,8 @@ export default Vue.extend({
             restrictAdvancedImageTypes: { type: Boolean, default: false },
             imageClass: String,
             withLabel: { type: Boolean, default: false },
-            descriptionCharacterLimit: { type: Number, default: 125 }
+            descriptionCharacterLimit: { type: Number, default: 125 },
+            alttext: { type: String, default: 'alttext' },
         },
         data() {
             return {
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/MultipleChoiceAnswer.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/MultipleChoiceAnswer.vue
index a09c280ad..0555673f2 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/MultipleChoiceAnswer.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/MultipleChoiceAnswer.vue
@@ -3,12 +3,13 @@
         <div>
             <div class="flex align-items-center">
                 <div class="flex">
-                    <Tick v-bind:complete="this.answer.isReadyToPublish()" class="pr-3 align-with-cc"/>
-                    <EditSaveFieldWithCharacterCount
-                                    v-model="message"
-                                    addEditLabel="response text"
-                                    v-bind:characterLimit="120"
-                                    v-bind:isH3="true"></EditSaveFieldWithCharacterCount>
+                    <Tick v-bind:complete="this.answer.isReadyToPublish()" class="pr-3 align-with-cc" />
+                    <label class="nhsuk-u-visually-hidden" for="messagedetails"></label>
+                    <EditSaveFieldWithCharacterCount v-model="message"
+                                                     addEditLabel="response text"
+                                                     v-bind:characterLimit="120"
+                                                     v-bind:inputId="messagedetails"
+                                                     v-bind:isH3="true"></EditSaveFieldWithCharacterCount>
                 </div>
                 <span class="bin">
                     <IconButton v-on:click="$emit('deleteAnswer', answer)"
@@ -49,6 +50,7 @@
         props: {
             answer: { type: Object } as PropOptions<AnswerModel>,
             multipleAnswers: Boolean,
+            messagedetails: { type: String, default: 'messagedetails' },
         },
         
         data() {
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/CharacterCountWithSaveCancelButtons.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/CharacterCountWithSaveCancelButtons.vue
index 3adc6a2c4..52be25939 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/CharacterCountWithSaveCancelButtons.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/CharacterCountWithSaveCancelButtons.vue
@@ -3,7 +3,7 @@
         <CharacterCount v-model="inputValue"
                         v-bind:characterLimit="characterLimit"
                         v-bind:size="size"
-                        :showTitle="false"
+                        v-bind:inputId="inputId"
                         focusOnLoad></CharacterCount>
         <div class="d-inline-flex">
             <Button v-on:click="save"
@@ -34,6 +34,7 @@
             value: String,
             characterLimit: Number,
             size: String,
+            inputId:String
         },
         data() {
             return {
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/EditSaveFieldWithCharacterCount.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/EditSaveFieldWithCharacterCount.vue
index 28c0d10f6..67b06678f 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/EditSaveFieldWithCharacterCount.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/globalcomponents/EditSaveFieldWithCharacterCount.vue
@@ -5,6 +5,7 @@
                                              v-model="inputValue"
                                              v-bind:characterLimit="characterLimit"
                                              v-bind:size="size"
+                                             v-bind:inputId="inputId"
                                              v-on:input="$emit('input', $event)"
                                              v-on:close="isEditing = false"></CharacterCountWithSaveCancelButtons>
         <div v-else>
@@ -66,6 +67,7 @@
             addEditLabel: String,
             blockView: Boolean,
             size: String,
+            inputId: String,
         },
         data() {
             return {
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/AnnotationFullPageEdit.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/AnnotationFullPageEdit.vue
index cf1b5892b..e4fba8774 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/AnnotationFullPageEdit.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/AnnotationFullPageEdit.vue
@@ -14,10 +14,12 @@
         </div>
         <div class="annotation-edit-fs-functions">
             <div class="annotation-edit-fs-functions-change-title">
+                <label class="nhsuk-u-visually-hidden" for="title"></label>
                 <EditSaveFieldWithCharacterCount v-model="wholeSlideImage.title"
                                                  addEditLabel="title"
                                                  :characterLimit="60"
-                                                 :isH4="true"/>
+                                                 :isH4="true"
+                                                 :inputId="title" />
             </div>
             <div class="annotation-edit-fs-functions-other">
                 <div class="edit-hide-controls">
@@ -75,6 +77,7 @@
             resourceType: { type: Number } as PropOptions<ResourceType>,
             imageZone: Boolean,
             questionBlock: { type: Object } as PropOptions<QuestionBlockModel>,
+            title: { type: String, default: 'title' },
         },
         data() {
             return {

From 9a418324412e164f2bd53f59dbd328a27b7a208b Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Mon, 4 Nov 2024 14:33:13 +0000
Subject: [PATCH 081/143] TD:4079: DIG301: Form fields are not associated with
 text labels

---
 .../Components/NavigationItems/MobileTopRightNav.cshtml     | 4 ++--
 LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/MobileTopRightNav.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/MobileTopRightNav.cshtml
index fbbe4a256..3ced465bc 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/MobileTopRightNav.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/NavigationItems/MobileTopRightNav.cshtml
@@ -24,12 +24,12 @@ else
     <div class="nhsuk-header__mobile-break"></div>
     @if (Model.ShowSearch)
     {
-        <label class="nhsuk-header__search-toggle" id="toggle-search" aria-controls="search" aria-label="Open search">
+        <button class="nhsuk-header__search-toggle" id="toggle-search" aria-controls="search" aria-label="Open search">
             <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false" width="27" height="27">
                 <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
             </svg>
             <span class="nhsuk-u-visually-hidden">Search</span>
-        </label>
+        </button>
     }
 }
 
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
index 233fd9bc9..78154d41f 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
@@ -49,15 +49,15 @@
 
 </div>
   @if (User.Identity.IsAuthenticated) {
-    <input type="checkbox" id="header-dropdown-menu-control" aria-labelledby="Main navigation menu" role="button">
+  <input type="checkbox" id="header-dropdown-menu-control" aria-labelledby="label-navigation" role="button">
     <nav class="nhsuk-header__navigation app-width-container" id="header-navigation" role="navigation" aria-label="Primary navigation" aria-labelledby="label-navigation">
         <p class="nhsuk-header__navigation-title"><span id="label-navigation">Menu</span>
-          <label class="nhsuk-header__navigation-close" id="close-menu">
+          <button class="nhsuk-header__navigation-close" id="close-menu">
             <svg class="nhsuk-icon nhsuk-icon__close" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false" width="27" height="27">
               <path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
             </svg>
             <span class="nhsuk-u-visually-hidden">Close menu</span>
-          </label>
+          </button>
         </p>
         <ul class="nhsuk-header__navigation-list @BasicUserPaddingClass()">
           @await Component.InvokeAsync("NavigationItems")

From 6f37266ef1e1a79dff829a51d632fd8ec4f1cb87 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Mon, 4 Nov 2024 15:54:03 +0000
Subject: [PATCH 082/143] accessbility fixes

---
 .../components/questions/SingleChoiceAnswer.vue                | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/SingleChoiceAnswer.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/SingleChoiceAnswer.vue
index f1379acb3..0ab646f4a 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/SingleChoiceAnswer.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/SingleChoiceAnswer.vue
@@ -27,8 +27,7 @@
             <hr class="cutoff-line">
         </div>
         <div>
-            <label class="nhsuk-u-visually-hidden" for="message"></label>
-            <input type="text" id="message" name="message" aria-describedby="messageError" class="form-control text-input" maxlength="120" v-model="message" />
+            <input type="text" aria-describedby="messageError" class="form-control text-input" maxlength="120" v-model="message" />
             <div class="footer-text" id="messageError">
                 You have {{ charactersRemaining }} characters remaining.
             </div>

From 1508bc70dae77bf9fc462a42c4cd570615e732cc Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Mon, 4 Nov 2024 16:55:36 +0000
Subject: [PATCH 083/143] Accessibility fixes

---
 .../vuesrc/contribute-resource/components/KeyWordsEditor.vue  | 2 +-
 .../Scripts/vuesrc/contribute/ContentCommon.vue               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
index 97e4ed42f..9c09b5828 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
@@ -19,7 +19,7 @@
                     <input id="newKeyword" aria-labelledby="keyword-label" type="text" class="form-control" maxlength="260" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
                     <button type="button" class="nhsuk-button nhsuk-button--secondary ml-3 button_width nhsuk-u-margin-bottom-0" @click="addKeyword">&nbsp;Add</button>
                 </div>
-                <div class="col-12 footer-text">
+                <div class="col-12 footer-text" id="keyword-label">
                     You can enter a maximum of 50 characters per keyword
                 </div>
             </div>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
index 1ace98464..85f0dd6f0 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
@@ -87,7 +87,7 @@
                     <span class="text-danger">The keyword(s) have already been added : {{formattedkeywordErrorMessage}}</span>
                 </div>
                 <div class="col-12 mb-0 error-text" v-if="keywordLengthExceeded">
-                    <span class="text-danger">
+                    <span class="text-danger" id="keyword-label"> 
                         Each keyword must be no longer than 50 characters.
                     </span>
                 </div>
@@ -99,7 +99,7 @@
                     <input id="newKeyword" aria-labelledby="keyword-label" aria-describedby="keyworddesc" type="text" class="form-control" maxlength="260" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
                     <button type="button" class="nhsuk-button nhsuk-button--secondary ml-3 nhsuk-u-margin-bottom-0" @click="addKeyword">&nbsp;Add</button>
                 </div>
-                <div class="col-12 footer-text">
+                <div class="col-12 footer-text" id="keyword-label">
                     You can enter a maximum of 50 characters per keyword
                 </div>
             </div>

From d64b641ac693aa0ce7fca18d5f576cb5016edb2c Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 6 Nov 2024 10:31:48 +0000
Subject: [PATCH 084/143] TD-4079: Form elements should have an id attribute

---
 .../ContributeAssessmentSettings.vue                 | 12 +++++++-----
 .../contribute-resource/ContributeAuthorsTab.vue     |  6 +++---
 .../contribute-resource/ContributeLicenceTab.vue     |  6 +++---
 .../components/CatalogueSelector.vue                 |  2 +-
 .../components/SensitiveContentTickBox.vue           |  4 ++--
 .../components/questions/AllowReveal.vue             |  8 ++++----
 .../components/questions/SingleChoiceAnswer.vue      |  2 +-
 .../Scripts/vuesrc/contribute/CatalogueSelect.vue    |  2 +-
 .../Scripts/vuesrc/contribute/Content.vue            |  4 ++--
 .../Scripts/vuesrc/contribute/ContentCommon.vue      |  8 ++++----
 .../Scripts/vuesrc/contribute/ContentVideo.vue       |  2 +-
 .../Scripts/vuesrc/learningsessions/ScormViewer.vue  |  2 +-
 12 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue
index 3c01b6050..088f74c90 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue
@@ -23,12 +23,12 @@
                         <div class="d-flex">
                             <div class="selection pr-50">
                                 <div class="mb-4">Allow the learner to work through the assessment pages in any order.</div>
-                                <label class="my-0 label-text">
-                                    <input class="radio-button" type="radio" :value="false"  v-model="assessmentDetails.answerInOrder"/>
+                                <label class="my-0 label-text" for="yes">
+                                    <input class="radio-button" type="radio" :value="false" id="yes"  v-model="assessmentDetails.answerInOrder"/>
                                     Yes
                                 </label>
-                                <label class="my-0 pl-5 label-text">
-                                    <input class="radio-button" type="radio" :value="true"  v-model="assessmentDetails.answerInOrder"/>
+                                <label class="my-0 pl-5 label-text" for="no">
+                                    <input class="radio-button" type="radio" :value="true" id="no"  v-model="assessmentDetails.answerInOrder"/>
                                     No
                                 </label>
                             </div>
@@ -74,7 +74,9 @@
                                 <ckeditorwithhint v-on:blur="setEndGuidance"
                                                   v-on:inputValidity="setGuidanceValidity"
                                                   :maxLength="1000"
-                                                  :initialValue="endGuidance" />
+                                                  :initialValue="endGuidance"
+                                                  :for="guidance"
+                                                  :id="guidance"/>
                             </div>
                             <div class="tip">
                                 <h3>Tip</h3>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAuthorsTab.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAuthorsTab.vue
index 9881f3e42..7970c5263 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAuthorsTab.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeAuthorsTab.vue
@@ -14,16 +14,16 @@
                 
                 <div v-if="resourceAuthors.length < maxAllowedAuthors" class="mb-40">
                     <LinkTextAndIcon v-if="!isAdding"
-                                     v-on:click="isAdding = true"
+                                     v-on:click="isAdding = true"Please choose...
                                      class="contribute-authors-tab-add-button">
                         <i class="fa-solid fa-plus"></i> Add author
                     </LinkTextAndIcon>
 
                     <div v-if="isAdding">
                         <div class="mt-5" v-if="!isCurrentUserSavedAsAuthor">
-                            <label class="checkContainer">
+                            <label class="checkContainer" for="currentUserAuthor">
                                 I am the author or co-author
-                                <input type="checkbox" v-model="authorIsContributor" v-on:change="currentUserAuthorChange">
+                                <input type="checkbox" id="currentUserAuthor" v-model="authorIsContributor" v-on:change="currentUserAuthorChange">
                                 <span class="checkmark"></span>
                             </label>
                         </div>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeLicenceTab.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeLicenceTab.vue
index 5c0ffe391..04f60d05d 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeLicenceTab.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/ContributeLicenceTab.vue
@@ -8,9 +8,9 @@
                     <a v-bind:href="moreInfoLink" class="mb-10 accessible-link" target="_blank">More information on licences</a>
                 </div>
 
-                <select class="form-control" aria-labelledby="licence-heading" v-model="resourceDetails.resourceLicenceId">
-                    <option disabled v-bind:value="null">Please choose...</option>
-                    <option v-for="licence in licences" :value="licence.id">
+                <select class="form-control" aria-labelledby="licence-heading" id="licence" v-model="resourceDetails.resourceLicenceId">
+                    <option disabled v-bind:value="null" id="select">Please choose...</option>
+                    <option v-for="licence in licences" :value="licence.id" :id="licence.id">
                         {{licence.title}}
                     </option>
                 </select>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/CatalogueSelector.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/CatalogueSelector.vue
index eb7981f31..f3354ab8d 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/CatalogueSelector.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/CatalogueSelector.vue
@@ -5,7 +5,7 @@
         <CatalogueSelectorAccordion/>
         
         <div class="form-group">
-            <select class="form-control" aria-labelledby="primary-catalogue-heading" v-model="selectedCatalogue" @change="catalogueChange">
+            <select class="form-control" aria-labelledby="primary-catalogue-heading" id="catalogue" v-model="selectedCatalogue" @change="catalogueChange">
                 <option disabled v-bind:value="{ nodeId: 0 }">Please choose...</option>
                 <option v-for="catalogue in userCatalogues" :value="catalogue">
                     {{getCatalogueName(catalogue)}}
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/SensitiveContentTickBox.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/SensitiveContentTickBox.vue
index a6b5ef649..7fb3d12b4 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/SensitiveContentTickBox.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/SensitiveContentTickBox.vue
@@ -11,9 +11,9 @@
         </div>
 
         <div class="mt-3">
-            <label class="checkContainer mb-0">
+            <label class="checkContainer mb-0" for="sensitivecontent">
                 Yes
-                <input type="checkbox" v-model="resourceDetails.sensitiveContent">
+                <input type="checkbox" id="sensitivecontent" v-model="resourceDetails.sensitiveContent">
                 <span class="checkmark"></span>
             </label>
         </div>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/AllowReveal.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/AllowReveal.vue
index 078994fe2..9cdb8d3f9 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/AllowReveal.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/AllowReveal.vue
@@ -6,13 +6,13 @@
             </div>
             <form>
                
-                <label class="my-0">
-                    <input class="radio-button" type="radio" :value="false"  v-model="questionBlock.allowReveal"/>
+                <label class="my-0" for="no">
+                    <input class="radio-button" type="radio" :value="false"  v-model="questionBlock.allowReveal" id="no"/>
                     No
                 </label>
                 <br>
-                <label class="my-0">
-                    <input class="radio-button" type="radio" :value="true"  v-model="questionBlock.allowReveal"/>
+                <label class="my-0" for="yes">
+                    <input class="radio-button" type="radio" :value="true"  v-model="questionBlock.allowReveal" id="yes"/>
                     Yes
                 </label>
             </form>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/SingleChoiceAnswer.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/SingleChoiceAnswer.vue
index 0ab646f4a..fe239474a 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/SingleChoiceAnswer.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/questions/SingleChoiceAnswer.vue
@@ -27,7 +27,7 @@
             <hr class="cutoff-line">
         </div>
         <div>
-            <input type="text" aria-describedby="messageError" class="form-control text-input" maxlength="120" v-model="message" />
+            <input type="text" id="txtmessage" aria-describedby="messageError" class="form-control text-input" maxlength="120" v-model="message" />
             <div class="footer-text" id="messageError">
                 You have {{ charactersRemaining }} characters remaining.
             </div>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/CatalogueSelect.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/CatalogueSelect.vue
index f7f91cd55..1d132cf5f 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/CatalogueSelect.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/CatalogueSelect.vue
@@ -36,7 +36,7 @@
 
         <div class="row">
             <div class="form-group col-12">
-                <select class="form-control" aria-labelledby="type-label" v-model="selectedCatalogue" @change="catalogueChange">
+                <select class="form-control" aria-labelledby="type-label" id="catalogue" v-model="selectedCatalogue" @change="catalogueChange">
                     <option disabled v-bind:value="{ nodeId: 0 }">Please choose...</option>
                     <option v-for="catalogue in userCatalogues" :value="catalogue">
                         {{getCatalogueName(catalogue)}}
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
index 31102a78d..e5a5e2c43 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/Content.vue
@@ -71,7 +71,7 @@
                             </div>
                             <div class="row">
                                 <div class="form-group col-12">
-                                    <select class="form-control" aria-labelledby="type-label" v-model="selectUploadResourceType" @change="onUploadResourceTypeChange">
+                                    <select class="form-control" aria-labelledby="type-label" id="uploadResourceTypes" v-model="selectUploadResourceType" @change="onUploadResourceTypeChange">
                                         <option disabled v-bind:value="0">Please choose...</option>
                                         <option v-for="option in uploadResourceTypes" :value="option.id">
                                             {{ option.description }}
@@ -359,7 +359,7 @@
                                                     <div>
                                                         <div class="modal-section-header"><label for="notes">Notes</label></div>
                                                         <p class="mt-1">Provide information to help learners understand why this new version has been created.</p>
-                                                        <textarea class="form-control"id="notes" v-bind:class="{ 'input-validation-error': $v.publishNotes.$invalid && $v.publishNotes.$dirty }" rows="4" maxlength="4000" v-model="publishNotes"></textarea>
+                                                        <textarea class="form-control" id="notes" v-bind:class="{ 'input-validation-error': $v.publishNotes.$invalid && $v.publishNotes.$dirty }" rows="4" maxlength="4000" v-model="publishNotes"></textarea>
                                                         <div class="error-text pt-3" v-if="$v.publishNotes.$invalid && $v.publishNotes.$dirty">
                                                             <span class="text-danger">Enter notes.</span>
                                                         </div>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
index 85f0dd6f0..d670ced15 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
@@ -66,9 +66,9 @@
                 <div class="bg-grey-white">
                     Do you want learners to be notified that this resource contains sensitive content, which they may find offensive or disturbing, before they access it?
                     <div class="mt-3">
-                        <label class="checkContainer mb-0">
+                        <label class="checkContainer mb-0" for="sensitivecontent">
                             Yes
-                            <input type="checkbox" v-model="sensitiveContent" @click="setSensitiveContent($event.target.checked)">
+                            <input type="checkbox" id="sensitivecontent" v-model="sensitiveContent" @click="setSensitiveContent($event.target.checked)">
                             <span class="checkmark"></span>
                         </label>
                     </div>
@@ -151,9 +151,9 @@
             </div>
             <div v-if="!userIsAuthor && authors.length < maxAllowedAuthors" class="col-12 mb-3">
                 <div>
-                    <label class="checkContainer">
+                    <label class="checkContainer" for="currentUserAuthor">
                         I am the author or co-author
-                        <input type="checkbox" v-model="currentUserAuthor" @change="currentUserAuthorChange">
+                        <input type="checkbox" id="currentUserAuthor" v-model="currentUserAuthor" @change="currentUserAuthorChange">
                         <span class="checkmark"></span>
                     </label>
                 </div>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentVideo.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentVideo.vue
index fd2631c6c..b97de9a86 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentVideo.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentVideo.vue
@@ -63,7 +63,7 @@
                 for example, how it was developed or what is required for it to be used.
             </div>
             <div class="col-12 mt-3">
-                <textarea class="form-control" aria-labelledby="additionalinfo-label" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
+                <textarea class="form-control" id="additionalinfo" aria-labelledby="additionalinfo-label" rows="4" maxlength="250" v-model="additionalInformation" @change="setAdditionalInformation($event.target.value)"></textarea>
             </div>
             <div class="col-12 footer-text">
                 You can enter a maximum of 250 characters
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/learningsessions/ScormViewer.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/learningsessions/ScormViewer.vue
index f0687c0f8..93006121a 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/learningsessions/ScormViewer.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/learningsessions/ScormViewer.vue
@@ -17,7 +17,7 @@
         </div>
         <div class="text-popup" v-show="textLogVisible">
             <button @click="textLogVisible=false">close</button>
-            <textarea v-model="textLog"></textarea>
+            <textarea v-model="textLog" id="log"></textarea>
         </div>
     </div>
 </template>

From 1067f5c0cf7e3b0eb74e5d454d1c7ccb8256ca36 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 6 Nov 2024 12:45:54 +0000
Subject: [PATCH 085/143] TD-4194:DIG1302: Focus order is incorrect or
 illogical

---
 LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
index 78154d41f..195611f8b 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
@@ -56,7 +56,7 @@
             <svg class="nhsuk-icon nhsuk-icon__close" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false" width="27" height="27">
               <path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
             </svg>
-            <span class="nhsuk-u-visually-hidden">Close menu</span>
+            <span class="nhsuk-u-visually-hidden" tabindex="-1">Close menu</span>
           </button>
         </p>
         <ul class="nhsuk-header__navigation-list @BasicUserPaddingClass()">

From 03b04484cd1e2fcf5b146bd41a99027ad84ad9cc Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:45:40 +0000
Subject: [PATCH 086/143] fixes-VersionNumber

---
 .../LearningHub.Nhs.AdminUI.csproj            | 1253 +++++++++--------
 .../ServiceCollectionExtension.cs             |    1 +
 .../Services/VersionService.cs                |   18 +
 .../ViewComponents/VersionViewComponent.cs    |   34 +
 .../Views/Shared/_Layout.cshtml               |  145 +-
 .../LearningHub.Nhs.WebUI.csproj              |  145 +-
 .../ServiceCollectionExtension.cs             |    2 +
 .../Services/VersionService.cs                |   18 +
 .../ViewComponents/VersionViewComponent.cs    |   34 +
 .../Shared/Tenant/LearningHub/_Layout.cshtml  |    2 +
 .../LearningHub.Nhs.ReportApi.csproj          |   89 +-
 .../ServiceCollectionExtension.cs             |    6 +-
 .../LearningHub.Nhs.Api.csproj                |  125 +-
 .../ServiceCollectionExtension.cs             |    7 +-
 14 files changed, 1008 insertions(+), 871 deletions(-)
 create mode 100644 AdminUI/LearningHub.Nhs.AdminUI/Services/VersionService.cs
 create mode 100644 AdminUI/LearningHub.Nhs.AdminUI/ViewComponents/VersionViewComponent.cs
 create mode 100644 LearningHub.Nhs.WebUI/Services/VersionService.cs
 create mode 100644 LearningHub.Nhs.WebUI/ViewComponents/VersionViewComponent.cs

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
index f10d8aaab..b48d2837d 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
+++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
@@ -1,642 +1,649 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <UserSecretsId>31abd8b9-4223-4ff3-896b-a46530c9e15c</UserSecretsId>
-    <ApplicationInsightsResourceId>/subscriptions/57c55d5f-78c1-4373-a021-ff8357548f51/resourceGroups/LearningHubNhsUk-AdminUI-Prod-RG/providers/microsoft.insights/components/LearningHubNhsUk-AdminUI-Prod</ApplicationInsightsResourceId>
-    <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-	<Platforms>x64</Platforms>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<AssemblyVersion>1.0.0.0</AssemblyVersion>
+		<FileVersion>1.0.0.0</FileVersion>
+		<Version>1.0.0</Version>
+		<UserSecretsId>31abd8b9-4223-4ff3-896b-a46530c9e15c</UserSecretsId>
+		<ApplicationInsightsResourceId>/subscriptions/57c55d5f-78c1-4373-a021-ff8357548f51/resourceGroups/LearningHubNhsUk-AdminUI-Prod-RG/providers/microsoft.insights/components/LearningHubNhsUk-AdminUI-Prod</ApplicationInsightsResourceId>
+		<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<Platforms>x64</Platforms>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Views\Notification\**" />
-    <Content Remove="Views\Notification\**" />
-    <EmbeddedResource Remove="Views\Notification\**" />
-    <None Remove="Views\Notification\**" />
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Remove="Views\Notification\**" />
+		<Content Remove="Views\Notification\**" />
+		<EmbeddedResource Remove="Views\Notification\**" />
+		<None Remove="Views\Notification\**" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Content Remove="bundleconfig.json" />
-    <Content Remove="compilerconfig.json" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <TypeScriptCompile Remove="Scripts\vuesrc\content-structure\contentStructureContainer.ts" />
-    <TypeScriptCompile Remove="Scripts\vuesrc\content-structure\contentStructureRouter.ts" />
-    <TypeScriptCompile Remove="Scripts\vuesrc\content\contentContainer.ts" />
-    <TypeScriptCompile Remove="Scripts\vuesrc\content\contentPageListContainer.ts" />
-    <TypeScriptCompile Remove="Scripts\vuesrc\content\contentRouter.ts" />
-    <TypeScriptCompile Remove="Scripts\vuesrc\home\home.ts" />
-  </ItemGroup>
+	<ItemGroup>
+		<Content Remove="bundleconfig.json" />
+		<Content Remove="compilerconfig.json" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <_ContentIncludedByDefault Remove="bundleconfig.json" />
-  </ItemGroup>
+	<ItemGroup>
+		<TypeScriptCompile Remove="Scripts\vuesrc\content-structure\contentStructureContainer.ts" />
+		<TypeScriptCompile Remove="Scripts\vuesrc\content-structure\contentStructureRouter.ts" />
+		<TypeScriptCompile Remove="Scripts\vuesrc\content\contentContainer.ts" />
+		<TypeScriptCompile Remove="Scripts\vuesrc\content\contentPageListContainer.ts" />
+		<TypeScriptCompile Remove="Scripts\vuesrc\content\contentRouter.ts" />
+		<TypeScriptCompile Remove="Scripts\vuesrc\home\home.ts" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Content Include="node_modules\%40ckeditor\ckeditor5-build-classic\package.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-core\lang\contexts.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-core\package.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-engine\package.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-engine\theme\placeholder.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-heading\lang\contexts.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-heading\package.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-heading\theme\heading.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-paragraph\package.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\lang\contexts.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\package.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\button\button.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\button\switchbutton.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\colorgrid\colorgrid.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\dropdown.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\listdropdown.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\splitbutton.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\toolbardropdown.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\editorui\editorui.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\icon\icon.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\inputtext\inputtext.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\labeledinput\labeledinput.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\label\label.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\list\list.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\balloonpanel.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\balloonrotator.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\fakepanel.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\stickypanel.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\toolbar\blocktoolbar.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\toolbar\toolbar.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\tooltip\mixins\_tooltip.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\tooltip\tooltip.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\globals.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\_hidden.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\_reset.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\_zindex.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\mixins\_dir.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\mixins\_rwd.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\mixins\_unselectable.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-utils\package.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-vue\package.json" />
-  </ItemGroup>
+	<ItemGroup>
+		<_ContentIncludedByDefault Remove="bundleconfig.json" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
-    <PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
-    <PackageReference Include="BuildWebCompiler" Version="1.12.405" />
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-    <PackageReference Include="FluentValidation" Version="10.3.4" />
-    <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
-    <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
-	<PackageReference Include="IdentityModel" Version="4.4.0" />
-    <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
-    <PackageReference Include="Microsoft.FeatureManagement" Version="3.2.0" />
-    <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.14.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.1" />
-    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
-    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.5.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
-    <PackageReference Include="MK.IO" Version="1.6.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
-  </ItemGroup>
+	<ItemGroup>
+		<Content Include="node_modules\%40ckeditor\ckeditor5-build-classic\package.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-core\lang\contexts.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-core\package.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-engine\package.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-engine\theme\placeholder.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-heading\lang\contexts.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-heading\package.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-heading\theme\heading.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-paragraph\package.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\lang\contexts.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\package.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\button\button.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\button\switchbutton.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\colorgrid\colorgrid.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\dropdown.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\listdropdown.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\splitbutton.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\toolbardropdown.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\editorui\editorui.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\icon\icon.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\inputtext\inputtext.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\labeledinput\labeledinput.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\label\label.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\list\list.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\balloonpanel.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\balloonrotator.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\fakepanel.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\stickypanel.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\toolbar\blocktoolbar.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\toolbar\toolbar.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\tooltip\mixins\_tooltip.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\tooltip\tooltip.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\globals.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\_hidden.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\_reset.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\_zindex.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\mixins\_dir.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\mixins\_rwd.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\mixins\_unselectable.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-utils\package.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-vue\package.json" />
+	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
+		<PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
+		<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
+		<PackageReference Include="BuildWebCompiler" Version="1.12.405" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="FluentValidation" Version="10.3.4" />
+		<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
+		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
+		<PackageReference Include="IdentityModel" Version="4.4.0" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
+		<PackageReference Include="Microsoft.FeatureManagement" Version="3.2.0" />
+		<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.2.0" />
+		<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
+		<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.14.1" />
+		<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.1" />
+		<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
+		<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.5.2">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
+		<PackageReference Include="MK.IO" Version="1.6.0" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
+		<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-    <Folder Include="Scripts\vuesrc\content\upload\" />
-    <Folder Include="Scripts\vuesrc\helpers\" />
-	 <Folder Include="wwwroot\lib\fontawesome-free-6.4.2-web\" />
-  </ItemGroup>
 
+	<ItemGroup>
+		<Folder Include="Properties\" />
+		<Folder Include="Scripts\vuesrc\content\upload\" />
+		<Folder Include="Scripts\vuesrc\helpers\" />
+		<Folder Include="wwwroot\lib\fontawesome-free-6.4.2-web\" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Include="bundleconfig.json" />
-    <None Include="compilerconfig.json" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\ckeditor.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\ckeditor.js.map" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\af.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ar.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ast.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\az.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\bg.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ca.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\cs.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\da.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\de-ch.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\de.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\el.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\en-au.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\en-gb.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\eo.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\es.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\et.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\eu.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\fa.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\fi.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\fr.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\gl.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\gu.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\he.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\hr.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\hu.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\id.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\it.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ja.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\km.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\kn.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ko.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ku.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\lt.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\lv.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ms.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\nb.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ne.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\nl.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\no.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\oc.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\pl.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\pt-br.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\pt.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ro.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ru.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\si.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sk.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sl.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sq.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sr-latn.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sr.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sv.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\tr.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\tt.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ug.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\uk.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\vi.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\zh-cn.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\zh.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\README.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\af.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ar.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ast.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\az.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\bg.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ca.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\cs.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\da.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\de.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\el.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\en-au.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\en-gb.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\en.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\eo.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\es.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\et.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\eu.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\fa.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\fi.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\fr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\gl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\he.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\hr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\hu.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\id.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\it.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ja.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\km.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\kn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ko.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ku.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\lt.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\lv.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\nb.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ne.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\nl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\no.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\oc.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\pl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\pt-br.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\pt.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ro.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ru.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sk.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sq.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sr-latn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sv.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\tr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\tt.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ug.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\uk.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\vi.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\zh-cn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\zh.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\README.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\command.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\commandcollection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editingkeystrokehandler.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editor.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editorconfig.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editorui.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editorwithui.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\attachtoform.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\dataapimixin.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\elementapimixin.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\securesourceelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\multicommand.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\pendingactions.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\plugin.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\plugincollection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\cancel.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\check.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\eraser.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\image.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\low-vision.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-center.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-full-width.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-left.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-right.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\pencil.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\pilcrow.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\quote.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\three-vertical-dots.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\README.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\controller\datacontroller.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\controller\editingcontroller.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\conversion.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\conversionhelpers.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\downcastdispatcher.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\downcasthelpers.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\mapper.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\modelconsumable.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\upcastdispatcher.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\upcasthelpers.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\viewconsumable.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\basichtmlwriter.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\dataprocessor.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\htmldataprocessor.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\htmlwriter.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\xmldataprocessor.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\model.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\operationreplayer.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\utils.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\view.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\batch.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\differ.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\document.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\documentfragment.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\documentselection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\element.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\history.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\item.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\liveposition.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\liverange.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\markercollection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\model.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\node.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\nodelist.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\attributeoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\detachoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\insertoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\markeroperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\mergeoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\moveoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\nooperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\operation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\operationfactory.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\renameoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\rootattributeoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\splitoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\transform.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\utils.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\position.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\range.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\rootelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\schema.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\selection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\text.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\textproxy.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\treewalker.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\deletecontent.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\getselectedcontent.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\insertcontent.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\modifyselection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\selection-post-fixer.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\writer.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\utils\bindtwostepcarettoattribute.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\attributeelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\containerelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\document.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\documentfragment.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\documentselection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\domconverter.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\downcastwriter.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\editableelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\element.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\elementdefinition.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\emptyelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\filler.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\item.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\matcher.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\node.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\clickobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\compositionobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\domeventdata.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\domeventobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\fakeselectionobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\focusobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\inputobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\keyobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\mouseobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\mutationobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\observer.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\selectionobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\placeholder.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\position.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\range.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\renderer.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\rooteditableelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\selection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\text.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\textproxy.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\treewalker.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\uielement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\upcastwriter.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\view.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ar.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\az.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\bg.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ca.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\cs.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\da.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\de.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\el.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\en-au.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\en-gb.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\en.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\eo.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\es.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\et.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\eu.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\fa.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\fi.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\fr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\gl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\he.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\hr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\hu.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\id.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\it.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ja.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\km.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\kn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ko.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ku.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\lt.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\lv.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\nb.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ne.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\nl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\no.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\pl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\pt-br.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\pt.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ro.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ru.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sk.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sq.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sr-latn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sv.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\tr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ug.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\uk.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\vi.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\zh-cn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\zh.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\README.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\src\heading.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingbuttonsui.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingcommand.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingediting.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingui.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\src\title.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\src\utils.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading1.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading2.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading3.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading4.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading5.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading6.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-paragraph\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-paragraph\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-paragraph\README.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-paragraph\src\paragraph.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-paragraph\src\paragraphbuttonui.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-paragraph\src\paragraphcommand.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-paragraph\theme\icons\paragraph.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ar.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ast.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\az.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\cs.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\da.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\de-ch.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\de.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\el.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\en-au.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\en-gb.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\en.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\eo.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\es.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\et.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\eu.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\fa.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\fi.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\fr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\gl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\he.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\hr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\hu.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\id.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\it.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ja.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\km.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\kn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ku.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\lt.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\lv.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\nb.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ne.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\nl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\no.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\pl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\pt-br.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\pt.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ro.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ru.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sk.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sq.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sr-latn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sv.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\tr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ug.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\uk.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\vi.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\zh-cn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\zh.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\README.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\bindings\clickoutsidehandler.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\bindings\preventdefault.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\bindings\submithandler.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\button\button.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\button\buttonview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\button\switchbuttonview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\colorgrid\colorgridview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\colorgrid\colortileview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\componentfactory.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\button\dropdownbutton.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\button\dropdownbuttonview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\button\splitbuttonview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\dropdownpanelfocusable.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\dropdownpanelview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\dropdownview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\utils.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editableui\editableuiview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editableui\inline\inlineeditableuiview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editorui\boxed\boxededitoruiview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editorui\editoruiview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\focuscycler.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\icon\iconview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\iframe\iframeview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\inputtext\inputtextview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\labeledinput\labeledinputview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\label\labelview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\list\listitemview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\list\listseparatorview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\list\listview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\model.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\notification\notification.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\panel\balloon\balloonpanelview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\panel\balloon\contextualballoon.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\panel\sticky\stickypanelview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\template.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\balloon\balloontoolbar.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\block\blockbuttonview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\block\blocktoolbar.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\enabletoolbarkeyboardfocus.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\normalizetoolbarconfig.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\toolbarseparatorview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\toolbarview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\tooltip\tooltipview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\view.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\viewcollection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\color-tile-check.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\dropdown-arrow.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\next-arrow.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\previous-arrow.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\README.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\areconnectedthroughproperties.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\ckeditorerror.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\collection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\comparearrays.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\config.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\count.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\diff.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\difftochanges.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\createelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\emittermixin.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getancestors.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getborderwidths.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getcommonancestor.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getdatafromelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getpositionedancestor.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getresizeobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\global.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\indexof.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\insertat.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\isnode.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\isrange.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\istext.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\iswindow.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\position.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\rect.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\remove.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\scroll.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\setdatainelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\tounit.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\elementreplacer.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\emittermixin.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\env.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\eventinfo.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\fastdiff.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\first.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\focustracker.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\isiterable.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\keyboard.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\keystrokehandler.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\locale.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\mapsequal.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\mix.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\nth.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\objecttomap.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\observablemixin.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\priorities.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\spy.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\tomap.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\translation-service.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\uid.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\unicode.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\version.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-vue\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-vue\dist\ckeditor.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-vue\dist\ckeditor.js.map" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-vue\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-vue\README.md" />
-    <None Include="Scripts\vuesrc\content-structure\contentStructureContainer.ts" />
-    <None Include="Scripts\vuesrc\content-structure\contentStructureRouter.ts" />
-    <None Include="Scripts\vuesrc\content\contentRouter.ts" />
-    <None Include="Scripts\vuesrc\content\contentContainer.ts" />
-    <None Include="Scripts\vuesrc\content\contentPageListContainer.ts" />
-    <None Include="Scripts\vuesrc\home\home.ts" />
-    <None Include="Views\ExternalSystem\Index.cshtml" />
-  </ItemGroup>
 
+	<ItemGroup>
+		<None Include="bundleconfig.json" />
+		<None Include="compilerconfig.json" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\ckeditor.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\ckeditor.js.map" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\af.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ar.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ast.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\az.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\bg.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ca.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\cs.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\da.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\de-ch.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\de.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\el.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\en-au.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\en-gb.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\eo.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\es.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\et.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\eu.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\fa.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\fi.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\fr.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\gl.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\gu.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\he.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\hr.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\hu.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\id.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\it.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ja.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\km.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\kn.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ko.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ku.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\lt.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\lv.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ms.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\nb.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ne.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\nl.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\no.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\oc.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\pl.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\pt-br.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\pt.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ro.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ru.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\si.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sk.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sl.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sq.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sr-latn.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sr.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sv.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\tr.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\tt.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ug.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\uk.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\vi.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\zh-cn.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\zh.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\README.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\af.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ar.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ast.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\az.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\bg.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ca.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\cs.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\da.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\de.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\el.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\en-au.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\en-gb.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\en.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\eo.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\es.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\et.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\eu.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\fa.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\fi.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\fr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\gl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\he.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\hr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\hu.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\id.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\it.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ja.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\km.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\kn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ko.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ku.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\lt.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\lv.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\nb.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ne.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\nl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\no.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\oc.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\pl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\pt-br.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\pt.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ro.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ru.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sk.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sq.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sr-latn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sv.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\tr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\tt.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ug.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\uk.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\vi.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\zh-cn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\zh.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\README.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\command.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\commandcollection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editingkeystrokehandler.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editor.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editorconfig.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editorui.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editorwithui.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\attachtoform.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\dataapimixin.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\elementapimixin.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\securesourceelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\multicommand.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\pendingactions.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\plugin.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\plugincollection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\cancel.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\check.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\eraser.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\image.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\low-vision.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-center.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-full-width.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-left.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-right.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\pencil.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\pilcrow.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\quote.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\three-vertical-dots.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\README.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\controller\datacontroller.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\controller\editingcontroller.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\conversion.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\conversionhelpers.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\downcastdispatcher.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\downcasthelpers.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\mapper.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\modelconsumable.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\upcastdispatcher.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\upcasthelpers.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\viewconsumable.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\basichtmlwriter.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\dataprocessor.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\htmldataprocessor.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\htmlwriter.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\xmldataprocessor.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\model.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\operationreplayer.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\utils.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\view.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\batch.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\differ.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\document.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\documentfragment.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\documentselection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\element.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\history.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\item.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\liveposition.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\liverange.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\markercollection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\model.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\node.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\nodelist.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\attributeoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\detachoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\insertoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\markeroperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\mergeoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\moveoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\nooperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\operation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\operationfactory.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\renameoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\rootattributeoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\splitoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\transform.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\utils.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\position.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\range.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\rootelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\schema.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\selection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\text.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\textproxy.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\treewalker.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\deletecontent.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\getselectedcontent.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\insertcontent.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\modifyselection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\selection-post-fixer.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\writer.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\utils\bindtwostepcarettoattribute.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\attributeelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\containerelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\document.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\documentfragment.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\documentselection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\domconverter.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\downcastwriter.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\editableelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\element.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\elementdefinition.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\emptyelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\filler.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\item.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\matcher.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\node.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\clickobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\compositionobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\domeventdata.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\domeventobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\fakeselectionobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\focusobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\inputobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\keyobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\mouseobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\mutationobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\observer.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\selectionobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\placeholder.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\position.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\range.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\renderer.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\rooteditableelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\selection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\text.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\textproxy.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\treewalker.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\uielement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\upcastwriter.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\view.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ar.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\az.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\bg.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ca.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\cs.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\da.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\de.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\el.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\en-au.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\en-gb.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\en.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\eo.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\es.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\et.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\eu.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\fa.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\fi.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\fr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\gl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\he.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\hr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\hu.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\id.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\it.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ja.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\km.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\kn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ko.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ku.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\lt.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\lv.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\nb.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ne.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\nl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\no.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\pl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\pt-br.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\pt.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ro.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ru.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sk.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sq.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sr-latn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sv.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\tr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ug.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\uk.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\vi.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\zh-cn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\zh.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\README.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\src\heading.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingbuttonsui.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingcommand.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingediting.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingui.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\src\title.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\src\utils.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading1.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading2.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading3.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading4.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading5.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading6.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-paragraph\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-paragraph\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-paragraph\README.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-paragraph\src\paragraph.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-paragraph\src\paragraphbuttonui.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-paragraph\src\paragraphcommand.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-paragraph\theme\icons\paragraph.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ar.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ast.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\az.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\cs.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\da.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\de-ch.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\de.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\el.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\en-au.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\en-gb.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\en.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\eo.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\es.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\et.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\eu.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\fa.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\fi.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\fr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\gl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\he.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\hr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\hu.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\id.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\it.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ja.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\km.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\kn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ku.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\lt.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\lv.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\nb.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ne.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\nl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\no.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\pl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\pt-br.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\pt.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ro.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ru.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sk.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sq.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sr-latn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sv.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\tr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ug.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\uk.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\vi.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\zh-cn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\zh.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\README.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\bindings\clickoutsidehandler.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\bindings\preventdefault.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\bindings\submithandler.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\button\button.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\button\buttonview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\button\switchbuttonview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\colorgrid\colorgridview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\colorgrid\colortileview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\componentfactory.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\button\dropdownbutton.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\button\dropdownbuttonview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\button\splitbuttonview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\dropdownpanelfocusable.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\dropdownpanelview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\dropdownview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\utils.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editableui\editableuiview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editableui\inline\inlineeditableuiview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editorui\boxed\boxededitoruiview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editorui\editoruiview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\focuscycler.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\icon\iconview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\iframe\iframeview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\inputtext\inputtextview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\labeledinput\labeledinputview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\label\labelview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\list\listitemview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\list\listseparatorview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\list\listview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\model.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\notification\notification.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\panel\balloon\balloonpanelview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\panel\balloon\contextualballoon.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\panel\sticky\stickypanelview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\template.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\balloon\balloontoolbar.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\block\blockbuttonview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\block\blocktoolbar.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\enabletoolbarkeyboardfocus.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\normalizetoolbarconfig.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\toolbarseparatorview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\toolbarview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\tooltip\tooltipview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\view.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\viewcollection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\color-tile-check.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\dropdown-arrow.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\next-arrow.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\previous-arrow.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\README.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\areconnectedthroughproperties.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\ckeditorerror.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\collection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\comparearrays.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\config.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\count.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\diff.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\difftochanges.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\createelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\emittermixin.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getancestors.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getborderwidths.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getcommonancestor.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getdatafromelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getpositionedancestor.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getresizeobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\global.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\indexof.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\insertat.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\isnode.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\isrange.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\istext.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\iswindow.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\position.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\rect.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\remove.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\scroll.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\setdatainelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\tounit.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\elementreplacer.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\emittermixin.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\env.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\eventinfo.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\fastdiff.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\first.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\focustracker.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\isiterable.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\keyboard.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\keystrokehandler.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\locale.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\mapsequal.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\mix.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\nth.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\objecttomap.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\observablemixin.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\priorities.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\spy.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\tomap.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\translation-service.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\uid.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\unicode.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\version.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-vue\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-vue\dist\ckeditor.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-vue\dist\ckeditor.js.map" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-vue\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-vue\README.md" />
+		<None Include="Scripts\vuesrc\content-structure\contentStructureContainer.ts" />
+		<None Include="Scripts\vuesrc\content-structure\contentStructureRouter.ts" />
+		<None Include="Scripts\vuesrc\content\contentRouter.ts" />
+		<None Include="Scripts\vuesrc\content\contentContainer.ts" />
+		<None Include="Scripts\vuesrc\content\contentPageListContainer.ts" />
+		<None Include="Scripts\vuesrc\home\home.ts" />
+		<None Include="Views\ExternalSystem\Index.cshtml" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Content Update="NLog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
 
+	<ItemGroup>
+		<Content Update="NLog.config">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+
+
+	<ProjectExtensions>
+		<VisualStudio>
+			<UserProperties appsettings_1json__JsonSchema="" />
+		</VisualStudio>
+	</ProjectExtensions>
 
-  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
 
 
-  
 
 </Project>
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs b/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
index 5517fa636..99e425d86 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
@@ -141,6 +141,7 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
 
             services.AddTransient<CookieEventHandler>();
             services.AddSingleton<LogoutUserManager>();
+            services.AddSingleton<VersionService>();
 
             services.AddAuthentication(options =>
             {
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Services/VersionService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Services/VersionService.cs
new file mode 100644
index 000000000..45361c052
--- /dev/null
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Services/VersionService.cs
@@ -0,0 +1,18 @@
+namespace LearningHub.Nhs.AdminUI.Services
+{
+    /// <summary>
+    /// Defines the <see cref="VersionService" />.
+    /// </summary>
+    public class VersionService
+    {
+        /// <summary>
+        /// The GetVersion.
+        /// </summary>
+        /// <returns>The <see cref="string"/>.</returns>
+        public string GetVersion()
+        {
+            var version = typeof(Program).Assembly.GetName().Version;
+            return $"{version?.Major}.{version?.Minor}.{version?.Build}";
+        }
+    }
+}
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/ViewComponents/VersionViewComponent.cs b/AdminUI/LearningHub.Nhs.AdminUI/ViewComponents/VersionViewComponent.cs
new file mode 100644
index 000000000..db857b6ce
--- /dev/null
+++ b/AdminUI/LearningHub.Nhs.AdminUI/ViewComponents/VersionViewComponent.cs
@@ -0,0 +1,34 @@
+namespace LearningHub.Nhs.AdminUI.ViewComponents
+{
+    using LearningHub.Nhs.AdminUI.Services;
+    using Microsoft.AspNetCore.Html;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.ViewComponents;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="VersionViewComponent"/> class.
+    /// </summary>
+    public class VersionViewComponent : ViewComponent
+    {
+        private readonly VersionService versionService;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VersionViewComponent"/> class.
+        /// </summary>
+        /// <param name="versionService">.</param>
+        public VersionViewComponent(VersionService versionService)
+        {
+            this.versionService = versionService;
+        }
+
+        /// <summary>
+        /// The Invoke.
+        /// </summary>
+        /// <returns>A representing the result of the synchronous operation.</returns>
+        public IViewComponentResult Invoke()
+        {
+            var version = this.versionService.GetVersion();
+            return new HtmlContentViewComponentResult(new HtmlString($"<!-- Version: {version} -->"));
+        }
+    }
+}
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_Layout.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_Layout.cshtml
index 3f972659a..e591bf6b5 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_Layout.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_Layout.cshtml
@@ -2,83 +2,84 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>@ViewData["Title"] - Learning Hub Administration</title>
-  <link rel="apple-touch-icon" sizes="180x180" href="~/apple-touch-icon.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="~/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="~/favicon-16x16.png">
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - Learning Hub Administration</title>
+    <link rel="apple-touch-icon" sizes="180x180" href="~/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="~/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="~/favicon-16x16.png">
 
-  <environment include="Development">
+    <environment include="Development">
 
-    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
-    <link rel="stylesheet" type="text/css" href="~/lib/fontawesome-free-6.4.2-web/css/all.css"/>
-  </environment>
-  <environment exclude="Development">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.1.3/css/bootstrap.min.css"
-          asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
-          asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute"
-          crossorigin="anonymous"
-          integrity="sha256-eSi1q2PG6J7g7ib17yAaWMcrr5GrtohYChqibrV7PBE=" />
-    <link rel="stylesheet" type="text/css" href="~/lib/fontawesome-free-6.4.2-web/css/all.min.css" />
-  </environment>
-  <link rel="stylesheet" type="text/css" href="~/css/site.css" asp-append-version="true"/>
-  <link rel="stylesheet" type="text/css" href="~/css/nhsuk/common.css"/>
-  @RenderSection("Styles", required: false)
-  @await Html.PartialAsync("_GoogleAnalytics")
-  <partial name="~/Views/Shared/_TimezoneInfoScriptPartial.cshtml" />
+        <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
+        <link rel="stylesheet" type="text/css" href="~/lib/fontawesome-free-6.4.2-web/css/all.css" />
+    </environment>
+    <environment exclude="Development">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.1.3/css/bootstrap.min.css"
+              asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
+              asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute"
+              crossorigin="anonymous"
+              integrity="sha256-eSi1q2PG6J7g7ib17yAaWMcrr5GrtohYChqibrV7PBE=" />
+        <link rel="stylesheet" type="text/css" href="~/lib/fontawesome-free-6.4.2-web/css/all.min.css" />
+    </environment>
+    <link rel="stylesheet" type="text/css" href="~/css/site.css" asp-append-version="true" />
+    <link rel="stylesheet" type="text/css" href="~/css/nhsuk/common.css" />
+    @RenderSection("Styles", required: false)
+    @await Html.PartialAsync("_GoogleAnalytics")
+    <partial name="~/Views/Shared/_TimezoneInfoScriptPartial.cshtml" />
 </head>
 <body>
-  <header role="banner" id="header">
-    <partial name="~/Views/Shared/_NavPartial.cshtml" />
-  </header>
-  <div class="container-fluid">
-    <!--<partial name="_CookieConsentPartial" />-->
-    <main role="main" id="maincontent" tabindex="-1">
-      @{
-        var mainWidth = IsSectionDefined("SideMenu") ? "col-sm-9 col-lg-9 col-xl-10 pageWithMenu" : "col-sm-12";
-      }
-      <div class="row">
-        @if (IsSectionDefined("SideMenu"))
-        {
-          <div class="col-sm-3 col-lg-3 col-xl-2 side-menu">
-            @RenderSection("SideMenu", required: false)
-          </div>
-        }
-        <div class="@mainWidth">
-          @RenderBody()
-        </div>
-      </div>
-    </main>
-  </div>
-  <footer class="border-top footer text-muted">
-    <partial name="~/Views/Shared/_FooterPartial.cshtml" />
-  </footer>
+    <header role="banner" id="header">
+        <partial name="~/Views/Shared/_NavPartial.cshtml" />
+    </header>
+    <div class="container-fluid">
+        <!--<partial name="_CookieConsentPartial" />-->
+        <main role="main" id="maincontent" tabindex="-1">
+            @{
+                var mainWidth = IsSectionDefined("SideMenu") ? "col-sm-9 col-lg-9 col-xl-10 pageWithMenu" : "col-sm-12";
+            }
+            <div class="row">
+                @if (IsSectionDefined("SideMenu"))
+                {
+                    <div class="col-sm-3 col-lg-3 col-xl-2 side-menu">
+                        @RenderSection("SideMenu", required: false)
+                    </div>
+                }
+                <div class="@mainWidth">
+                    @RenderBody()
+                </div>
+            </div>
+        </main>
+    </div>
+    <footer class="border-top footer text-muted">
+        <partial name="~/Views/Shared/_FooterPartial.cshtml" />
+    </footer>
 
-  <environment include="Development">
-    <script src="~/lib/jquery/dist/jquery.js"></script>
-    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.js"></script>
-    <script src="~/lib/ckeditor/ckeditor.js"></script>
-  </environment>
-  <environment exclude="Development">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"
-            asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
-            asp-fallback-test="window.jQuery"
-            crossorigin="anonymous"
-            integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=">
-    </script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.1.3/js/bootstrap.bundle.min.js"
-            asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"
-            asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
-            crossorigin="anonymous"
-            integrity="sha256-E/V4cWE4qvAeO5MOhjtGtqDzPndRO1LBk8lJ/PR7CA4=">
-    </script>
-    <script src="~/lib/ckeditor/ckeditor.js"></script>
-    @*<script type="text/javascript" src="~/js/site.min.js"></script>*@
-  </environment>
-  @*<script type="text/javascript" src="~/js/bundle/header.js"></script>*@
-  <partial name="~/Views/Shared/_ValidationScriptsPartial.cshtml" />
-  @RenderSection("Scripts", required: false)
+    <environment include="Development">
+        <script src="~/lib/jquery/dist/jquery.js"></script>
+        <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.js"></script>
+        <script src="~/lib/ckeditor/ckeditor.js"></script>
+    </environment>
+    <environment exclude="Development">
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"
+                asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
+                asp-fallback-test="window.jQuery"
+                crossorigin="anonymous"
+                integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=">
+        </script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.1.3/js/bootstrap.bundle.min.js"
+                asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"
+                asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
+                crossorigin="anonymous"
+                integrity="sha256-E/V4cWE4qvAeO5MOhjtGtqDzPndRO1LBk8lJ/PR7CA4=">
+        </script>
+        <script src="~/lib/ckeditor/ckeditor.js"></script>
+        @*<script type="text/javascript" src="~/js/site.min.js"></script>*@
+    </environment>
+    @*<script type="text/javascript" src="~/js/bundle/header.js"></script>*@
+    <partial name="~/Views/Shared/_ValidationScriptsPartial.cshtml" />
+    @RenderSection("Scripts", required: false)
 </body>
 </html>
+@await Component.InvokeAsync("Version")
 <!-- Build number: @settings.Value.BuildNumber -->
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index aff1954b5..6f31cc500 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -2,11 +2,14 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
-		<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>  
+		<AssemblyVersion>1.0.0.0</AssemblyVersion>
+		<FileVersion>1.0.0.0</FileVersion>
+		<Version>1.0.0</Version>
+		<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
 		<UserSecretsId>a2ecb5d2-cf13-4551-9cb6-3d86dfbcf8ef</UserSecretsId>
 		<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <Platforms>x64</Platforms>
+		<Platforms>x64</Platforms>
 		<GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile>
 	</PropertyGroup>
 
@@ -104,7 +107,7 @@
 		<PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
 		<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
-        <PackageReference Include="GDS.MultiPageFormData" Version="1.0.5" />
+		<PackageReference Include="GDS.MultiPageFormData" Version="1.0.5" />
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
 		<PackageReference Include="IdentityModel" Version="4.3.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
@@ -175,72 +178,76 @@
 		<TypeScriptCompile Include="Scripts\vuesrc\resource\helpers\resourceHelper.ts" />
 	</ItemGroup>
 
-<ItemGroup>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\activeContentModel.ts">
-	<SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\articleModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\audioModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\content-structure\editModeEnum.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\content-structure\nodeContentAdminModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\content-structure\nodeContentBrowseModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\content-structure\nodeContentEditorModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\fileModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\genericFileModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\imageModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\interactionQueueModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\mylearning\activityDetailedItemModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\mylearning\activityDetailedModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\mylearning\myLearningRequestModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\mylearning\playedSegmentModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\ratingModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\ratingSummaryBasicModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\ratingSummaryModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\userBasicModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\videoModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-  <TypeScriptCompile Update="Scripts\vuesrc\models\webLinkModel.ts">
-    <SubType>Code</SubType>
-  </TypeScriptCompile>
-</ItemGroup>
+	<ItemGroup>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\activeContentModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\articleModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\audioModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\content-structure\editModeEnum.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\content-structure\nodeContentAdminModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\content-structure\nodeContentBrowseModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\content-structure\nodeContentEditorModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\fileModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\genericFileModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\imageModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\interactionQueueModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\mylearning\activityDetailedItemModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\mylearning\activityDetailedModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\mylearning\myLearningRequestModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\mylearning\playedSegmentModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\ratingModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\ratingSummaryBasicModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\ratingSummaryModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\userBasicModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\videoModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+		<TypeScriptCompile Update="Scripts\vuesrc\models\webLinkModel.ts">
+			<SubType>Code</SubType>
+		</TypeScriptCompile>
+	</ItemGroup>
 
-<ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
+	<ProjectExtensions>
+		<VisualStudio>
+			<UserProperties appsettings_1json__JsonSchema="" />
+		</VisualStudio>
+	</ProjectExtensions>
 
 </Project>
diff --git a/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs b/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs
index dad5f5001..f38503701 100644
--- a/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs
+++ b/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs
@@ -10,6 +10,7 @@
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.EventSource;
     using LearningHub.Nhs.WebUI.Handlers;
+    using LearningHub.Nhs.WebUI.Services;
     using LearningHub.Nhs.WebUI.Startup;
     using Microsoft.ApplicationInsights.Extensibility.EventCounterCollector;
     using Microsoft.AspNetCore.Builder;
@@ -88,6 +89,7 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
                 .Get<LearningHubAuthServiceConfig>();
             services.AddTransient<CookieEventHandler>();
             services.AddSingleton<LogoutUserManager>();
+            services.AddSingleton<VersionService>();
 
             services.ConfigureAuthentication(learningHubAuthSvcConf);
 
diff --git a/LearningHub.Nhs.WebUI/Services/VersionService.cs b/LearningHub.Nhs.WebUI/Services/VersionService.cs
new file mode 100644
index 000000000..b7f170a88
--- /dev/null
+++ b/LearningHub.Nhs.WebUI/Services/VersionService.cs
@@ -0,0 +1,18 @@
+namespace LearningHub.Nhs.WebUI.Services
+{
+    /// <summary>
+    /// Defines the <see cref="VersionService" />.
+    /// </summary>
+    public class VersionService
+    {
+        /// <summary>
+        /// The GetVersion.
+        /// </summary>
+        /// <returns>The <see cref="string"/>.</returns>
+        public string GetVersion()
+        {
+            var version = typeof(Program).Assembly.GetName().Version;
+            return $"{version?.Major}.{version?.Minor}.{version?.Build}";
+        }
+    }
+}
diff --git a/LearningHub.Nhs.WebUI/ViewComponents/VersionViewComponent.cs b/LearningHub.Nhs.WebUI/ViewComponents/VersionViewComponent.cs
new file mode 100644
index 000000000..2f119c184
--- /dev/null
+++ b/LearningHub.Nhs.WebUI/ViewComponents/VersionViewComponent.cs
@@ -0,0 +1,34 @@
+namespace LearningHub.Nhs.WebUI.ViewComponents
+{
+    using LearningHub.Nhs.WebUI.Services;
+    using Microsoft.AspNetCore.Html;
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.AspNetCore.Mvc.ViewComponents;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="VersionViewComponent"/> class.
+    /// </summary>
+    public class VersionViewComponent : ViewComponent
+    {
+        private readonly VersionService versionService;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VersionViewComponent"/> class.
+        /// </summary>
+        /// <param name="versionService">.</param>
+        public VersionViewComponent(VersionService versionService)
+        {
+            this.versionService = versionService;
+        }
+
+        /// <summary>
+        /// The Invoke.
+        /// </summary>
+        /// <returns>A representing the result of the synchronous operation.</returns>
+        public IViewComponentResult Invoke()
+        {
+            var version = this.versionService.GetVersion();
+            return new HtmlContentViewComponentResult(new HtmlString($"<!-- Version: {version} -->"));
+        }
+    }
+}
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
index a0aa46f2a..be91cb3cb 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
@@ -148,10 +148,12 @@
     <partial name="~/Views/Shared/_JavascriptDetectorPartial.cshtml" />
     <partial name="~/Views/Shared/_SupportUrlsScriptPartial.cshtml" />
     @RenderSection("Scripts", required: false)
+
     <script type="text/javascript" src="~/js/mkplayer-ui-custom.js" asp-append-version="true"></script>
 
 </body>
 </html>
+@await Component.InvokeAsync("Version")
 <!-- Build number: @settings.Value.BuildNumber -->
 @functions {
     public async Task<bool> DisplayOffline()
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
index 24bfc4239..959a3e17f 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
@@ -1,47 +1,50 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <GenerateDocumentationFile>False</GenerateDocumentationFile>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <CodeAnalysisRuleSet />
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <CodeAnalysisRuleSet />
-  </PropertyGroup>
-
-  <ItemGroup>
-   
-    <PackageReference Include="LearningHub.Nhs.Models" Version="2.1.12" />
-   
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
-   
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
-   
-    <PackageReference Include="NLog.Web.AspNetCore" Version="5.1.4" />
-   
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\LearningHub.Nhs.ReportApi.Services.Interface\LearningHub.Nhs.ReportApi.Services.Interface.csproj" />
-    <ProjectReference Include="..\LearningHub.Nhs.ReportApi.Services\LearningHub.Nhs.ReportApi.Services.csproj" />
-    <ProjectReference Include="..\LearningHub.Nhs.ReportApi.Shared\LearningHub.Nhs.ReportApi.Shared.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="LearningHub.Nhs.ReportApi.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
-  </ItemGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<AssemblyVersion>1.0.0.0</AssemblyVersion>
+		<FileVersion>1.0.0.0</FileVersion>
+		<Version>1.0.0</Version>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<GenerateDocumentationFile>False</GenerateDocumentationFile>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<CodeAnalysisRuleSet />
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<CodeAnalysisRuleSet />
+	</PropertyGroup>
+
+	<ItemGroup>
+
+		<PackageReference Include="LearningHub.Nhs.Models" Version="2.1.12" />
+
+		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
+
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
+
+		<PackageReference Include="NLog.Web.AspNetCore" Version="5.1.4" />
+
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\LearningHub.Nhs.ReportApi.Services.Interface\LearningHub.Nhs.ReportApi.Services.Interface.csproj" />
+		<ProjectReference Include="..\LearningHub.Nhs.ReportApi.Services\LearningHub.Nhs.ReportApi.Services.csproj" />
+		<ProjectReference Include="..\LearningHub.Nhs.ReportApi.Shared\LearningHub.Nhs.ReportApi.Shared.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Update="LearningHub.Nhs.ReportApi.xml">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+	</ItemGroup>
 
 </Project>
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi/ServiceCollectionExtension.cs b/ReportAPI/LearningHub.Nhs.ReportApi/ServiceCollectionExtension.cs
index 82f3fbf0e..d01574338 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi/ServiceCollectionExtension.cs
+++ b/ReportAPI/LearningHub.Nhs.ReportApi/ServiceCollectionExtension.cs
@@ -39,11 +39,13 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
 
             var swaggerTitle = configuration["Swagger:Title"];
             var swaggerVersion = configuration["Swagger:Version"];
-            var swaggerDescription = $"Build Number: {configuration["Swagger:BuildNumber"]}";
+            var swaggerDescription = "This is the API documentation for version ";
 
             services.AddSwaggerGen(c =>
             {
-                c.SwaggerDoc(swaggerTitle, new OpenApiInfo { Title = swaggerTitle, Version = swaggerVersion, Description = swaggerDescription });
+                var version = typeof(Program).Assembly.GetName().Version;
+                var versionString = $"{version?.Major}.{version?.Minor}.{version?.Build}";
+                c.SwaggerDoc(swaggerTitle, new OpenApiInfo { Title = swaggerTitle, Version = swaggerVersion, Description = $"{swaggerDescription}{versionString}" });
                 c.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, $"{Assembly.GetExecutingAssembly().GetName().Name}.XML"));
                 c.CustomSchemaIds(type => type.ToString());
             });
diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
index 7f7061f15..ae746d2e0 100644
--- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
+++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
@@ -1,63 +1,70 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    <UserSecretsId>234b55ad-984b-47ae-9d7a-71e372e6ded7</UserSecretsId>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-	<Platforms>x64</Platforms>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>LearningHub.Nhs.Api.xml</DocumentationFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Remove="nlog.config" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="nlog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-	<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-	<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-	<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
-	<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
-	<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
-	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
-		<PrivateAssets>all</PrivateAssets>
-		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-	</PackageReference>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
-	<PackageReference Update="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\LearningHub.Nhs.Api.Shared\LearningHub.Nhs.Api.Shared.csproj" />
-    <ProjectReference Include="..\MigrationTool\LearningHub.Nhs.Migration.Staging.Repository\LearningHub.Nhs.Migration.Staging.Repository.csproj" />
-    <ProjectReference Include="..\MigrationTool\LearningHub.Nhs.Migration\LearningHub.Nhs.Migration.csproj" />
-    <ProjectReference Include="..\LearningHub.Nhs.Repository.Interface\LearningHub.Nhs.Repository.Interface.csproj" />
-    <ProjectReference Include="..\LearningHub.Nhs.Repository\LearningHub.Nhs.Repository.csproj" />
-    <ProjectReference Include="..\LearningHub.Nhs.Services.Interface\LearningHub.Nhs.Services.Interface.csproj" />
-    <ProjectReference Include="..\LearningHub.Nhs.Services\LearningHub.Nhs.Services.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <WCFMetadata Include="Connected Services" />
-  </ItemGroup>
-
-  <ProjectExtensions><VisualStudio><UserProperties appsettings_1development_1json__JsonSchema="https://datahubproject.io/schemas/datahub_ingestion_schema.json" appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<AssemblyVersion>1.0.0.0</AssemblyVersion>
+		<FileVersion>1.0.0.0</FileVersion>
+		<Version>1.0.0</Version>
+		<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+		<UserSecretsId>234b55ad-984b-47ae-9d7a-71e372e6ded7</UserSecretsId>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<Platforms>x64</Platforms>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DocumentationFile>LearningHub.Nhs.Api.xml</DocumentationFile>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Content Remove="nlog.config" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Include="nlog.config">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
+		<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
+		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
+		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
+		<PackageReference Update="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\LearningHub.Nhs.Api.Shared\LearningHub.Nhs.Api.Shared.csproj" />
+		<ProjectReference Include="..\MigrationTool\LearningHub.Nhs.Migration.Staging.Repository\LearningHub.Nhs.Migration.Staging.Repository.csproj" />
+		<ProjectReference Include="..\MigrationTool\LearningHub.Nhs.Migration\LearningHub.Nhs.Migration.csproj" />
+		<ProjectReference Include="..\LearningHub.Nhs.Repository.Interface\LearningHub.Nhs.Repository.Interface.csproj" />
+		<ProjectReference Include="..\LearningHub.Nhs.Repository\LearningHub.Nhs.Repository.csproj" />
+		<ProjectReference Include="..\LearningHub.Nhs.Services.Interface\LearningHub.Nhs.Services.Interface.csproj" />
+		<ProjectReference Include="..\LearningHub.Nhs.Services\LearningHub.Nhs.Services.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<WCFMetadata Include="Connected Services" />
+	</ItemGroup>
+
+	<ProjectExtensions>
+		<VisualStudio>
+			<UserProperties appsettings_1development_1json__JsonSchema="https://datahubproject.io/schemas/datahub_ingestion_schema.json" appsettings_1json__JsonSchema="" />
+		</VisualStudio>
+	</ProjectExtensions>
 
 </Project>
diff --git a/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs b/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs
index 528533f0d..9c8229639 100644
--- a/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs
+++ b/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs
@@ -64,11 +64,12 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
 
             var swaggerTitle = configuration["Swagger:Title"];
             var swaggerVersion = configuration["Swagger:Version"];
-            var swaggerDescription = $"Build Number: {configuration["Swagger:BuildNumber"]}";
-
+            var swaggerDescription = "This is the API documentation for version ";
             services.AddSwaggerGen(c =>
             {
-                c.SwaggerDoc(swaggerTitle, new OpenApiInfo { Title = swaggerTitle, Version = swaggerVersion, Description = swaggerDescription });
+                var version = typeof(Program).Assembly.GetName().Version;
+                var versionString = $"{version?.Major}.{version?.Minor}.{version?.Build}";
+                c.SwaggerDoc(swaggerTitle, new OpenApiInfo { Title = swaggerTitle, Version = swaggerVersion, Description = $"{swaggerDescription}{versionString}" });
                 c.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, $"{Assembly.GetExecutingAssembly().GetName().Name}.XML"));
                 c.CustomSchemaIds(type => type.ToString());
             });

From 09dc8bd6d0578ea095e1d35983a27a1eda4005eb Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Mon, 11 Nov 2024 11:56:28 +0000
Subject: [PATCH 087/143] yml file changes

---
 .github/azure-pipeline-webui-ci.yml           | 51 +++++++++++++++++++
 .../Views/Shared/_Layout.cshtml               |  1 -
 .../Shared/Tenant/LearningHub/_Layout.cshtml  |  1 -
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/.github/azure-pipeline-webui-ci.yml b/.github/azure-pipeline-webui-ci.yml
index 21d9d6ddc..343c9ed8c 100644
--- a/.github/azure-pipeline-webui-ci.yml
+++ b/.github/azure-pipeline-webui-ci.yml
@@ -51,6 +51,57 @@ jobs:
     inputs:
       command: restore
       projects: $(BuildParameters.RestoreBuildProjects)
+      # Step 1: Get the version tag from the repository
+- script: |
+    echo "Extracting version from Git tag: $(versionTag)"
+    VERSION=$(echo $(versionTag) | sed 's/^v//')
+    echo "VERSION=$VERSION" >> $(Build.ArtifactStagingDirectory)/version.txt
+  displayName: 'Extract version tag'
+
+# Step 2: Update AssemblyVersion in Web UI .csproj
+- powershell: |
+    $versionFile = "$(Build.ArtifactStagingDirectory)/version.txt"
+    $version = Get-Content $versionFile
+    $version = $version.Trim()
+
+    # Path to your .csproj file (adjust if necessary)
+    $csprojFile = "$(Build.SourcesDirectory)\LearningHub.Nhs.WebUI\LearningHub.Nhs.WebUI.csproj"
+
+    Write-Host "Updating AssemblyVersion and FileVersion and Version  in $csprojFile to $version"
+
+    # Load the .csproj XML file
+    [xml]$csprojXml = Get-Content -Path $csprojFile
+
+    # Update the AssemblyVersion and FileVersion
+    $csprojXml.Project.PropertyGroup.AssemblyVersion = $version
+    $csprojXml.Project.PropertyGroup.FileVersion = $version
+    $csprojXml.Project.PropertyGroup.Version = $version
+
+    # Save the updated .csproj file
+    $csprojXml.Save($csprojFile)
+  displayName: 'Update AssemblyVersion in WebUI .csproj'
+  # Step 2: Update AssemblyVersion in Admin UI .csproj
+- powershell: |
+    $versionFile = "$(Build.ArtifactStagingDirectory)/version.txt"
+    $version = Get-Content $versionFile
+    $version = $version.Trim()
+
+    # Path to your .csproj file (adjust if necessary)
+    $csprojFile = "$(Build.SourcesDirectory)\AdminUI\LearningHub.Nhs.AdminUI\LearningHub.Nhs.AdminUI.csproj"
+
+    Write-Host "Updating AssemblyVersion and FileVersion and Version  in $csprojFile to $version"
+
+    # Load the .csproj XML file
+    [xml]$csprojXml = Get-Content -Path $csprojFile
+
+    # Update the AssemblyVersion and FileVersion
+    $csprojXml.Project.PropertyGroup.AssemblyVersion = $version
+    $csprojXml.Project.PropertyGroup.FileVersion = $version
+    $csprojXml.Project.PropertyGroup.Version = $version
+
+    # Save the updated .csproj file
+    $csprojXml.Save($csprojFile)
+  displayName: 'Update AssemblyVersion in AdminUI .csproj'
   - task: DotNetCoreCLI@2
     displayName: Build
     inputs:
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_Layout.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_Layout.cshtml
index e591bf6b5..658a30add 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_Layout.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_Layout.cshtml
@@ -82,4 +82,3 @@
 </body>
 </html>
 @await Component.InvokeAsync("Version")
-<!-- Build number: @settings.Value.BuildNumber -->
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
index be91cb3cb..a9fd5a541 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
@@ -154,7 +154,6 @@
 </body>
 </html>
 @await Component.InvokeAsync("Version")
-<!-- Build number: @settings.Value.BuildNumber -->
 @functions {
     public async Task<bool> DisplayOffline()
     {

From d6272a2f8b7c9bc2bc1e7021ba26727bbbba9311 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Tue, 19 Nov 2024 15:07:23 +0000
Subject: [PATCH 088/143] TD-4824: Implemented click logs for Auto suggestions.

---
 .../LearningHub.Nhs.AdminUI.csproj            |  2 +-
 .../Controllers/SearchController.cs           | 48 +++++++++++++
 .../Interfaces/ISearchService.cs              |  8 +++
 .../LearningHub.Nhs.WebUI.csproj              |  2 +-
 .../Services/SearchService.cs                 | 39 +++++++++++
 .../Views/Search/_AutoComplete.cshtml         | 34 +++++++++-
 .../Controllers/SearchController.cs           | 60 +++++++++++++++-
 .../LearningHub.Nhs.Api.csproj                |  2 +-
 WebAPI/LearningHub.Nhs.API/appsettings.json   | 17 ++---
 .../Configuration/FindwiseSettings.cs         |  5 ++
 .../LearningHub.Nhs.Api.Shared.csproj         |  2 +-
 .../LearningHub.Nhs.Api.UnitTests.csproj      |  2 +-
 ...earningHub.Nhs.Repository.Interface.csproj |  2 +-
 .../LearningHub.Nhs.Repository.csproj         |  2 +-
 .../ISearchService.cs                         |  8 +++
 .../LearningHub.Nhs.Services.Interface.csproj |  2 +-
 .../LearningHub.Nhs.Services.UnitTests.csproj |  2 +-
 .../LearningHub.Nhs.Services.csproj           |  2 +-
 .../LearningHub.Nhs.Services/SearchService.cs | 68 +++++++++++++++++++
 ...earningHub.Nhs.Migration.ConsoleApp.csproj |  2 +-
 ...LearningHub.Nhs.Migration.Interface.csproj |  2 +-
 .../LearningHub.Nhs.Migration.Models.csproj   |  2 +-
 ...ub.Nhs.Migration.Staging.Repository.csproj |  2 +-
 ...LearningHub.Nhs.Migration.UnitTests.csproj |  2 +-
 .../LearningHub.Nhs.Migration.csproj          |  2 +-
 25 files changed, 290 insertions(+), 29 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
index 0b26b9cd7..3eb1d8323 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
+++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
@@ -89,7 +89,7 @@
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 	<PackageReference Include="IdentityModel" Version="4.4.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
diff --git a/LearningHub.Nhs.WebUI/Controllers/SearchController.cs b/LearningHub.Nhs.WebUI/Controllers/SearchController.cs
index ac314f6c9..0d4081a5d 100644
--- a/LearningHub.Nhs.WebUI/Controllers/SearchController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/SearchController.cs
@@ -6,6 +6,7 @@ namespace LearningHub.Nhs.WebUI.Controllers
     using System.Net.Http;
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Search;
+    using LearningHub.Nhs.Models.Search.SearchClick;
     using LearningHub.Nhs.WebUI.Filters;
     using LearningHub.Nhs.WebUI.Interfaces;
     using LearningHub.Nhs.WebUI.Models.Search;
@@ -308,5 +309,52 @@ public async Task<IActionResult> GetAutoSuggestion(string term)
             var autoSuggestions = await this.searchService.GetAutoSuggestionList(term);
             return this.PartialView("_AutoComplete", autoSuggestions);
         }
+
+        /// <summary>
+        /// Records the AutoSuggestion Click logs.
+        /// </summary>
+        /// <param name="term">the term.</param>
+        /// <param name="url">the searchType.</param>
+        /// <param name="clickTargetUrl">click Payload Model.</param>
+        /// <param name="itemIndex">itemIndex.</param>
+        /// <param name="totalNumberOfHits">total Number Of Hits.</param>
+        /// <param name="containerId">containerId.</param>
+        /// <param name="name">name.</param>
+        /// <param name="query">query.</param>
+        /// <param name="userQuery">userQuery.</param>
+        /// <param name="searchId">searchId.</param>
+        /// <param name="timeOfSearch">timeOfSearch.</param>
+        /// <param name="title">title.</param>
+        /// <returns>Action result.</returns>
+        [HttpGet("record-autosuggestion-click")]
+        public IActionResult RecordAutoSuggestionClick(string term, string url, string clickTargetUrl, int itemIndex, int totalNumberOfHits, string containerId, string name, string query, string userQuery, string searchId, long timeOfSearch, string title)
+        {
+            AutoSuggestionClickPayloadModel clickPayloadModel = new AutoSuggestionClickPayloadModel
+            {
+                ClickTargetUrl = clickTargetUrl,
+                ContainerId = containerId,
+                HitNumber = itemIndex,
+                TimeOfClick = timeOfSearch,
+                DocumentFields = new SearchClickDocumentModel
+                {
+                    Name = name,
+                    Title = title,
+                },
+                SearchSignal = new SearchClickSignalModel
+                {
+                    Query = query,
+                    SearchId = searchId,
+                    TimeOfSearch = timeOfSearch,
+                    UserQuery = userQuery,
+                    Stats = new SearchClickStatsModel
+                    {
+                        TotalHits = totalNumberOfHits,
+                    },
+                },
+            };
+
+            this.searchService.SendAutoSuggestionClickActionAsync(clickPayloadModel);
+            return this.Redirect(url);
+        }
     }
 }
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Interfaces/ISearchService.cs b/LearningHub.Nhs.WebUI/Interfaces/ISearchService.cs
index 8a2f0aec1..3f083bc38 100644
--- a/LearningHub.Nhs.WebUI/Interfaces/ISearchService.cs
+++ b/LearningHub.Nhs.WebUI/Interfaces/ISearchService.cs
@@ -3,6 +3,7 @@
     using System.Security.Principal;
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Search;
+    using LearningHub.Nhs.Models.Search.SearchClick;
     using LearningHub.Nhs.WebUI.Models.Search;
 
     /// <summary>
@@ -91,5 +92,12 @@ public interface ISearchService
         /// <param name="term">The term.</param>
         /// <returns>The <see cref="Task"/>.</returns>
         Task<AutoSuggestionModel> GetAutoSuggestionList(string term);
+
+        /// <summary>
+        /// The Send AutoSuggestion Click Action Async.
+        /// </summary>
+        /// <param name="clickPayloadModel">The click Payload Model.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task SendAutoSuggestionClickActionAsync(AutoSuggestionClickPayloadModel clickPayloadModel);
     }
 }
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index f20842a9a..b49d33805 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -108,7 +108,7 @@
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
 		<PackageReference Include="IdentityModel" Version="4.3.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
 		<PackageReference Include="linqtotwitter" Version="6.9.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />
diff --git a/LearningHub.Nhs.WebUI/Services/SearchService.cs b/LearningHub.Nhs.WebUI/Services/SearchService.cs
index c8628270f..16680a81e 100644
--- a/LearningHub.Nhs.WebUI/Services/SearchService.cs
+++ b/LearningHub.Nhs.WebUI/Services/SearchService.cs
@@ -13,6 +13,7 @@ namespace LearningHub.Nhs.WebUI.Services
     using LearningHub.Nhs.Models.Common;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Search;
+    using LearningHub.Nhs.Models.Search.SearchClick;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Helpers;
     using LearningHub.Nhs.WebUI.Interfaces;
@@ -691,6 +692,44 @@ public async Task<AutoSuggestionModel> GetAutoSuggestionList(string term)
             return viewModel;
         }
 
+        /// <summary>
+        /// The Send AutoSuggestion Click Action.
+        /// </summary>
+        /// <param name="clickPayloadModel">The search action catalogue model.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task SendAutoSuggestionClickActionAsync(AutoSuggestionClickPayloadModel clickPayloadModel)
+        {
+            try
+            {
+                var client = await this.LearningHubHttpClient.GetClientAsync();
+
+                var json = JsonConvert.SerializeObject(clickPayloadModel);
+                var stringContent = new StringContent(json, UnicodeEncoding.UTF8, "application/json");
+
+                var request = $"Search/SendAutoSuggestionClickAction";
+                var response = await client.PostAsync(request, stringContent).ConfigureAwait(false);
+
+                if (response.IsSuccessStatusCode)
+                {
+                    var result = response.Content.ReadAsStringAsync().Result;
+                    ApiResponse apiResponse = JsonConvert.DeserializeObject<ApiResponse>(result) as ApiResponse;
+
+                    if (!apiResponse.Success)
+                    {
+                        throw new Exception("Error sending AutoSuggestion click Action!");
+                    }
+                }
+                else
+                {
+                    throw new Exception(string.Format("Error sending AutoSuggestion click Action!"));
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new Exception(string.Format("Error sending AutoSuggestion click Action: {0}", ex.Message));
+            }
+        }
+
         /// <summary>
         /// The RemoveHtmlTags.
         /// </summary>
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_AutoComplete.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_AutoComplete.cshtml
index ba031ab0e..151b27f98 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_AutoComplete.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_AutoComplete.cshtml
@@ -1,7 +1,35 @@
 @model LearningHub.Nhs.Models.Search.AutoSuggestionModel;
+
+@using LearningHub.Nhs.Models.Search.SearchClick;
+@using Microsoft.AspNetCore.WebUtilities
+@using System.Web
 @{
     var counter = 0;
     var counter_res = 0;
+    string GetUrl(string term, string searchType, AutoSuggestionClickPayloadModel payload, string reference, int? resourceReferenceId)
+    {
+        var url = string.Empty;
+        if (!string.IsNullOrEmpty(reference) && searchType == "Catalogues")
+        {
+            url = "/Catalogue/" + reference;
+        }
+        else if ((resourceReferenceId > 0) && searchType == "Resource")
+        {
+            url = "/Resource/" + resourceReferenceId;
+        }
+        else if (!string.IsNullOrEmpty(term) && searchType == "Concepts")
+        {
+            url = "/Search/results?term=" + term;
+        }
+        else
+        {
+            url = "/Search/results?term=" + term;
+        }
+
+        return $@"/search/record-autosuggestion-click?term={term}&url={url}&clickTargetUrl={payload.ClickTargetUrl}&itemIndex={payload?.HitNumber}&&totalNumberOfHits={payload?.SearchSignal?.Stats?.TotalHits}
+&containerId={payload?.ContainerId}&name={payload?.DocumentFields.Name}&query={payload?.SearchSignal?.Query}&userQuery={HttpUtility.UrlEncode(payload?.SearchSignal?.UserQuery)}
+&searchId={payload?.SearchSignal?.SearchId}&timeOfSearch={payload?.SearchSignal?.TimeOfSearch}&title={payload?.DocumentFields?.Title}";
+    }
 }
 @if (Model != null)
 {
@@ -9,7 +37,7 @@
     {
         counter++;
         <li class="autosuggestion-option autosugg-concepts" style="@((Model.ConceptDocument.ConceptDocumentList.Count == counter)? "border-bottom: 3px solid #d8dde0;": "" )">
-            <a tabindex="0" style="text-decoration:none !important" asp-controller="Search" asp-action="results" asp-route-term="@item.Concept">
+            <a tabindex="0" style="text-decoration:none !important" href="@GetUrl(item.Concept,"Concepts", item.Click.Payload, null, null)">
                 <svg class="nhsuk-icon autosuggestion-icon" width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
                     <path d="M11.8558 10.5296L15.7218 14.3861C15.8998 14.5627 16 14.8031 16 15.0539C16 15.3047 15.8998 15.5451 15.7218 15.7218C15.5451 15.8998 15.3047 16 15.0539 16C14.8031 16 14.5627 15.8998 14.3861 15.7218L10.5296 11.8558C7.76424 13.9254 3.86973 13.5064 1.60799 10.8959C-0.653748 8.28537 -0.513826 4.37088 1.92852 1.92852C4.37088 -0.513826 8.28537 -0.653748 10.8959 1.60799C13.5064 3.86973 13.9254 7.76424 11.8558 10.5296ZM6.58846 1.88528C3.99101 1.88528 1.88537 3.99093 1.88537 6.58837C1.88537 9.18581 3.99101 11.2915 6.58846 11.2915C9.1859 11.2915 11.2915 9.18581 11.2915 6.58837C11.2915 3.99093 9.1859 1.88528 6.58846 1.88528Z" />
                 </svg>
@@ -21,7 +49,7 @@
     {
         counter_res++;
         <li class="autosuggestion-option autosugg-resource" style="@((Model.ResourceDocument.ResourceDocumentList.Count == counter_res)? "border-bottom: 3px solid #d8dde0;": "" )">
-            <a tabindex="0" style="text-decoration:none !important" asp-controller="Search" asp-action="results" asp-route-term="@item.Title">
+            <a tabindex="0" style="text-decoration:none !important" href="@GetUrl(item.Title, "Resource",item.Click.Payload, null, item.ResourceReferenceId)">
                 <svg class="nhsuk-icon autosuggestion-icon" width="16" height="12" viewBox="0 0 16 12" xmlns="http://www.w3.org/2000/svg">
                     <path d="M7.89365 11.4887C7.90726 11.4837 7.92086 11.4787 7.93508 11.4738C7.93508 11.4239 7.93508 11.3735 7.93508 11.3236C7.93508 8.61493 7.93199 5.90624 7.94003 3.19754C7.94064 2.90288 7.87263 2.64621 7.71621 2.40574C7.64263 2.29299 7.57091 2.17836 7.48744 2.0737C6.01592 0.238416 3.7023 -0.378952 1.5148 0.23094C1.47028 0.2434 1.41958 0.322518 1.41526 0.374225C1.40165 0.533706 1.40907 0.695679 1.40907 0.856407C1.4066 2.50044 1.40536 4.14447 1.40042 5.78787C1.39671 6.93975 1.38743 8.09163 1.37878 9.24351C1.37816 9.35814 1.38125 9.43103 1.53706 9.39676C2.4076 9.20613 3.28186 9.18433 4.15983 9.34942C5.54973 9.61107 6.73561 10.249 7.70631 11.2869C7.76876 11.3535 7.83121 11.4208 7.89365 11.4881V11.4887ZM8.06863 11.475C8.08718 11.4862 8.10573 11.4974 8.12427 11.5093C8.14159 11.4769 8.1521 11.4389 8.17621 11.4127C9.89195 9.56061 11.9978 8.93327 14.4462 9.39365C14.5823 9.41919 14.6157 9.39116 14.6144 9.25473C14.6064 8.38381 14.6045 7.51351 14.6014 6.64259C14.5996 6.11493 14.5983 5.58728 14.5971 5.05899C14.5946 4.19742 14.5915 3.33585 14.5891 2.47427C14.5872 1.789 14.5829 1.10435 14.5866 0.419079C14.5872 0.291369 14.5495 0.23094 14.4209 0.209759C14.223 0.177988 14.0289 0.123166 13.8311 0.0895252C12.5048 -0.135992 11.2454 0.0596224 10.0725 0.732435C9.29964 1.17537 8.64673 1.751 8.20094 2.54031C8.10511 2.70976 8.0575 2.88793 8.0575 3.0879C8.06121 5.83896 8.05997 8.58939 8.06059 11.3404C8.06059 11.3853 8.06554 11.4295 8.06801 11.4744L8.06863 11.475ZM0.012984 10.9673C2.58011 10.6072 5.08849 10.819 7.55669 11.5535C5.62084 9.96865 3.44076 9.39926 0.981219 9.97239C0.976273 9.90262 0.970709 9.85714 0.970709 9.81166C0.973182 8.20377 0.975037 6.59587 0.978746 4.98797C0.981219 3.65979 0.983074 2.33099 0.99173 1.00281C0.992349 0.857653 0.932375 0.797224 0.80439 0.800962C0.610248 0.806569 0.416106 0.824635 0.221965 0.839587C0.0513177 0.852669 0 0.940508 0 1.11619C0.00680114 3.0717 0.00494629 5.02722 0.00494629 6.98336C0.00494629 8.23928 0.00370971 9.49519 0.004328 10.7511C0.004328 10.8171 0.00989257 10.8826 0.0136023 10.9673H0.012984ZM15.9771 10.966C15.9815 10.8938 15.9876 10.8383 15.9883 10.7835C15.9932 9.39303 15.9994 8.00317 16 6.61269C16 5.82961 15.9901 5.04653 15.9889 4.26345C15.987 3.19443 15.9864 2.12541 15.9913 1.05638C15.9913 0.93241 15.9456 0.868243 15.8318 0.855161C15.6235 0.832111 15.4139 0.81093 15.2049 0.800339C15.0602 0.792863 15.0033 0.86762 15.0039 1.02212C15.0083 2.48549 15.0033 3.94823 15.0046 5.4116C15.0052 6.01214 15.0182 6.61331 15.0206 7.21386C15.0243 8.06983 15.0243 8.92642 15.025 9.78238C15.025 9.83783 15.0182 9.89328 15.0132 9.97488C13.8416 9.69953 12.6829 9.66838 11.5267 9.9537C10.3699 10.239 9.34601 10.7879 8.43713 11.5572C10.9047 10.8196 13.4112 10.6091 15.9771 10.9667V10.966Z" />
                 </svg>
@@ -33,7 +61,7 @@
     @foreach (var item in Model.CatalogueDocument.CatalogueDocumentList)
     {
         <li class="autosuggestion-option autosugg-catalogue">
-            <a tabindex="0" style="text-decoration:none !important" asp-controller="Search" asp-action="results" asp-route-term="@item.Name">
+            <a tabindex="0" style="text-decoration:none !important" href="@GetUrl(item.Name,"Catalogues", item.Click.Payload, item.Url, null)">
                 <svg class="nhsuk-icon autosuggestion-icon" width="14" height="16" viewBox="0 0 14 16" xmlns="http://www.w3.org/2000/svg">
                     <path d="M13.4986 1.62391C13.498 1.35936 13.4452 1.06975 13.3272 0.835751C13.0286 0.243103 12.5027 0.0164303 11.8428 0.0182632C8.84631 0.0255949 5.84982 0.0219291 2.85272 0.0213181C2.75073 0.0213181 2.64873 0.023151 2.54735 0.0127644C1.80514 -0.0623858 1.18766 0.19728 0.673397 0.712944C0.171423 1.217 -0.000612773 1.84325 1.639e-06 2.53977C0.00491694 6.56672 0.00184488 10.5937 0.00245929 14.62C0.00245929 14.7208 0.00368811 14.8229 0.0116755 14.9231C0.0645149 15.5566 0.516722 15.9941 1.15571 15.9953C4.34574 16.0008 7.53638 16.002 10.7264 15.9959C11.433 15.9947 11.9012 15.5322 11.9018 14.8332C11.9073 11.1099 11.9104 7.38665 11.8901 3.66335C11.8889 3.40796 11.7377 3.12081 11.5774 2.90635C11.3464 2.59659 10.9808 2.51899 10.5937 2.5196C7.8823 2.52449 5.17151 2.52083 2.46011 2.52388C2.10252 2.52388 1.77197 2.46156 1.49425 2.22084C1.11209 1.88908 1.11762 1.35691 1.509 1.03249C1.79654 0.794204 2.1357 0.709278 2.50312 0.709278C3.85851 0.709278 5.21452 0.709278 6.56991 0.709278C8.11946 0.709278 9.66839 0.705002 11.2179 0.711111C12.1445 0.714777 12.8345 1.30315 12.8357 2.09559C12.84 5.84576 12.8375 9.59655 12.8375 13.3376C13.2854 13.1604 13.5048 12.8133 13.5054 12.1853C13.5072 8.6642 13.5097 5.14314 13.4993 1.62269L13.4986 1.62391ZM4.60133 5.26595C4.60809 4.92013 4.766 4.7625 5.10945 4.76189C6.48328 4.75822 7.8571 4.75822 9.23032 4.76189C9.60326 4.76311 9.76854 4.93235 9.771 5.29955C9.77468 5.77428 9.77653 6.24901 9.77038 6.72374C9.76547 7.08727 9.59221 7.2614 9.22479 7.26506C8.5434 7.27117 7.8614 7.2669 7.17941 7.2669C6.50785 7.2669 5.8363 7.26873 5.16475 7.26567C4.76538 7.26384 4.60625 7.11415 4.59949 6.72068C4.5915 6.23618 4.59212 5.75106 4.60072 5.26656L4.60133 5.26595Z" />
                 </svg>
diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/SearchController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/SearchController.cs
index 8b0b9beb7..ea4d10d04 100644
--- a/WebAPI/LearningHub.Nhs.API/Controllers/SearchController.cs
+++ b/WebAPI/LearningHub.Nhs.API/Controllers/SearchController.cs
@@ -7,6 +7,7 @@
     using LearningHub.Nhs.Models.Common;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Search;
+    using LearningHub.Nhs.Models.Search.SearchClick;
     using LearningHub.Nhs.Models.Validation;
     using LearningHub.Nhs.Repository.Interface;
     using LearningHub.Nhs.Services.Interface;
@@ -233,11 +234,35 @@ public async Task<IActionResult> GetAllCatalogueSearchResult(AllCatalogueSearchR
         [Route("GetAutoSuggestionResult/{term}")]
         public async Task<IActionResult> GetAutoSuggestionResults(string term)
         {
-            var autosuggestionViewModel = new AutoSuggestionModel();
-            autosuggestionViewModel = await this.searchService.GetAutoSuggestionResultsAsync(term);
+            var autosuggestionViewModel = await this.GetAutoSuggestions(term);
             return this.Ok(autosuggestionViewModel);
         }
 
+        /// <summary>
+        /// Send AutoSuggestion Click action.
+        /// </summary>
+        /// <param name="clickPayloadModel">
+        /// The click Payload model.
+        /// </param>
+        /// <returns>
+        /// Nothing.
+        /// </returns>
+        [HttpPost]
+        [Route("SendAutoSuggestionClickAction")]
+        public async Task<IActionResult> SendAutoSuggestionClickAction(AutoSuggestionClickPayloadModel clickPayloadModel)
+        {
+            var eventCreated = await this.searchService.SendAutoSuggestionEventAsync(clickPayloadModel);
+
+            if (eventCreated)
+            {
+                return this.Ok(new ApiResponse(true));
+            }
+            else
+            {
+                return this.BadRequest(new ApiResponse(false));
+            }
+        }
+
         /// <summary>
         /// Get search result.
         /// </summary>
@@ -480,5 +505,36 @@ private async Task<SearchAllCatalogueViewModel> GetAllCatalogueResults(AllCatalo
 
             return searchViewModel;
         }
+
+        /// <summary>
+        /// Get AutoSuggestion Results.
+        /// </summary>
+        /// <param name="term">term.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        private async Task<AutoSuggestionModel> GetAutoSuggestions(string term)
+        {
+            var autosuggestionModel = await this.searchService.GetAutoSuggestionResultsAsync(term);
+            if (autosuggestionModel != null)
+            {
+                var documents = autosuggestionModel.CatalogueDocument.CatalogueDocumentList;
+                var documentIds = documents.Select(x => int.Parse(x.Id)).ToList();
+                var catalogues = this.catalogueService.GetCataloguesByNodeId(documentIds);
+
+                foreach (var document in documents)
+                {
+                    var catalogue = catalogues.SingleOrDefault(x => x.NodeId == int.Parse(document.Id));
+                    if (catalogue == null)
+                    {
+                        continue;
+                    }
+
+                    document.Url = catalogue.Url;
+                }
+
+                autosuggestionModel.CatalogueDocument.CatalogueDocumentList = documents;
+            }
+
+            return autosuggestionModel;
+        }
     }
 }
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
index 780f22f77..86a1a5dd3 100644
--- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
+++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
@@ -27,7 +27,7 @@
 	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
 	<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
 	<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
 	<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 	<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
diff --git a/WebAPI/LearningHub.Nhs.API/appsettings.json b/WebAPI/LearningHub.Nhs.API/appsettings.json
index 623e0cd84..6e5e930ef 100644
--- a/WebAPI/LearningHub.Nhs.API/appsettings.json
+++ b/WebAPI/LearningHub.Nhs.API/appsettings.json
@@ -84,19 +84,20 @@
     },
 
     "FindWise": {
-        "IndexUrl": "",
-        "SearchUrl": "",
+      "IndexUrl": "",
+      "SearchUrl": "",
       "CollectionIds": {
         "Resource": "",
         "Catalogue": "",
         "AutoSuggestion": ""
       },
-        "UrlSearchComponent": "rest/apps/HEE/searchers/{0}",
-        "UrlClickComponent": "rest/apps/HEE/searchers/hee/signals/hee/signal/click",
-        "Token": "",
-        "MaximumDescriptionLength": 150,
-        "IndexMethod": "/rest/v2/collections/{0}/documents",
-        "DescriptionLengthLimit": 3000
+      "UrlSearchComponent": "rest/apps/HEE/searchers/{0}",
+      "UrlClickComponent": "rest/apps/HEE/searchers/hee/signals/hee/signal/click",
+      "UrlAutoSuggestionClickComponent": "rest/apps/HEE/searchers/hee/signals/hee/signal/click-hee",
+      "Token": "",
+      "MaximumDescriptionLength": 150,
+      "IndexMethod": "/rest/v2/collections/{0}/documents",
+      "DescriptionLengthLimit": 3000
     },
     "Notifications": {
       "PublishResourceTimeToProcessInSec": 30,
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/FindwiseSettings.cs b/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/FindwiseSettings.cs
index c68ab9dd9..aa3802eee 100644
--- a/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/FindwiseSettings.cs
+++ b/WebAPI/LearningHub.Nhs.Api.Shared/Configuration/FindwiseSettings.cs
@@ -25,6 +25,11 @@ public class FindwiseSettings
         /// </summary>
         public string UrlClickComponent { get; set; }
 
+        /// <summary>
+        /// Gets or sets the url AutoSuggestion click component.
+        /// </summary>
+        public string UrlAutoSuggestionClickComponent { get; set; }
+
         /// <summary>
         /// Gets or sets the token.
         /// </summary>
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
index 829bad9be..831497bc2 100644
--- a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
index 72f794c05..6da2ec625 100644
--- a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
index 7d7158ca5..ac60ee1b6 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
    <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
index ad69ef225..3027cdbc6 100644
--- a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/ISearchService.cs b/WebAPI/LearningHub.Nhs.Services.Interface/ISearchService.cs
index 0fb99c731..aa13fdf0e 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/ISearchService.cs
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/ISearchService.cs
@@ -2,6 +2,7 @@
 {
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Search;
+    using LearningHub.Nhs.Models.Search.SearchClick;
     using LearningHub.Nhs.Models.Search.SearchFeedback;
     using LearningHub.Nhs.Models.Validation;
 
@@ -182,5 +183,12 @@ public interface ISearchService
         /// <param name="term">the term.</param>
         /// <returns>The <see cref="Task"/>.</returns>
         Task<AutoSuggestionModel> GetAutoSuggestionResultsAsync(string term);
+
+        /// <summary>
+        ///  The Send AutoSuggestion Event Async.
+        /// </summary>
+        /// <param name="clickPayloadModel"> The click Payload Model.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<bool> SendAutoSuggestionEventAsync(AutoSuggestionClickPayloadModel clickPayloadModel);
     }
 }
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
index 3755bd4a9..b49011e8c 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
@@ -16,7 +16,7 @@
 	<PackageReference Include="Azure.Storage.Queues" Version="12.11.0" />
 	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
index 97879cf14..ef4a2180b 100644
--- a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="EntityFrameworkCore.Testing.Moq" Version="4.0.0" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
index 9b9bb5f7d..9a2ab84b2 100644
--- a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
+++ b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
     <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.28.0" />
     <PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
diff --git a/WebAPI/LearningHub.Nhs.Services/SearchService.cs b/WebAPI/LearningHub.Nhs.Services/SearchService.cs
index c98bddfcf..d05c73cb5 100644
--- a/WebAPI/LearningHub.Nhs.Services/SearchService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/SearchService.cs
@@ -633,6 +633,25 @@ public async Task<AutoSuggestionModel> GetAutoSuggestionResultsAsync(string term
             }
         }
 
+        /// <summary>
+        /// The AutoSuggestion Event action async.
+        /// </summary>
+        /// <param name="clickPayloadModel">
+        /// The clic kPayload Model.
+        /// </param>
+        /// <returns>
+        /// The <see cref="Task"/>.
+        /// </returns>
+        public async Task<bool> SendAutoSuggestionEventAsync(AutoSuggestionClickPayloadModel clickPayloadModel)
+        {
+            clickPayloadModel.TimeOfClick = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+            clickPayloadModel.SearchSignal.ProfileSignature.ApplicationId = ApplicationId;
+            clickPayloadModel.SearchSignal.ProfileSignature.ProfileType = ProfileType;
+            clickPayloadModel.SearchSignal.ProfileSignature.ProfileId = this.settings.Findwise.CollectionIds.AutoSuggestion;
+
+            return await this.SendAutoSuggestionEventClickAsync(clickPayloadModel);
+        }
+
         /// <summary>
         /// Send search click payload.
         /// </summary>
@@ -685,6 +704,55 @@ private async Task<bool> SendSearchEventClickAsync(SearchClickPayloadModel searc
             }
         }
 
+        /// <summary>
+        /// Send auto suggestion click payload.
+        /// </summary>
+        /// <param name="clickPayloadModel">search click payload model.</param>
+        /// <returns>
+        /// The <see cref="Task"/>.
+        /// </returns>
+        private async Task<bool> SendAutoSuggestionEventClickAsync(AutoSuggestionClickPayloadModel clickPayloadModel)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(this.settings.Findwise.UrlAutoSuggestionClickComponent))
+                {
+                    this.Logger.LogWarning($"The UrlClickComponent is not configured. Auto suggestion click event not send to FindWise.");
+                }
+                else
+                {
+                    var json = JsonConvert.SerializeObject(clickPayloadModel);
+                    var base64EncodedString = BinaryFormatterHelper.Base64EncodeObject(json);
+
+                    var request = $"{this.settings.Findwise.UrlAutoSuggestionClickComponent}?payload={base64EncodedString}";
+
+                    var client = await this.FindWiseHttpClient.GetClient(this.settings.Findwise.SearchUrl);
+                    var response = await client.PostAsync(request, null).ConfigureAwait(false);
+
+                    if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized || response.StatusCode == System.Net.HttpStatusCode.Forbidden)
+                    {
+                        this.Logger.LogError($"Click event save to FindWise failed for Auto suggestion: {clickPayloadModel.ClickTargetUrl} HTTP Status Code: {response.StatusCode}");
+                        throw new Exception("AccessDenied");
+                    }
+                    else if (!response.IsSuccessStatusCode)
+                    {
+                        this.Logger.LogError($"Click event save to FindWise failed for Auto suggestion: {clickPayloadModel.ClickTargetUrl} HTTP Status Code: {response.StatusCode}");
+                        throw new Exception($"Click event save to FindWise failed for Auto suggestion: {json}");
+                    }
+                    else
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+            catch (Exception ex)
+            {
+                throw new Exception($"Click event save to FindWise failed for Auto suggestion: {clickPayloadModel.ClickTargetUrl} :  {ex.Message}");
+            }
+        }
+
         private string EncodeSearchText(string searchText)
         {
             string specialSearchCharacters = this.settings.SpecialSearchCharacters;
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
index aef6c8475..28730e740 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="IdentityModel" Version="5.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
index 8c01c9143..d08aa9391 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
index a80919111..28916df8b 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
index c65d9208e..e71105e0b 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
   </ItemGroup>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
index 416c85de0..9addb85a0 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
index 9c68fccf6..8e0c512aa 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="FluentValidation" Version="10.3.4" />
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From 2ff8277ca83e4096f24e3592fb75d3794c5c0927 Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Tue, 26 Nov 2024 14:38:26 +0000
Subject: [PATCH 089/143] fixesfor design

---
 .../LearningHub.Nhs.WebUI.csproj              |  2 +-
 .../Components/DateInput/Default.cshtml       | 50 ++++++++++++++++---
 .../Components/ErrorSummary/Default.cshtml    |  4 ++
 .../Components/RadioList/Default.cshtml       | 16 +++++-
 4 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index b49d33805..b67f9ae90 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -125,7 +125,7 @@
 		<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
 		<PackageReference Include="MK.IO" Version="1.5.0" />
-		<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.24" />
+		<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.25" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
index 426e57235..341c039ac 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
@@ -54,12 +54,13 @@
                            id="@Model.DayId"
                            name="@Model.DayId"
                            value="@Model.DayValue"
-                           type="number"
+                           type="text"
                            pattern="[0-9]*"
                            min="1"
                            max="31"
                            step="1"
-                           inputmode="numeric" />
+                           inputmode="numeric"
+                           aria-describedby="date-error" aria-invalid="false" />
                 </div>
             </div>
             <div class="nhsuk-date-input__item">
@@ -69,12 +70,13 @@
                            id="@Model.MonthId"
                            name="@Model.MonthId"
                            value="@Model.MonthValue"
-                           type="number"
+                           type="text"
                            pattern="[0-9]*"
                            min="1"
                            max="12"
                            step="1"
-                           inputmode="numeric" />
+                           inputmode="numeric"
+                           aria-describedby="date-error" aria-invalid="false" />
                 </div>
             </div>
             <div class="nhsuk-date-input__item">
@@ -84,14 +86,50 @@
                            id="@Model.YearId"
                            name="@Model.YearId"
                            value="@Model.YearValue"
-                           type="number"
+                           type="text"
                            pattern="[0-9]*"
                            min="1900"
                            max="9999"
                            step="1"
-                           inputmode="numeric" />
+                           inputmode="numeric"
+                           aria-describedby="date-error" aria-invalid="false" />
                 </div>
             </div>
+            <span id="date-error" class="error-message--margin-bottom-1 nhsuk-error-message" aria-live="polite" style="visibility: hidden;">
+            </span>
         </div>
     </fieldset>
+    <script>
+        const fields = [@Model.DayId, @Model.MonthId, @Model.YearId];
+
+        const errorElement = document.getElementById('date-error');
+        for (let field of fields) {
+            const inputElement = document.getElementById(field.id);
+
+            inputElement.addEventListener('input', function (event) {
+
+                if (event.inputType === 'deleteContentBackward') {
+                    return;
+                }
+
+                const value = event.data;
+                const min = parseInt(inputElement.getAttribute('min'));
+                const max = parseInt(inputElement.getAttribute('max'));
+
+                inputElement.setAttribute('aria-invalid', 'false');
+                errorElement.textContent = '';
+                errorElement.style.visibility = 'hidden';
+
+                setTimeout(function () {
+                    if (value < 1 || value > max || !value.match(/^[0-9]*$/)) {
+                        inputElement.value = inputElement.value.slice(0, -1) + 1;
+                        inputElement.value = inputElement.value.slice(0, -1);
+                        inputElement.setAttribute('aria-invalid', 'true');
+                        errorElement.textContent = `Invalid input. Please enter a number between ${min} and ${max}.`;
+                        errorElement.style.visibility = 'visible';
+                    }
+                }, 0);
+            });
+        }
+    </script>
 </div>
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml
index 269b174f8..7f438d581 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml
@@ -21,6 +21,10 @@
             </ul>
         </div>
     </div>
+    <script>
+        const errorSummary = document.querySelector("#error-summary-title").parentElement;
+        errorSummary.focus();
+    </script>
 }
 else
 {
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
index 05eb26699..2bcd6dae9 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
@@ -44,7 +44,7 @@
 
         @if (Model.Required && !Model.HasError)
         {
-            <div data-valmsg-for="@Model.AspFor" data-valmsg-replace="true" class="error-message--margin-bottom-1 nhsuk-error-message field-validation-valid nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3">
+            <div data-valmsg-for="@Model.AspFor" data-valmsg-replace="true" class="error-message--margin-bottom-1 nhsuk-error-message field-validation-valid nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3" aria-live="assertive" role="alert">
             </div>
         }
 
@@ -131,5 +131,19 @@
 
         </div>
     </fieldset>
+    <script>
+        window.onload = function() {
+            const id = "@Model.AspFor";
+            const radioForm = document.querySelector("main form[novalidate='novalidate']");
+            radioForm.addEventListener("submit", () => {
+                const errorMessageParent = document.querySelector("div[data-valmsg-for='" + id + "']");
+                const errorMessage = errorMessageParent.innerHTML;
+                errorMessageParent.innerHTML = "";
 
+                setTimeout(function () {
+                    errorMessageParent.innerHTML = errorMessage;
+                }, 0);
+            });
+        };
+    </script>
 </div>
\ No newline at end of file

From 35a4d8553dd5ee8c655b3430f9998eca2d813187 Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Wed, 27 Nov 2024 16:25:34 +0000
Subject: [PATCH 090/143] fixes

---
 .../Views/Shared/Tenant/LearningHub/_Layout.cshtml   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
index 3465856d9..9127802e9 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
@@ -72,12 +72,12 @@
     </div>
 
     <header class="nhsuk-header" role="banner">
-    <div id="content-header">
-        <partial name="~/Views/Shared/_NavPartial.cshtml" />
-    </div>
+        <div id="content-header">
+            <partial name="~/Views/Shared/_NavPartial.cshtml" />
+        </div>
     </header>
     <div id="header">
-        </div>
+    </div>
 
     <div class="nhsuk-width-container app-width-container beta-banner">
         <span class="beta-banner__beta-box">BETA</span>
@@ -102,7 +102,9 @@
     </div>
 
     <!-- footer -->
-    <partial name="~/Views/Shared/_FooterPartial.cshtml" />
+    <footer role="contentinfo">
+        <partial name="~/Views/Shared/_FooterPartial.cshtml" />
+    </footer>
 
     <script>
         if (!window.process) { window.process = {}; }

From b9c44ad65bd243ef68284d1662f138faaf55c63e Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Thu, 28 Nov 2024 12:04:34 +0000
Subject: [PATCH 091/143] fixes

---
 LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
index 195611f8b..54146c0cd 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_NavPartial.cshtml
@@ -49,7 +49,7 @@
 
 </div>
   @if (User.Identity.IsAuthenticated) {
-  <input type="checkbox" id="header-dropdown-menu-control" aria-labelledby="label-navigation" role="button">
+    <input type="checkbox" id="header-dropdown-menu-control" aria-labelledby="Main navigation menu" role="button">
     <nav class="nhsuk-header__navigation app-width-container" id="header-navigation" role="navigation" aria-label="Primary navigation" aria-labelledby="label-navigation">
         <p class="nhsuk-header__navigation-title"><span id="label-navigation">Menu</span>
           <button class="nhsuk-header__navigation-close" id="close-menu">

From 840d40ebebee9041d39da864da720f3922b1b6b5 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Thu, 28 Nov 2024 14:09:54 +0000
Subject: [PATCH 092/143] TD-4180: Error message changed according to NHS
 design pattern

---
 .../Account/CreateAccountCountrySearch.cshtml | 30 ++++++++++---------
 .../Account/CreateAccountSearchRole.cshtml    | 16 +++++++---
 .../CreateAccountWorkPlaceSearch.cshtml       | 15 ++++++++--
 3 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml
index b2aad6de5..c037697fe 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySearch.cshtml
@@ -21,25 +21,27 @@
                 }
                 <h1 class="nhsuk-heading-xl">Search for your country</h1>
                 <form asp-controller="Account" asp-action="CreateAccountCountrySelection" method="get">
-                    <input type="hidden" name="formSubmission" value="true">
+                    <input type="hidden" name="formSubmission" value="true">  
+                    <div class="@(errorHasOccurred ? "nhsuk-form-group input-validation-error" : "nhsuk-form-group")">
                     <label for="FilterText" class="nhsuk-body-l nhsuk-u-font-size-19 nhsuk-u-margin-bottom-3">Search for example, England</label>
-                    <div class="nhsuk-form-group search-box-container" style="white-space:nowrap">
+                    @if (errorHasOccurred)
+                    {
+                        <span class="nhsuk-error-message">
+                            <span class="nhsuk-u-visually-hidden">Error:</span> @CommonValidationErrorMessages.SearchTermRequired
+                        </span>
+                    }
+                     <div class="nhsuk-form-group search-box-container" style="white-space:nowrap">
                         <input class="nhsuk-input nhsuk-search__input" type="search" autocomplete="off" id="FilterText" name="FilterText" placeholder="" value="@Model.FilterText" @if (errorHasOccurred)
                         {
                             <text>aria-describedby="error-summary-title custom-validation-error"</text>
                         }>
-                        <button class="nhsuk-search__submit" type="submit">
-                            <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
-                                <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
-                            </svg>
-                            <span class="nhsuk-u-visually-hidden">Search</span>
-                        </button>
-                    </div>
-                    <div>
-                    @if (errorHasOccurred)
-                    {
-                        <span id="custom-validation-error" class="custom-validation-error">@CommonValidationErrorMessages.SearchTermRequired</span>
-                    }
+                            <button class="nhsuk-search__submit" type="submit">
+                                <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+                                    <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
+                                </svg>
+                                <span class="nhsuk-u-visually-hidden">Search</span>
+                            </button>
+                     </div>
                     </div>
                 </form>
 
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml
index 21c3e60b7..c8b48178e 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml
@@ -25,11 +25,20 @@
 
                 <form asp-controller="Account" asp-action="CreateAccountCurrentRole" method="get">
                     <input type="hidden" name="formSubmission" value="true">
-
+                    <div class="@(errorHasOccurred ? "nhsuk-form-group input-validation-error" : "nhsuk-form-group")">
                     <label for="FilterText" class="nhsuk-body-l nhsuk-u-font-size-19 nhsuk-u-margin-bottom-3">Use a generic term to best describe your role</label>
+                    @if (errorHasOccurred)
+                    {
+                        <span class="nhsuk-error-message">
+                            <span class="nhsuk-u-visually-hidden">Error:</span> @CommonValidationErrorMessages.SearchTermRequired
+                        </span>
+                    }
                     <div class="nhsuk-form-group search-box-container nhsuk-u-padding-bottom-5" style="white-space:nowrap">
                         <input type="hidden" name="RegionId" value="@Context.Request.Query["RegionId"]">
-                        <input class="nhsuk-input nhsuk-search__input" type="search" autocomplete="off" id="FilterText" name="FilterText" placeholder="" value="@Model.FilterText">
+                        <input class="nhsuk-input nhsuk-search__input" type="search" autocomplete="off" id="FilterText" name="FilterText" placeholder="" value="@Model.FilterText" @if (errorHasOccurred)
+                        {
+                            <text>aria-describedby="error-summary-title custom-validation-error"</text>
+                        }>
                         <button class="nhsuk-search__submit" type="submit">
                             <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
                                 <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
@@ -38,8 +47,7 @@
                         </button>
 
                     </div>
-
-
+                    </div>
                 </form>
 
                 <details class="nhsuk-details nhsuk-expander">
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkPlaceSearch.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkPlaceSearch.cshtml
index 0422a20d7..eb3510f96 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkPlaceSearch.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkPlaceSearch.cshtml
@@ -25,13 +25,22 @@
 
                 <form asp-controller="Account" asp-action="CreateAccountWorkPlace" method="get">
                     <input type="hidden" name="formSubmission" value="true">
-
+                    <div class="@(errorHasOccurred ? "nhsuk-form-group input-validation-error" : "nhsuk-form-group")">
                     <label for="FilterText" class="nhsuk-body-l nhsuk-u-font-size-19 nhsuk-u-margin-bottom-3">
                         Enter the name, postcode or Organisation Date Service (ODS) code of your place of work.
 
                     </label>
+                    @if (errorHasOccurred)
+                    {
+                        <span class="nhsuk-error-message">
+                            <span class="nhsuk-u-visually-hidden">Error:</span> @CommonValidationErrorMessages.SearchTermRequired
+                        </span>
+                    }
                     <div class="nhsuk-form-group search-box-container nhsuk-u-padding-bottom-5" style="white-space:nowrap">
-                        <input class="nhsuk-input nhsuk-search__input" type="search" autocomplete="off" id="FilterText" name="FilterText" placeholder="" value="@Model.FilterText">
+                        <input class="nhsuk-input nhsuk-search__input" type="search" autocomplete="off" id="FilterText" name="FilterText" placeholder="" value="@Model.FilterText" @if (errorHasOccurred)
+                        {
+                            <text>aria-describedby="error-summary-title custom-validation-error"</text>
+                        }>
                         <button class="nhsuk-search__submit" type="submit">
                             <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
                                 <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
@@ -40,7 +49,7 @@
                         </button>
 
                     </div>
-
+                    </div>
                 </form>
 
                 <details class="nhsuk-details nhsuk-expander">

From 828c161c37d84813e8cc368448c25f71cc674c3b Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Thu, 28 Nov 2024 14:38:10 +0000
Subject: [PATCH 093/143] TD-5080: Issue on 'Enter your start date' screen not
 allowing to add '0' to date field

---
 .../Views/Shared/Components/DateInput/Default.cshtml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
index 341c039ac..b5e869560 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
@@ -121,7 +121,7 @@
                 errorElement.style.visibility = 'hidden';
 
                 setTimeout(function () {
-                    if (value < 1 || value > max || !value.match(/^[0-9]*$/)) {
+                    if (value < 0 || value > max || !value.match(/^[0-9]*$/)) {
                         inputElement.value = inputElement.value.slice(0, -1) + 1;
                         inputElement.value = inputElement.value.slice(0, -1);
                         inputElement.setAttribute('aria-invalid', 'true');

From 11b100d0d087d0a53ae30c6932fa9dd5cc46b2d0 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Mon, 2 Dec 2024 11:28:13 +0000
Subject: [PATCH 094/143] TD-4199: DIG1801: There are some problems with the
 consistency and operation of components

---
 .../Views/Account/CreateAccountCurrentRole.cshtml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCurrentRole.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCurrentRole.cshtml
index 08abb9876..1281e8120 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCurrentRole.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCurrentRole.cshtml
@@ -22,7 +22,7 @@
             <div class="nhsuk-grid-column-two-thirds @(returnToConfirmation ? "nhsuk-u-padding-top-7":string.Empty) nhsuk-u-padding-bottom-9">
                 @if (!returnToConfirmation)
                 {
-                    if (Model.CountryId == "1")
+                    if (Model.CountryId == "1" || errorHasOccurred)
                     {
                         <vc:back-link asp-controller="Account" asp-action="CreateAccountRegionSelection" asp-all-route-data="@routeData" link-text="Back to: Select your region" />
 

From b852f0aefb50c6578f17a02277ebabd34d43e20b Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Mon, 2 Dec 2024 15:23:58 +0000
Subject: [PATCH 095/143] Fixes

---
 LearningHub.Nhs.WebUI/Controllers/AccountController.cs      | 3 ++-
 .../Views/Account/CreateAccountProfessionalRegNumber.cshtml | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
index dac3a38e9..dcd8f5302 100644
--- a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
@@ -656,6 +656,7 @@ public async Task<IActionResult> CreateAccountProfessionalRegNumber(AccountCreat
         /// </summary>
         /// <returns>The <see cref="IActionResult"/>.</returns>
         /// <param name="accountCreationViewModel">accountCreationViewModel.</param>
+        [HttpPost]
         [Route("Registration/CreateAccountGradeSelection")]
         [ResponseCache(CacheProfileName = "Never")]
         [TypeFilter(typeof(RedirectMissingMultiPageFormData), Arguments = new object[] { nameof(MultiPageFormDataFeature.AddRegistrationPrompt) })]
@@ -672,7 +673,7 @@ public async Task<IActionResult> CreateAccountGradeSelection(AccountCreationView
 
             if (string.IsNullOrWhiteSpace(accountCreationViewModel.RegistrationNumber) && accountCreation.MedicalCouncilId.HasValue && (int)accountCreation.MedicalCouncilId > 0)
             {
-                this.ModelState.AddModelError("RegistrationNumber", $"You must provide a {accountCreation.MedicalCouncilCode} Number");
+                this.ModelState.AddModelError("RegistrationNumber", $"{accountCreation.MedicalCouncilName} Number is required");
                 this.ViewBag.Job = await this.jobRoleService.GetByIdAsync(roleId);
                 accountCreationViewModel.CurrentRole = roleId.ToString();
                 return this.View("CreateAccountProfessionalRegNumber", accountCreationViewModel);
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountProfessionalRegNumber.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountProfessionalRegNumber.cshtml
index 4cfe8e2f2..02c2391e0 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountProfessionalRegNumber.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountProfessionalRegNumber.cshtml
@@ -21,7 +21,7 @@
                 <h1 class="nhsuk-heading-xl">Enter your @jobDetails.MedicalCouncilCode number</h1>
 
 
-                <form asp-controller="Account" asp-action="CreateAccountGradeSelection" method="get">
+                <form asp-controller="Account" asp-action="CreateAccountGradeSelection" method="post">
                     <input type="hidden" name="formSubmission" value="true">
                     @if (errorHasOccurred)
                     {
@@ -52,9 +52,7 @@
                                    hint-text=""
                                    autocomplete=""
                                    css-class="nhsuk-u-width-one-half"
-                                   required="true"
-                                   required-client-side-error-message="@jobDetails.MedicalCouncilName Number is required" />
-
+                                   required="false"/>
 
                     <div class="nhsuk-form-group">
                         <button type="submit" class="nhsuk-button">Continue</button>

From f00592fadfae65c6a94ac425e397070eb6580f7a Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Mon, 2 Dec 2024 16:06:27 +0000
Subject: [PATCH 096/143] fixes

---
 LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss
index c43713aaa..4cc9653d5 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/search.scss
@@ -23,6 +23,16 @@
         height: 52px;
         width: 52px;
         padding-top: 0;
+
+        &:focus {
+            background-color: #ffeb3b;
+            border: 0;
+            box-shadow: 0 4px 0 0 #212b32;
+            color: #212b32;
+            outline: 4px solid rgba(0,0,0,0);
+            outline-offset: 4px;
+            box-shadow: 0 -2px #ffeb3b,0 4px #212b32
+        }
     }
 
     .nhsuk-icon__search {

From 3f786e9740288d17ecbfebd6934445781a2a7688 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Wed, 4 Dec 2024 09:22:16 +0000
Subject: [PATCH 097/143] TD-5086: Fixed console errors on LH landing page

---
 .../Views/Shared/_ValidationScriptsPartial.cshtml            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
index eb4f4485d..b1d9144ca 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -21,7 +21,10 @@
 
     let errorElements = [];
     let submitAttempted = false;
-    document.querySelector('form').onsubmit = () => { submitAttempted = true; }
+    const form = document.querySelector('form');
+    if (form) {
+        form.onsubmit = () => { submitAttempted = true; }
+    }
 
     $(function () {
         $('form').each(function () {

From 2689c548f4773501d7d0d08ab482dde15153b564 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Thu, 5 Dec 2024 14:13:18 +0000
Subject: [PATCH 098/143] TD-4184:
 Develop/Fixes/TD-4184-Focus-doesn't-move-to-field-or-error-on-submit

---
 .../Views/Shared/_ValidationScriptsPartial.cshtml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
index b1d9144ca..528616bed 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -23,7 +23,7 @@
     let submitAttempted = false;
     const form = document.querySelector('form');
     if (form) {
-        form.onsubmit = () => { submitAttempted = true; }
+      form.onsubmit = () => { submitAttempted = true; errorElements = []; }
     }
 
     $(function () {

From d1c3ff05c29aaaa607e60b6c9504970ca0b2622c Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Thu, 5 Dec 2024 14:15:42 +0000
Subject: [PATCH 099/143] fixes

---
 LearningHub.Nhs.WebUI/Controllers/AccountController.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
index dcd8f5302..179850674 100644
--- a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
@@ -656,7 +656,6 @@ public async Task<IActionResult> CreateAccountProfessionalRegNumber(AccountCreat
         /// </summary>
         /// <returns>The <see cref="IActionResult"/>.</returns>
         /// <param name="accountCreationViewModel">accountCreationViewModel.</param>
-        [HttpPost]
         [Route("Registration/CreateAccountGradeSelection")]
         [ResponseCache(CacheProfileName = "Never")]
         [TypeFilter(typeof(RedirectMissingMultiPageFormData), Arguments = new object[] { nameof(MultiPageFormDataFeature.AddRegistrationPrompt) })]

From 6c540acc084e91039221d3e0309dfa768426de3d Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Fri, 6 Dec 2024 11:17:48 +0000
Subject: [PATCH 100/143] TD-4183: Corrected the error messages for the start
 date.

---
 .../Components/DateInput/Default.cshtml       | 38 +------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
index b5e869560..d1b0f1294 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
@@ -55,7 +55,6 @@
                            name="@Model.DayId"
                            value="@Model.DayValue"
                            type="text"
-                           pattern="[0-9]*"
                            min="1"
                            max="31"
                            step="1"
@@ -71,7 +70,6 @@
                            name="@Model.MonthId"
                            value="@Model.MonthValue"
                            type="text"
-                           pattern="[0-9]*"
                            min="1"
                            max="12"
                            step="1"
@@ -87,7 +85,6 @@
                            name="@Model.YearId"
                            value="@Model.YearValue"
                            type="text"
-                           pattern="[0-9]*"
                            min="1900"
                            max="9999"
                            step="1"
@@ -99,37 +96,4 @@
             </span>
         </div>
     </fieldset>
-    <script>
-        const fields = [@Model.DayId, @Model.MonthId, @Model.YearId];
-
-        const errorElement = document.getElementById('date-error');
-        for (let field of fields) {
-            const inputElement = document.getElementById(field.id);
-
-            inputElement.addEventListener('input', function (event) {
-
-                if (event.inputType === 'deleteContentBackward') {
-                    return;
-                }
-
-                const value = event.data;
-                const min = parseInt(inputElement.getAttribute('min'));
-                const max = parseInt(inputElement.getAttribute('max'));
-
-                inputElement.setAttribute('aria-invalid', 'false');
-                errorElement.textContent = '';
-                errorElement.style.visibility = 'hidden';
-
-                setTimeout(function () {
-                    if (value < 0 || value > max || !value.match(/^[0-9]*$/)) {
-                        inputElement.value = inputElement.value.slice(0, -1) + 1;
-                        inputElement.value = inputElement.value.slice(0, -1);
-                        inputElement.setAttribute('aria-invalid', 'true');
-                        errorElement.textContent = `Invalid input. Please enter a number between ${min} and ${max}.`;
-                        errorElement.style.visibility = 'visible';
-                    }
-                }, 0);
-            });
-        }
-    </script>
-</div>
+</div>
\ No newline at end of file

From 5c078474105aaf1a53e2d5495f26f38f94c8525e Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Fri, 6 Dec 2024 14:15:59 +0000
Subject: [PATCH 101/143] TD-5085: Showing few issues when creating an account
 on 'Create new account' flow screens

---
 .../Controllers/AccountController.cs          | 71 ++++++++++++-------
 .../Account/CreateAccountSearchRole.cshtml    | 11 ++-
 .../_AccountCreationGradePaging.cshtml        |  3 -
 .../_AccountCreationJobRolePaging.cshtml      |  4 --
 .../_AccountCreationRegionPaging.cshtml       |  3 -
 .../_AccountCreationSpecialtyPaging.cshtml    |  3 -
 .../_AccountCreationWorkPlacePaging.cshtml    |  3 -
 7 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
index 179850674..1281d1d18 100644
--- a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
@@ -469,41 +469,53 @@ public async Task<IActionResult> CreateAccountRegionSelection(AccountCreationVie
         {
             var countryCheck = int.TryParse(accountCreationViewModel.CountryId, out int countryId);
             var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
-            if (string.IsNullOrWhiteSpace(accountCreationViewModel.CountryId) || !countryCheck)
+            if (accountCreationViewModel.CountryId != null)
+            {
+                accountCreation.CountryId = accountCreationViewModel.CountryId;
+            }
+
+            if (accountCreation.CountryId == "1")
+            {
+                var regionData = await this.regionService.GetAllPagedAsync(accountCreationViewModel.CurrentPageIndex, UserRegistrationContentPageSize);
+                return this.View(new AccountCreationListViewModel { Region = regionData.Item2, AccountCreationPaging = new AccountCreationPagingModel { TotalItems = regionData.Item1, PageSize = UserRegistrationContentPageSize, HasItems = regionData.Item1 > 0, CurrentPage = accountCreationViewModel.CurrentPageIndex }, RegionId = accountCreation.RegionId, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
+            }
+            else if (string.IsNullOrWhiteSpace(accountCreationViewModel.CountryId) || !countryCheck)
             {
                 this.ModelState.AddModelError("CountryId", CommonValidationErrorMessages.CountryRequired);
                 var countries = await this.countryService.GetFilteredAsync(accountCreationViewModel.FilterText);
                 return this.View("CreateAccountCountrySelection", new AccountCreationListViewModel { FilterText = accountCreationViewModel.FilterText, CountryList = countries.ToList(), ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
             }
-
-            accountCreation.CountryId = accountCreationViewModel.CountryId;
-            await this.multiPageFormService.SetMultiPageFormData(accountCreation, MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
-            if (countryId != 1)
+            else
             {
-                accountCreationViewModel.RegionId = string.Empty;
-                accountCreation.RegionId = string.Empty;
+                accountCreation.CountryId = accountCreationViewModel.CountryId;
                 await this.multiPageFormService.SetMultiPageFormData(accountCreation, MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
-
-                if (accountCreation.IsLoginWizard)
+                if (countryId != 1)
                 {
-                    return this.CheckConfirmationUpdate() ? this.RedirectToAction("AccountConfirmation", "LoginWizard") : this.RedirectToAction("NextStage", "LoginWizard");
-                }
+                    accountCreationViewModel.RegionId = string.Empty;
+                    accountCreation.RegionId = string.Empty;
+                    await this.multiPageFormService.SetMultiPageFormData(accountCreation, MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
 
-                return this.CheckConfirmationUpdate() ? this.RedirectToAction("CreateAccountConfirmation", new AccountCreationViewModel { LocationId = accountCreation.LocationId }) : this.RedirectToAction("CreateAccountSearchRole", accountCreationViewModel);
-            }
+                    if (accountCreation.IsLoginWizard)
+                    {
+                        return this.CheckConfirmationUpdate() ? this.RedirectToAction("AccountConfirmation", "LoginWizard") : this.RedirectToAction("NextStage", "LoginWizard");
+                    }
 
-            switch (accountCreationViewModel.AccountCreationPagingEnum)
-            {
-                case AccountCreationPagingEnum.NextPageChange:
-                    accountCreationViewModel.CurrentPageIndex += 1;
-                    break;
+                    return this.CheckConfirmationUpdate() ? this.RedirectToAction("CreateAccountConfirmation", new AccountCreationViewModel { LocationId = accountCreation.LocationId }) : this.RedirectToAction("CreateAccountSearchRole", accountCreationViewModel);
+                }
 
-                case AccountCreationPagingEnum.PreviousPageChange:
-                    accountCreationViewModel.CurrentPageIndex -= 1;
-                    break;
-                case AccountCreationPagingEnum.Default:
-                    accountCreationViewModel.CurrentPageIndex = 1;
-                    break;
+                switch (accountCreationViewModel.AccountCreationPagingEnum)
+                {
+                    case AccountCreationPagingEnum.NextPageChange:
+                        accountCreationViewModel.CurrentPageIndex += 1;
+                        break;
+
+                    case AccountCreationPagingEnum.PreviousPageChange:
+                        accountCreationViewModel.CurrentPageIndex -= 1;
+                        break;
+                    case AccountCreationPagingEnum.Default:
+                        accountCreationViewModel.CurrentPageIndex = 1;
+                        break;
+                }
             }
 
             var region = await this.regionService.GetAllPagedAsync(accountCreationViewModel.CurrentPageIndex, UserRegistrationContentPageSize);
@@ -533,6 +545,11 @@ public async Task<IActionResult> CreateAccountSubmitRegionSelection(AccountCreat
                 }
             }
 
+            if (accountCreationViewModel.CountryId != null)
+            {
+                accountCreation.CountryId = accountCreationViewModel.CountryId;
+            }
+
             accountCreation.RegionId = accountCreationViewModel.RegionId;
             await this.multiPageFormService.SetMultiPageFormData(accountCreation, MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
 
@@ -546,7 +563,7 @@ public async Task<IActionResult> CreateAccountSubmitRegionSelection(AccountCreat
                 return this.CheckConfirmationUpdate() ? this.RedirectToAction("AccountConfirmation", "LoginWizard") : this.RedirectToAction("NextStage", "LoginWizard");
             }
 
-            return this.CheckConfirmationUpdate() ? this.RedirectToAction("CreateAccountConfirmation", new AccountCreationViewModel { LocationId = accountCreation.LocationId }) : this.RedirectToAction("CreateAccountSearchRole", new AccountCreationViewModel() { CountryId = accountCreation.CountryId });
+            return this.CheckConfirmationUpdate() ? this.RedirectToAction("CreateAccountConfirmation", new AccountCreationViewModel { LocationId = accountCreation.LocationId }) : this.RedirectToAction("CreateAccountSearchRole", new AccountCreationViewModel() { CountryId = accountCreation.CountryId, RegionId = accountCreation.RegionId });
         }
 
         /// <summary>
@@ -581,7 +598,7 @@ public async Task<IActionResult> CreateAccountCurrentRole(AccountCreationViewMod
                 if (string.IsNullOrWhiteSpace(filterText))
                 {
                     this.ModelState.AddModelError("FilterText", CommonValidationErrorMessages.SearchTermRequired);
-                    return this.View("CreateAccountSearchRole", new AccountCreationViewModel { RegionId = accountCreation.RegionId, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
+                    return this.View("CreateAccountSearchRole", new AccountCreationViewModel { CountryId = accountCreation.CountryId, RegionId = accountCreation.RegionId, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
                 }
             }
 
@@ -598,7 +615,7 @@ public async Task<IActionResult> CreateAccountCurrentRole(AccountCreationViewMod
                 else
                 {
                     this.ModelState.AddModelError("FilterText", CommonValidationErrorMessages.SearchTermRequired);
-                    return this.View("CreateAccountSearchRole", new AccountCreationViewModel { RegionId = accountCreation.RegionId, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
+                    return this.View("CreateAccountSearchRole", new AccountCreationViewModel { CountryId = accountCreation.CountryId, RegionId = accountCreation.RegionId, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
                 }
             }
 
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml
index c8b48178e..e42fd6f45 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml
@@ -15,7 +15,16 @@
         <div class="nhsuk-width-container app-width-container">
             <div class="nhsuk-grid-row">
             <div class="nhsuk-grid-column-two-thirds nhsuk-u-padding-bottom-9">
-                <vc:back-link asp-controller="Account" asp-action="CreateAccountRegionSelection" asp-all-route-data="@routeData" link-text="Back to: Select your region" />
+                @if (Model.CountryId == "1")
+                {
+                  <vc:back-link asp-controller="Account" asp-action="CreateAccountRegionSelection" asp-all-route-data="@routeData" link-text="Back to: Select your region" />
+
+                }
+                else
+                {
+                  <vc:back-link asp-controller="Account" asp-action="CreateAccountCountrySelection" asp-all-route-data="@routeData" link-text="Back to: Select your country" />
+
+                }
                 
                 @if (errorHasOccurred)
                 {
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml
index 003a78163..27c856aee 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml
@@ -24,8 +24,6 @@
     }
 }
 
-@if (showPaging == true)
-{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -69,5 +67,4 @@
             }
         </ul>
     </nav>
-}
 
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml
index 9232336fb..a8bc8a9ae 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml
@@ -24,8 +24,6 @@
     }
 }
 
-@if (showPaging == true)
-{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -69,5 +67,3 @@
             }
         </ul>
     </nav>
-}
-
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml
index 3a3ea02f8..47a4aded4 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml
@@ -24,8 +24,6 @@
     }
 }
 
-@if (showPaging == true)
-{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
         <ul class="nhsuk-list nhsuk-pagination__list">
 
@@ -69,5 +67,4 @@
             }
         </ul>
     </nav>
-}
 
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml
index 0c5f04028..6227b3773 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml
@@ -24,8 +24,6 @@
     }
 }
 
-@if (showPaging == true)
-{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -69,4 +67,3 @@
             }
         </ul>
     </nav>
-}
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml
index ac9518fe8..de4830446 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml
@@ -24,8 +24,6 @@
     }
 }
 
-@if (showPaging == true)
-{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -69,4 +67,3 @@
             }
         </ul>
     </nav>
-}

From 81f6fa51d9173e0b9c70270fb5dfd920476307f9 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Fri, 6 Dec 2024 15:05:21 +0000
Subject: [PATCH 102/143] TD-4193: Corrected the page titles.

---
 .../Scripts/vuesrc/notification/notifications.vue             | 2 +-
 .../Views/Account/CreateAccountConfirmation.cshtml            | 4 ++--
 LearningHub.Nhs.WebUI/Views/Bookmark/Index.cshtml             | 4 ++--
 LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml            | 4 ++--
 LearningHub.Nhs.WebUI/Views/Notification/Index.cshtml         | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notifications.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notifications.vue
index 8801a8eb5..15229ade7 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notifications.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notifications.vue
@@ -2,7 +2,7 @@
     <div class="lh-padding-fluid bg-white">
         <div class="notifications-panel lh-container-xl">
             <div :class="[showMessage ? 'd-none' : 'd-block', 'nhsuk-u-margin-top-7 nhsuk-u-margin-bottom-7']">
-                <h1>System Notifications</h1>
+                <h1>System notifications</h1>
                 <notification ref="priorityNotification"
                               :priorityType="this.NotificationPriority.Priority"
                               :showContent="this.showPriorityContent"
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml
index 93b9e7078..461d773b2 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml
@@ -4,7 +4,7 @@
 @model AccountCreationConfirmation
 @inject IOptions<Settings> settings
 @{
-    ViewData["Title"] = "Confirmation";
+    ViewData["Title"] = "Check your details";
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     AccountCreationTypeEnum accountCreationType = ViewBag.AccountCreationType;
 }
@@ -19,7 +19,7 @@
                 {
                     <vc:error-summary order-of-property-names="@(new[] { nameof(Model) })" />
                 }
-                <h1 class="nhsuk-heading-xl">Check your details</h1>
+                <h1 class="nhsuk-heading-xl">@ViewData["Title"]</h1>
                 <dl class="nhsuk-summary-list">
 
                     <div class="nhsuk-summary-list__row">
diff --git a/LearningHub.Nhs.WebUI/Views/Bookmark/Index.cshtml b/LearningHub.Nhs.WebUI/Views/Bookmark/Index.cshtml
index 95edf55ba..13cd985c2 100644
--- a/LearningHub.Nhs.WebUI/Views/Bookmark/Index.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Bookmark/Index.cshtml
@@ -7,7 +7,7 @@
 }
 
 @{
-    ViewData["Title"] = "My bookmarks";
+    ViewData["Title"] = "Bookmarked learning";
 
     var folders = Model.Where(m => m.BookmarkTypeId == 1).ToDictionary(t => t.Id, t => t.Title);
 
@@ -30,7 +30,7 @@
     <div class="nhsuk-width-container app-width-container nhsuk-u-padding-bottom-9">
         <vc:back-link asp-controller="Home" asp-action="Index" link-text="Back to: Learning Hub" />
 
-        <h1>Bookmarked learning</h1>
+        <h1>@ViewData["Title"]</h1>
 
         <div class="nhsuk-grid-row">
             <div class="nhsuk-grid-column-full">
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml
index 502e2966d..15e78e763 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/Index.cshtml
@@ -1,14 +1,14 @@
 @model LearningHub.Nhs.WebUI.Models.UserProfile.UserProfileSummaryViewModel
 
 @{    
-  ViewData["Title"] = "My Account";
+   ViewData["Title"] = "My account details";
   var isgeneralUser = User.IsInRole("BasicUser");
 }
 <div class="bg-white nhsuk-u-padding-bottom-9">
     <div class="nhsuk-width-container app-width-container">
         <div class="nhsuk-u-reading-width">
             <div class="app-width-container">
-                <h1 class="nhsuk-heading-xl nhsuk-u-padding-top-7">My account details</h1>
+                <h1 class="nhsuk-heading-xl nhsuk-u-padding-top-7">@ViewData["Title"]</h1>
                 @if (isgeneralUser)
                 {
                   <div class="nhsuk-inset-text">
diff --git a/LearningHub.Nhs.WebUI/Views/Notification/Index.cshtml b/LearningHub.Nhs.WebUI/Views/Notification/Index.cshtml
index cfa88c09c..14b3369df 100644
--- a/LearningHub.Nhs.WebUI/Views/Notification/Index.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Notification/Index.cshtml
@@ -1,5 +1,5 @@
 @{
-    ViewData["Title"] = "Notifications";
+    ViewData["Title"] = "System notifications";
 }
 
 <div id="notificationcontainer" v-cloak>

From 95a24a5ddb8eaa8e55a4c78e8895a29a804cf9fb Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Mon, 9 Dec 2024 09:31:29 +0000
Subject: [PATCH 103/143] TD-2396: SIT fixes for the DevId implementaion.

---
 .../Controllers/ResourceController.cs            |  6 +++++-
 .../Views/Resource/Details.cshtml                | 10 ++++++++--
 .../Views/Resource/_DevIdDetails.cshtml          | 16 ++++++++++++----
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs
index 1a662d524..3850c2c1b 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs
@@ -164,7 +164,11 @@ public async Task<IActionResult> GetDevIdDetails(int resourceVersionId)
         public async Task<IActionResult> UpdateDevIdDetails(ResourceVersionDevIdViewModel model)
         {
             var message = string.Empty;
-            if (await this.resourceService.DoesDevIdExistsAsync(model.DevId))
+            if (string.IsNullOrEmpty(model.DevId))
+            {
+                message = "Enter a Dev id for the resource";
+            }
+            else if (await this.resourceService.DoesDevIdExistsAsync(model.DevId))
             {
                 message = "Duplicate";
             }
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/Details.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/Details.cshtml
index 44b2f9b11..5c7b99069 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/Details.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/Details.cshtml
@@ -651,13 +651,19 @@
           {
             <!-- Alert Text -->
             <div class="d-flex ml-5 my-2">
-              <div id="alertInfo" class="alert alert-success">Successfully updated the details</div>
+              <div id="alertInfo" class="alert alert-success">Successfully added the Dev ID.</div>
             </div>
           }
           @if (this.ViewBag.Status == "Duplicate")
           {
             <div class="d-flex ml-5 my-2">
-              <div id="alertInfo" class="alert alert-danger">Dev Id already exists.</div>
+              <div id="alertInfo" class="alert alert-danger">Dev ID already exists.</div>
+            </div>
+          }
+          else if (this.ViewBag.Status  == "Enter a Dev id for the resource")
+          {
+            <div class="d-flex ml-5 my-2">
+              <div id="alertInfo" class="alert alert-danger">You must enter a Dev ID.</div>
             </div>
           }
           <div id="devIdDetails" class="pl-2">
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/_DevIdDetails.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/_DevIdDetails.cshtml
index 7e6c5bf71..1af9e2808 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/_DevIdDetails.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/_DevIdDetails.cshtml
@@ -8,15 +8,23 @@
   <form asp-controller="Resource" asp-action="UpdateDevIdDetails" method="post">
     <div class="row m-0">
       <div class="form-group col-4">
-        <label asp-for="DevId" class="control-label">Development Id</label>
-        <input asp-for="DevId" class="form-control" />
+        <div class="col-12" style="padding-left:0px;" >
+          <dl>
+            <dt>Dev ID: </dt>
+            <dd>
+              @Html.DisplayFor(model => model.DevId)
+            </dd>
+          </dl>
+        </div>
+        <label asp-for="DevId" class="control-label">Add Dev ID</label>
+        <input asp-for="DevId" class="form-control" maxlength="30" />
         <input type="hidden" asp-for="ResourceVersionId" />
       </div>
     </div>
     <div class="form-group col-lg-2 d-flex flex-row justify-content-between">
       <div>
-        <button type="submit" class="btn btn-common btn-success">Save</button>
-      </div>  
+        <button type="submit" class="btn btn-common btn-success nhsuk-button">Save</button>
+      </div>
     </div>
   </form>
 </div>
\ No newline at end of file

From 6f201c5b2c354c63d8a5b6eebafb815db9ab382d Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Mon, 9 Dec 2024 12:29:34 +0000
Subject: [PATCH 104/143] Td-4179: DIG253: A landmark is present on the page
 but it has no content

---
 .../Views/Account/_AccountCreationGradePaging.cshtml         | 5 +++--
 .../Views/Account/_AccountCreationJobRolePaging.cshtml       | 4 +++-
 .../Views/Account/_AccountCreationRegionPaging.cshtml        | 4 +++-
 .../Views/Account/_AccountCreationSpecialtyPaging.cshtml     | 4 +++-
 .../Views/Account/_AccountCreationWorkPlacePaging.cshtml     | 4 +++-
 .../Views/MyAccount/_UserJobRolePaging.cshtml                | 2 +-
 .../Views/MyAccount/_UserPrimarySpecialtyPaging.cshtml       | 2 +-
 .../Views/MyAccount/_UserWorkPlacePaging.cshtml              | 2 +-
 .../Views/MyLearning/_ActivityTablePaging.cshtml             | 2 +-
 9 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml
index 27c856aee..03d66e1a2 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationGradePaging.cshtml
@@ -23,7 +23,8 @@
         }
     }
 }
-
+@if(pagingModel.TotalPages >1)
+{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -67,4 +68,4 @@
             }
         </ul>
     </nav>
-
+}
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml
index a8bc8a9ae..2b469af6b 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationJobRolePaging.cshtml
@@ -23,7 +23,8 @@
         }
     }
 }
-
+@if(pagingModel.TotalPages >1)
+{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -67,3 +68,4 @@
             }
         </ul>
     </nav>
+}
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml
index 47a4aded4..f3f1c7506 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationRegionPaging.cshtml
@@ -23,7 +23,8 @@
         }
     }
 }
-
+@if(pagingModel.TotalPages >1)
+{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
         <ul class="nhsuk-list nhsuk-pagination__list">
 
@@ -67,4 +68,5 @@
             }
         </ul>
     </nav>
+}
 
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml
index 6227b3773..ddeb89483 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationSpecialtyPaging.cshtml
@@ -23,7 +23,8 @@
         }
     }
 }
-
+@if(pagingModel.TotalPages >1)
+{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -67,3 +68,4 @@
             }
         </ul>
     </nav>
+}
diff --git a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml
index de4830446..11080dada 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/_AccountCreationWorkPlacePaging.cshtml
@@ -23,7 +23,8 @@
         }
     }
 }
-
+@if(pagingModel.TotalPages >1)
+{
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
     <ul class="nhsuk-list nhsuk-pagination__list">
             
@@ -67,3 +68,4 @@
             }
         </ul>
     </nav>
+}
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserJobRolePaging.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserJobRolePaging.cshtml
index 9f5a28e14..19ae7d819 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserJobRolePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserJobRolePaging.cshtml
@@ -22,7 +22,7 @@
     }
 }
 
-@if (showPaging == true)
+@if (pagingModel.TotalPages > 1)
 {
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
         <ul class="nhsuk-list nhsuk-pagination__list">
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserPrimarySpecialtyPaging.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserPrimarySpecialtyPaging.cshtml
index f7513314d..3144b464f 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserPrimarySpecialtyPaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserPrimarySpecialtyPaging.cshtml
@@ -22,7 +22,7 @@
     }
 }
 
-@if (showPaging == true)
+@if (pagingModel.TotalPages > 1)
 {
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
         <ul class="nhsuk-list nhsuk-pagination__list">
diff --git a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserWorkPlacePaging.cshtml b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserWorkPlacePaging.cshtml
index fb6fb7e5a..38b32427e 100644
--- a/LearningHub.Nhs.WebUI/Views/MyAccount/_UserWorkPlacePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyAccount/_UserWorkPlacePaging.cshtml
@@ -22,7 +22,7 @@
     }
 }
 
-@if (showPaging == true)
+@if (pagingModel.TotalPages > 1)
 {
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
         <ul class="nhsuk-list nhsuk-pagination__list">
diff --git a/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTablePaging.cshtml b/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTablePaging.cshtml
index 7ff229639..2a67789be 100644
--- a/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTablePaging.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/MyLearning/_ActivityTablePaging.cshtml
@@ -28,7 +28,7 @@
     previousRouteData["MyLearningFormActionType"] = MyLearningFormActionTypeEnum.PreviousPageChange.ToString();
 }
 
-@if (showPaging == true)
+@if (pagingModel.TotalPages > 1)
 {
     <nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
         <ul class="nhsuk-list nhsuk-pagination__list">

From f0254d191d50c4f1fdbf58ec47be62fc4565d856 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Wed, 11 Dec 2024 10:41:30 +0000
Subject: [PATCH 105/143] TD-4196: Non-interactive content receives focus
 without good reason

---
 .../Scripts/vuesrc/mycontributions/gridcardcomponent.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/gridcardcomponent.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/gridcardcomponent.vue
index 6b06c4a3e..2c6a223b6 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/gridcardcomponent.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/gridcardcomponent.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="panel-card-container">
 
-        <div tabindex="0" class="my-contributions-panel-card h-100">
+        <div class="my-contributions-panel-card h-100">
 
             <div class="h-100 d-flex flex-column">
                 <div class="d-flex flex-row justify-content-start my-4">

From 7e197e9ff3f8bf21d91e7e30504c24576b54eac3 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 11 Dec 2024 11:43:22 +0000
Subject: [PATCH 106/143] TD-4190:DIG702: Content becomes lost or obscured at
 low resolution or scrolling in 2 dimensions is required (reflow 320 x 256)

---
 .../contribute-resource/SelectResourceTypeContainer.vue  | 9 ++++++++-
 .../Scripts/vuesrc/mycontributions/mycontributions.vue   | 1 +
 LearningHub.Nhs.WebUI/Styles/sections/_all.scss          | 4 ++++
 .../Views/ContributeResource/ContributeResource.cshtml   | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceTypeContainer.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceTypeContainer.vue
index e077efa9f..f5cd08b66 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceTypeContainer.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/SelectResourceTypeContainer.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="lh-padding-fluid">
+    <div class="lh-padding-fluid select-resource-type">
         <div class="lh-container-xl">
             <h2 id="title-label" class="nhsuk-heading-l">Select a resource type</h2>
             <div v-if="!contributeResourceAVFlag" class="align-self-center">
@@ -53,3 +53,10 @@
         }
     });
 </script>
+<style lang="scss" scoped>
+    @use '../../../Styles/abstracts/all' as *;
+
+    .select-resource-type {
+       padding-left: 0.1rem !important;
+    }
+</style>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributions.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributions.vue
index 2ac4483e8..f133b9135 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributions.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributions.vue
@@ -392,6 +392,7 @@
     @media (max-width: 768px) {
         .dropdown-toggle {
             display: block !important;
+            white-space: wrap !important;
         }
     }
 
diff --git a/LearningHub.Nhs.WebUI/Styles/sections/_all.scss b/LearningHub.Nhs.WebUI/Styles/sections/_all.scss
index 03ad5dc3e..22c55622d 100644
--- a/LearningHub.Nhs.WebUI/Styles/sections/_all.scss
+++ b/LearningHub.Nhs.WebUI/Styles/sections/_all.scss
@@ -420,6 +420,10 @@ div.contribute {
       }
     }
   }
+  .contriburecontainer
+  {
+      margin-left : -100px;
+  }
 }
 
 /* end contribute*/
diff --git a/LearningHub.Nhs.WebUI/Views/ContributeResource/ContributeResource.cshtml b/LearningHub.Nhs.WebUI/Views/ContributeResource/ContributeResource.cshtml
index 0c421eb93..63fe9d73c 100644
--- a/LearningHub.Nhs.WebUI/Views/ContributeResource/ContributeResource.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/ContributeResource/ContributeResource.cshtml
@@ -5,7 +5,7 @@
     @* <link href="https://amp.azure.net/libs/amp/2.3.8/skins/amp-default/azuremediaplayer.min.css" type="text/css" rel="stylesheet" asp-append-version="true" /> *@
 }
 
-    <div id="contributecontainer">
+<div id="contributecontainer" class="contriburecontainer">
         @* This empty <router-view> is populated by the Vue.js code *@
         <router-view :keep-user-session-alive-interval-seconds="@ViewBag.KeepUserSessionAliveIntervalSeconds"></router-view>
     </div>

From a87f8fbb4a83c7fd05c5490a74104482eadd4611 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 11 Dec 2024 16:28:33 +0000
Subject: [PATCH 107/143] TD-4199: DIG1801: There are some problems with the
 consistency and operation of components

---
 LearningHub.Nhs.WebUI/Controllers/AccountController.cs       | 5 +++--
 .../Views/Account/CreateAccountCurrentRole.cshtml            | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
index 1281d1d18..ceb738db6 100644
--- a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
@@ -648,15 +648,16 @@ public async Task<IActionResult> CreateAccountCurrentRole(AccountCreationViewMod
         public async Task<IActionResult> CreateAccountProfessionalRegNumber(AccountCreationViewModel accountCreationViewModel)
         {
             var roleCheck = int.TryParse(accountCreationViewModel.CurrentRole, out int roleId);
+            var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
+
             if (string.IsNullOrWhiteSpace(accountCreationViewModel.CurrentRole) || !roleCheck)
             {
                 this.ModelState.AddModelError("CurrentRole", CommonValidationErrorMessages.RoleRequired);
                 var jobroles = await this.jobRoleService.GetPagedFilteredAsync(accountCreationViewModel.FilterText, 1, UserRegistrationContentPageSize);
-                return this.View("CreateAccountCurrentRole", new AccountCreationListViewModel { FilterText = accountCreationViewModel.FilterText, RoleList = jobroles.Item2, AccountCreationPaging = new AccountCreationPagingModel { TotalItems = jobroles.Item1, PageSize = UserRegistrationContentPageSize, HasItems = jobroles.Item1 > 0, CurrentPage = 1 }, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
+                return this.View("CreateAccountCurrentRole", new AccountCreationListViewModel { FilterText = accountCreationViewModel.FilterText,  CountryId = accountCreation.CountryId,  RoleList = jobroles.Item2, AccountCreationPaging = new AccountCreationPagingModel { TotalItems = jobroles.Item1, PageSize = UserRegistrationContentPageSize, HasItems = jobroles.Item1 > 0, CurrentPage = 1 }, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
             }
 
             var jobrole = await this.jobRoleService.GetByIdAsync(roleId);
-            var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
             accountCreation.CurrentRole = jobrole.Id.ToString();
             accountCreation.CurrentRoleName = jobrole.Name;
             accountCreation.MedicalCouncilId = jobrole.MedicalCouncilId;
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCurrentRole.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCurrentRole.cshtml
index 1281e8120..f772e88bf 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCurrentRole.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCurrentRole.cshtml
@@ -22,7 +22,7 @@
             <div class="nhsuk-grid-column-two-thirds @(returnToConfirmation ? "nhsuk-u-padding-top-7":string.Empty) nhsuk-u-padding-bottom-9">
                 @if (!returnToConfirmation)
                 {
-                    if (Model.CountryId == "1" || errorHasOccurred)
+          if (Model.CountryId == "1") //|| errorHasOccurred
                     {
                         <vc:back-link asp-controller="Account" asp-action="CreateAccountRegionSelection" asp-all-route-data="@routeData" link-text="Back to: Select your region" />
 

From 77954ef990ce091313dee394c0dfe73702dfdb2a Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 11 Dec 2024 16:40:31 +0000
Subject: [PATCH 108/143] fixed the space issues

---
 LearningHub.Nhs.WebUI/Controllers/AccountController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
index ceb738db6..068e81cdf 100644
--- a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
@@ -654,7 +654,7 @@ public async Task<IActionResult> CreateAccountProfessionalRegNumber(AccountCreat
             {
                 this.ModelState.AddModelError("CurrentRole", CommonValidationErrorMessages.RoleRequired);
                 var jobroles = await this.jobRoleService.GetPagedFilteredAsync(accountCreationViewModel.FilterText, 1, UserRegistrationContentPageSize);
-                return this.View("CreateAccountCurrentRole", new AccountCreationListViewModel { FilterText = accountCreationViewModel.FilterText,  CountryId = accountCreation.CountryId,  RoleList = jobroles.Item2, AccountCreationPaging = new AccountCreationPagingModel { TotalItems = jobroles.Item1, PageSize = UserRegistrationContentPageSize, HasItems = jobroles.Item1 > 0, CurrentPage = 1 }, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
+                return this.View("CreateAccountCurrentRole", new AccountCreationListViewModel { FilterText = accountCreationViewModel.FilterText, CountryId = accountCreation.CountryId, RoleList = jobroles.Item2, AccountCreationPaging = new AccountCreationPagingModel { TotalItems = jobroles.Item1, PageSize = UserRegistrationContentPageSize, HasItems = jobroles.Item1 > 0, CurrentPage = 1 }, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
             }
 
             var jobrole = await this.jobRoleService.GetByIdAsync(roleId);

From a8200357e556092e7bfda066a7eb6b94120100b5 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Fri, 13 Dec 2024 11:29:05 +0000
Subject: [PATCH 109/143] TD-2396: Dev Id implementaion SIT fixes

---
 .../LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs
index 3850c2c1b..845a12a66 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs
@@ -168,12 +168,13 @@ public async Task<IActionResult> UpdateDevIdDetails(ResourceVersionDevIdViewMode
             {
                 message = "Enter a Dev id for the resource";
             }
-            else if (await this.resourceService.DoesDevIdExistsAsync(model.DevId))
+            else if (await this.resourceService.DoesDevIdExistsAsync(model.DevId.Trim()))
             {
                 message = "Duplicate";
             }
             else
             {
+                model.DevId = model.DevId.Trim();
                 await this.resourceService.UpdateDevIdDetailsAsync(model);
                 message = "Success";
             }

From e0acca56180ffbf34aa0347f4acebad6a82e2de5 Mon Sep 17 00:00:00 2001
From: Anju Jose <Anju.Jose@hee.nhs.uk>
Date: Mon, 16 Dec 2024 14:08:27 +0000
Subject: [PATCH 110/143] update changes

---
 .../LearningHub.Nhs.AdminUI.csproj            | 1253 +++++++++--------
 .../LearningHub.Nhs.Api.csproj                |  125 +-
 2 files changed, 696 insertions(+), 682 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
index 3eb1d8323..5be3c7dcf 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
+++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
@@ -1,642 +1,649 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <UserSecretsId>31abd8b9-4223-4ff3-896b-a46530c9e15c</UserSecretsId>
-    <ApplicationInsightsResourceId>/subscriptions/57c55d5f-78c1-4373-a021-ff8357548f51/resourceGroups/LearningHubNhsUk-AdminUI-Prod-RG/providers/microsoft.insights/components/LearningHubNhsUk-AdminUI-Prod</ApplicationInsightsResourceId>
-    <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-	<Platforms>x64</Platforms>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<AssemblyVersion>1.0.0.0</AssemblyVersion>
+		<FileVersion>1.0.0.0</FileVersion>
+		<Version>1.0.0</Version>
+		<UserSecretsId>31abd8b9-4223-4ff3-896b-a46530c9e15c</UserSecretsId>
+		<ApplicationInsightsResourceId>/subscriptions/57c55d5f-78c1-4373-a021-ff8357548f51/resourceGroups/LearningHubNhsUk-AdminUI-Prod-RG/providers/microsoft.insights/components/LearningHubNhsUk-AdminUI-Prod</ApplicationInsightsResourceId>
+		<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<Platforms>x64</Platforms>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Views\Notification\**" />
-    <Content Remove="Views\Notification\**" />
-    <EmbeddedResource Remove="Views\Notification\**" />
-    <None Remove="Views\Notification\**" />
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Remove="Views\Notification\**" />
+		<Content Remove="Views\Notification\**" />
+		<EmbeddedResource Remove="Views\Notification\**" />
+		<None Remove="Views\Notification\**" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Content Remove="bundleconfig.json" />
-    <Content Remove="compilerconfig.json" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <TypeScriptCompile Remove="Scripts\vuesrc\content-structure\contentStructureContainer.ts" />
-    <TypeScriptCompile Remove="Scripts\vuesrc\content-structure\contentStructureRouter.ts" />
-    <TypeScriptCompile Remove="Scripts\vuesrc\content\contentContainer.ts" />
-    <TypeScriptCompile Remove="Scripts\vuesrc\content\contentPageListContainer.ts" />
-    <TypeScriptCompile Remove="Scripts\vuesrc\content\contentRouter.ts" />
-    <TypeScriptCompile Remove="Scripts\vuesrc\home\home.ts" />
-  </ItemGroup>
+	<ItemGroup>
+		<Content Remove="bundleconfig.json" />
+		<Content Remove="compilerconfig.json" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <_ContentIncludedByDefault Remove="bundleconfig.json" />
-  </ItemGroup>
+	<ItemGroup>
+		<TypeScriptCompile Remove="Scripts\vuesrc\content-structure\contentStructureContainer.ts" />
+		<TypeScriptCompile Remove="Scripts\vuesrc\content-structure\contentStructureRouter.ts" />
+		<TypeScriptCompile Remove="Scripts\vuesrc\content\contentContainer.ts" />
+		<TypeScriptCompile Remove="Scripts\vuesrc\content\contentPageListContainer.ts" />
+		<TypeScriptCompile Remove="Scripts\vuesrc\content\contentRouter.ts" />
+		<TypeScriptCompile Remove="Scripts\vuesrc\home\home.ts" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Content Include="node_modules\%40ckeditor\ckeditor5-build-classic\package.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-core\lang\contexts.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-core\package.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-engine\package.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-engine\theme\placeholder.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-heading\lang\contexts.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-heading\package.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-heading\theme\heading.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-paragraph\package.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\lang\contexts.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\package.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\button\button.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\button\switchbutton.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\colorgrid\colorgrid.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\dropdown.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\listdropdown.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\splitbutton.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\toolbardropdown.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\editorui\editorui.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\icon\icon.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\inputtext\inputtext.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\labeledinput\labeledinput.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\label\label.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\list\list.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\balloonpanel.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\balloonrotator.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\fakepanel.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\stickypanel.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\toolbar\blocktoolbar.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\toolbar\toolbar.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\tooltip\mixins\_tooltip.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\tooltip\tooltip.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\globals.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\_hidden.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\_reset.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\_zindex.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\mixins\_dir.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\mixins\_rwd.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\mixins\_unselectable.css" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-utils\package.json" />
-    <Content Include="node_modules\%40ckeditor\ckeditor5-vue\package.json" />
-  </ItemGroup>
+	<ItemGroup>
+		<_ContentIncludedByDefault Remove="bundleconfig.json" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
-    <PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
-    <PackageReference Include="BuildWebCompiler" Version="1.12.405" />
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-    <PackageReference Include="FluentValidation" Version="10.3.4" />
-    <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
-    <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
-	<PackageReference Include="IdentityModel" Version="4.4.0" />
-    <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
-    <PackageReference Include="Microsoft.FeatureManagement" Version="3.2.0" />
-    <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.14.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.1" />
-    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
-    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.5.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
-    <PackageReference Include="MK.IO" Version="1.6.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
-  </ItemGroup>
+	<ItemGroup>
+		<Content Include="node_modules\%40ckeditor\ckeditor5-build-classic\package.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-core\lang\contexts.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-core\package.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-engine\package.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-engine\theme\placeholder.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-heading\lang\contexts.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-heading\package.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-heading\theme\heading.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-paragraph\package.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\lang\contexts.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\package.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\button\button.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\button\switchbutton.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\colorgrid\colorgrid.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\dropdown.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\listdropdown.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\splitbutton.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\dropdown\toolbardropdown.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\editorui\editorui.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\icon\icon.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\inputtext\inputtext.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\labeledinput\labeledinput.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\label\label.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\list\list.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\balloonpanel.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\balloonrotator.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\fakepanel.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\panel\stickypanel.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\toolbar\blocktoolbar.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\toolbar\toolbar.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\tooltip\mixins\_tooltip.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\components\tooltip\tooltip.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\globals.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\_hidden.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\_reset.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\globals\_zindex.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\mixins\_dir.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\mixins\_rwd.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-ui\theme\mixins\_unselectable.css" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-utils\package.json" />
+		<Content Include="node_modules\%40ckeditor\ckeditor5-vue\package.json" />
+	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
+		<PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
+		<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
+		<PackageReference Include="BuildWebCompiler" Version="1.12.405" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="FluentValidation" Version="10.3.4" />
+		<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
+		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
+		<PackageReference Include="IdentityModel" Version="4.4.0" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
+		<PackageReference Include="Microsoft.FeatureManagement" Version="3.2.0" />
+		<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.2.0" />
+		<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
+		<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.14.1" />
+		<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.1" />
+		<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
+		<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.5.2">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
+		<PackageReference Include="MK.IO" Version="1.6.0" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
+		<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-    <Folder Include="Scripts\vuesrc\content\upload\" />
-    <Folder Include="Scripts\vuesrc\helpers\" />
-	 <Folder Include="wwwroot\lib\fontawesome-free-6.4.2-web\" />
-  </ItemGroup>
 
+	<ItemGroup>
+		<Folder Include="Properties\" />
+		<Folder Include="Scripts\vuesrc\content\upload\" />
+		<Folder Include="Scripts\vuesrc\helpers\" />
+		<Folder Include="wwwroot\lib\fontawesome-free-6.4.2-web\" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Include="bundleconfig.json" />
-    <None Include="compilerconfig.json" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\ckeditor.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\ckeditor.js.map" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\af.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ar.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ast.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\az.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\bg.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ca.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\cs.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\da.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\de-ch.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\de.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\el.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\en-au.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\en-gb.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\eo.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\es.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\et.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\eu.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\fa.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\fi.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\fr.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\gl.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\gu.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\he.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\hr.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\hu.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\id.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\it.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ja.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\km.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\kn.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ko.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ku.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\lt.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\lv.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ms.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\nb.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ne.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\nl.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\no.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\oc.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\pl.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\pt-br.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\pt.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ro.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ru.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\si.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sk.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sl.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sq.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sr-latn.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sr.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sv.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\tr.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\tt.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ug.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\uk.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\vi.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\zh-cn.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\zh.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-build-classic\README.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\af.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ar.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ast.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\az.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\bg.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ca.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\cs.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\da.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\de.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\el.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\en-au.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\en-gb.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\en.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\eo.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\es.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\et.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\eu.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\fa.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\fi.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\fr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\gl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\he.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\hr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\hu.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\id.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\it.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ja.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\km.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\kn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ko.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ku.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\lt.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\lv.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\nb.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ne.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\nl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\no.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\oc.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\pl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\pt-br.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\pt.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ro.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ru.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sk.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sq.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sr-latn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sv.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\tr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\tt.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ug.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\uk.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\vi.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\zh-cn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\zh.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\README.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\command.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\commandcollection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editingkeystrokehandler.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editor.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editorconfig.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editorui.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editorwithui.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\attachtoform.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\dataapimixin.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\elementapimixin.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\securesourceelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\multicommand.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\pendingactions.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\plugin.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\src\plugincollection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\cancel.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\check.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\eraser.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\image.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\low-vision.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-center.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-full-width.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-left.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-right.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\pencil.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\pilcrow.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\quote.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\three-vertical-dots.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\README.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\controller\datacontroller.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\controller\editingcontroller.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\conversion.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\conversionhelpers.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\downcastdispatcher.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\downcasthelpers.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\mapper.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\modelconsumable.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\upcastdispatcher.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\upcasthelpers.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\viewconsumable.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\basichtmlwriter.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\dataprocessor.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\htmldataprocessor.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\htmlwriter.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\xmldataprocessor.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\model.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\operationreplayer.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\utils.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\view.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\batch.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\differ.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\document.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\documentfragment.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\documentselection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\element.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\history.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\item.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\liveposition.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\liverange.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\markercollection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\model.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\node.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\nodelist.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\attributeoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\detachoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\insertoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\markeroperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\mergeoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\moveoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\nooperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\operation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\operationfactory.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\renameoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\rootattributeoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\splitoperation.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\transform.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\utils.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\position.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\range.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\rootelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\schema.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\selection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\text.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\textproxy.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\treewalker.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\deletecontent.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\getselectedcontent.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\insertcontent.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\modifyselection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\selection-post-fixer.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\writer.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\utils\bindtwostepcarettoattribute.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\attributeelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\containerelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\document.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\documentfragment.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\documentselection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\domconverter.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\downcastwriter.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\editableelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\element.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\elementdefinition.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\emptyelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\filler.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\item.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\matcher.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\node.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\clickobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\compositionobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\domeventdata.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\domeventobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\fakeselectionobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\focusobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\inputobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\keyobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\mouseobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\mutationobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\observer.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\selectionobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\placeholder.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\position.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\range.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\renderer.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\rooteditableelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\selection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\text.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\textproxy.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\treewalker.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\uielement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\upcastwriter.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\view.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ar.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\az.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\bg.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ca.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\cs.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\da.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\de.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\el.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\en-au.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\en-gb.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\en.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\eo.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\es.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\et.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\eu.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\fa.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\fi.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\fr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\gl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\he.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\hr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\hu.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\id.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\it.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ja.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\km.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\kn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ko.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ku.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\lt.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\lv.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\nb.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ne.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\nl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\no.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\pl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\pt-br.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\pt.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ro.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ru.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sk.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sq.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sr-latn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sv.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\tr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ug.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\uk.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\vi.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\zh-cn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\zh.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\README.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\src\heading.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingbuttonsui.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingcommand.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingediting.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingui.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\src\title.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\src\utils.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading1.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading2.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading3.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading4.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading5.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading6.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-paragraph\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-paragraph\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-paragraph\README.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-paragraph\src\paragraph.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-paragraph\src\paragraphbuttonui.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-paragraph\src\paragraphcommand.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-paragraph\theme\icons\paragraph.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ar.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ast.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\az.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\cs.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\da.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\de-ch.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\de.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\el.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\en-au.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\en-gb.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\en.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\eo.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\es.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\et.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\eu.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\fa.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\fi.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\fr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\gl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\he.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\hr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\hu.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\id.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\it.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ja.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\km.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\kn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ku.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\lt.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\lv.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\nb.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ne.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\nl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\no.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\pl.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\pt-br.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\pt.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ro.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ru.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sk.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sq.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sr-latn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sv.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\tr.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ug.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\uk.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\vi.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\zh-cn.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\zh.po" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\README.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\bindings\clickoutsidehandler.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\bindings\preventdefault.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\bindings\submithandler.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\button\button.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\button\buttonview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\button\switchbuttonview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\colorgrid\colorgridview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\colorgrid\colortileview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\componentfactory.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\button\dropdownbutton.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\button\dropdownbuttonview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\button\splitbuttonview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\dropdownpanelfocusable.jsdoc" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\dropdownpanelview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\dropdownview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\utils.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editableui\editableuiview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editableui\inline\inlineeditableuiview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editorui\boxed\boxededitoruiview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editorui\editoruiview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\focuscycler.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\icon\iconview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\iframe\iframeview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\inputtext\inputtextview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\labeledinput\labeledinputview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\label\labelview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\list\listitemview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\list\listseparatorview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\list\listview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\model.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\notification\notification.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\panel\balloon\balloonpanelview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\panel\balloon\contextualballoon.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\panel\sticky\stickypanelview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\template.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\balloon\balloontoolbar.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\block\blockbuttonview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\block\blocktoolbar.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\enabletoolbarkeyboardfocus.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\normalizetoolbarconfig.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\toolbarseparatorview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\toolbarview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\tooltip\tooltipview.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\view.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\src\viewcollection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\color-tile-check.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\dropdown-arrow.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\next-arrow.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\previous-arrow.svg" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\README.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\areconnectedthroughproperties.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\ckeditorerror.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\collection.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\comparearrays.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\config.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\count.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\diff.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\difftochanges.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\createelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\emittermixin.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getancestors.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getborderwidths.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getcommonancestor.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getdatafromelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getpositionedancestor.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getresizeobserver.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\global.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\indexof.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\insertat.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\isnode.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\isrange.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\istext.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\iswindow.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\position.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\rect.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\remove.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\scroll.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\setdatainelement.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\tounit.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\elementreplacer.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\emittermixin.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\env.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\eventinfo.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\fastdiff.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\first.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\focustracker.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\isiterable.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\keyboard.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\keystrokehandler.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\locale.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\mapsequal.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\mix.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\nth.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\objecttomap.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\observablemixin.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\priorities.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\spy.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\tomap.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\translation-service.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\uid.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\unicode.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-utils\src\version.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-vue\CHANGELOG.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-vue\dist\ckeditor.js" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-vue\dist\ckeditor.js.map" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-vue\LICENSE.md" />
-    <None Include="node_modules\%40ckeditor\ckeditor5-vue\README.md" />
-    <None Include="Scripts\vuesrc\content-structure\contentStructureContainer.ts" />
-    <None Include="Scripts\vuesrc\content-structure\contentStructureRouter.ts" />
-    <None Include="Scripts\vuesrc\content\contentRouter.ts" />
-    <None Include="Scripts\vuesrc\content\contentContainer.ts" />
-    <None Include="Scripts\vuesrc\content\contentPageListContainer.ts" />
-    <None Include="Scripts\vuesrc\home\home.ts" />
-    <None Include="Views\ExternalSystem\Index.cshtml" />
-  </ItemGroup>
 
+	<ItemGroup>
+		<None Include="bundleconfig.json" />
+		<None Include="compilerconfig.json" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\ckeditor.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\ckeditor.js.map" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\af.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ar.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ast.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\az.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\bg.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ca.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\cs.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\da.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\de-ch.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\de.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\el.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\en-au.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\en-gb.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\eo.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\es.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\et.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\eu.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\fa.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\fi.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\fr.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\gl.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\gu.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\he.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\hr.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\hu.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\id.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\it.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ja.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\km.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\kn.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ko.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ku.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\lt.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\lv.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ms.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\nb.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ne.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\nl.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\no.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\oc.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\pl.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\pt-br.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\pt.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ro.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ru.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\si.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sk.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sl.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sq.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sr-latn.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sr.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\sv.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\tr.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\tt.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\ug.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\uk.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\vi.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\zh-cn.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\build\translations\zh.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-build-classic\README.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\af.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ar.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ast.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\az.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\bg.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ca.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\cs.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\da.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\de.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\el.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\en-au.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\en-gb.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\en.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\eo.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\es.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\et.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\eu.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\fa.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\fi.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\fr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\gl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\he.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\hr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\hu.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\id.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\it.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ja.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\km.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\kn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ko.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ku.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\lt.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\lv.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\nb.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ne.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\nl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\no.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\oc.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\pl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\pt-br.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\pt.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ro.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ru.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sk.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sq.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sr-latn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\sv.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\tr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\tt.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\ug.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\uk.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\vi.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\zh-cn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\lang\translations\zh.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\README.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\command.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\commandcollection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editingkeystrokehandler.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editor.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editorconfig.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editorui.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\editorwithui.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\attachtoform.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\dataapimixin.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\elementapimixin.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\editor\utils\securesourceelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\multicommand.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\pendingactions.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\plugin.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\src\plugincollection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\cancel.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\check.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\eraser.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\image.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\low-vision.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-center.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-full-width.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-left.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\object-right.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\pencil.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\pilcrow.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\quote.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-core\theme\icons\three-vertical-dots.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\README.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\controller\datacontroller.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\controller\editingcontroller.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\conversion.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\conversionhelpers.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\downcastdispatcher.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\downcasthelpers.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\mapper.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\modelconsumable.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\upcastdispatcher.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\upcasthelpers.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\conversion\viewconsumable.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\basichtmlwriter.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\dataprocessor.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\htmldataprocessor.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\htmlwriter.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dataprocessor\xmldataprocessor.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\model.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\operationreplayer.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\utils.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\dev-utils\view.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\batch.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\differ.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\document.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\documentfragment.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\documentselection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\element.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\history.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\item.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\liveposition.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\liverange.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\markercollection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\model.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\node.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\nodelist.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\attributeoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\detachoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\insertoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\markeroperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\mergeoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\moveoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\nooperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\operation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\operationfactory.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\renameoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\rootattributeoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\splitoperation.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\transform.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\operation\utils.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\position.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\range.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\rootelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\schema.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\selection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\text.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\textproxy.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\treewalker.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\deletecontent.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\getselectedcontent.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\insertcontent.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\modifyselection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\utils\selection-post-fixer.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\model\writer.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\utils\bindtwostepcarettoattribute.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\attributeelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\containerelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\document.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\documentfragment.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\documentselection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\domconverter.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\downcastwriter.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\editableelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\element.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\elementdefinition.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\emptyelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\filler.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\item.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\matcher.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\node.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\clickobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\compositionobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\domeventdata.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\domeventobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\fakeselectionobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\focusobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\inputobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\keyobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\mouseobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\mutationobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\observer.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\observer\selectionobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\placeholder.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\position.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\range.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\renderer.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\rooteditableelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\selection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\text.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\textproxy.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\treewalker.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\uielement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\upcastwriter.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-engine\src\view\view.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ar.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\az.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\bg.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ca.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\cs.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\da.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\de.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\el.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\en-au.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\en-gb.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\en.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\eo.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\es.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\et.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\eu.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\fa.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\fi.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\fr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\gl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\he.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\hr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\hu.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\id.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\it.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ja.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\km.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\kn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ko.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ku.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\lt.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\lv.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\nb.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ne.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\nl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\no.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\pl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\pt-br.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\pt.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ro.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ru.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sk.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sq.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sr-latn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\sv.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\tr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\ug.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\uk.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\vi.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\zh-cn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\lang\translations\zh.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\README.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\src\heading.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingbuttonsui.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingcommand.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingediting.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\src\headingui.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\src\title.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\src\utils.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading1.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading2.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading3.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading4.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading5.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-heading\theme\icons\heading6.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-paragraph\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-paragraph\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-paragraph\README.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-paragraph\src\paragraph.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-paragraph\src\paragraphbuttonui.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-paragraph\src\paragraphcommand.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-paragraph\theme\icons\paragraph.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ar.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ast.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\az.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\cs.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\da.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\de-ch.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\de.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\el.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\en-au.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\en-gb.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\en.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\eo.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\es.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\et.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\eu.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\fa.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\fi.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\fr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\gl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\he.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\hr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\hu.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\id.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\it.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ja.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\km.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\kn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ku.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\lt.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\lv.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\nb.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ne.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\nl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\no.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\pl.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\pt-br.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\pt.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ro.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ru.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sk.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sq.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sr-latn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\sv.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\tr.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\ug.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\uk.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\vi.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\zh-cn.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\lang\translations\zh.po" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\README.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\bindings\clickoutsidehandler.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\bindings\preventdefault.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\bindings\submithandler.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\button\button.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\button\buttonview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\button\switchbuttonview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\colorgrid\colorgridview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\colorgrid\colortileview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\componentfactory.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\button\dropdownbutton.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\button\dropdownbuttonview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\button\splitbuttonview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\dropdownpanelfocusable.jsdoc" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\dropdownpanelview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\dropdownview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\dropdown\utils.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editableui\editableuiview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editableui\inline\inlineeditableuiview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editorui\boxed\boxededitoruiview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\editorui\editoruiview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\focuscycler.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\icon\iconview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\iframe\iframeview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\inputtext\inputtextview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\labeledinput\labeledinputview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\label\labelview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\list\listitemview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\list\listseparatorview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\list\listview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\model.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\notification\notification.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\panel\balloon\balloonpanelview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\panel\balloon\contextualballoon.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\panel\sticky\stickypanelview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\template.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\balloon\balloontoolbar.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\block\blockbuttonview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\block\blocktoolbar.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\enabletoolbarkeyboardfocus.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\normalizetoolbarconfig.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\toolbarseparatorview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\toolbar\toolbarview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\tooltip\tooltipview.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\view.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\src\viewcollection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\color-tile-check.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\dropdown-arrow.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\next-arrow.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-ui\theme\icons\previous-arrow.svg" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\README.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\areconnectedthroughproperties.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\ckeditorerror.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\collection.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\comparearrays.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\config.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\count.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\diff.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\difftochanges.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\createelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\emittermixin.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getancestors.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getborderwidths.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getcommonancestor.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getdatafromelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getpositionedancestor.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\getresizeobserver.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\global.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\indexof.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\insertat.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\isnode.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\isrange.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\istext.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\iswindow.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\position.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\rect.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\remove.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\scroll.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\setdatainelement.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\dom\tounit.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\elementreplacer.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\emittermixin.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\env.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\eventinfo.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\fastdiff.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\first.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\focustracker.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\isiterable.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\keyboard.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\keystrokehandler.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\locale.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\mapsequal.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\mix.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\nth.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\objecttomap.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\observablemixin.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\priorities.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\spy.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\tomap.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\translation-service.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\uid.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\unicode.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-utils\src\version.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-vue\CHANGELOG.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-vue\dist\ckeditor.js" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-vue\dist\ckeditor.js.map" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-vue\LICENSE.md" />
+		<None Include="node_modules\%40ckeditor\ckeditor5-vue\README.md" />
+		<None Include="Scripts\vuesrc\content-structure\contentStructureContainer.ts" />
+		<None Include="Scripts\vuesrc\content-structure\contentStructureRouter.ts" />
+		<None Include="Scripts\vuesrc\content\contentRouter.ts" />
+		<None Include="Scripts\vuesrc\content\contentContainer.ts" />
+		<None Include="Scripts\vuesrc\content\contentPageListContainer.ts" />
+		<None Include="Scripts\vuesrc\home\home.ts" />
+		<None Include="Views\ExternalSystem\Index.cshtml" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Content Update="NLog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
 
+	<ItemGroup>
+		<Content Update="NLog.config">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+
+
+	<ProjectExtensions>
+		<VisualStudio>
+			<UserProperties appsettings_1json__JsonSchema="" />
+		</VisualStudio>
+	</ProjectExtensions>
 
-  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
 
 
-  
 
 </Project>
diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
index 86a1a5dd3..6ffba9df6 100644
--- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
+++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
@@ -1,63 +1,70 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    <UserSecretsId>234b55ad-984b-47ae-9d7a-71e372e6ded7</UserSecretsId>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-	<Platforms>x64</Platforms>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>LearningHub.Nhs.Api.xml</DocumentationFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Remove="nlog.config" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="nlog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-	<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-	<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-	<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
-	<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
-	<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
-	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
-		<PrivateAssets>all</PrivateAssets>
-		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-	</PackageReference>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
-	<PackageReference Update="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\LearningHub.Nhs.Api.Shared\LearningHub.Nhs.Api.Shared.csproj" />
-    <ProjectReference Include="..\MigrationTool\LearningHub.Nhs.Migration.Staging.Repository\LearningHub.Nhs.Migration.Staging.Repository.csproj" />
-    <ProjectReference Include="..\MigrationTool\LearningHub.Nhs.Migration\LearningHub.Nhs.Migration.csproj" />
-    <ProjectReference Include="..\LearningHub.Nhs.Repository.Interface\LearningHub.Nhs.Repository.Interface.csproj" />
-    <ProjectReference Include="..\LearningHub.Nhs.Repository\LearningHub.Nhs.Repository.csproj" />
-    <ProjectReference Include="..\LearningHub.Nhs.Services.Interface\LearningHub.Nhs.Services.Interface.csproj" />
-    <ProjectReference Include="..\LearningHub.Nhs.Services\LearningHub.Nhs.Services.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <WCFMetadata Include="Connected Services" />
-  </ItemGroup>
-
-  <ProjectExtensions><VisualStudio><UserProperties appsettings_1development_1json__JsonSchema="https://datahubproject.io/schemas/datahub_ingestion_schema.json" appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<AssemblyVersion>1.0.0.0</AssemblyVersion>
+		<FileVersion>1.0.0.0</FileVersion>
+		<Version>1.0.0</Version>
+		<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+		<UserSecretsId>234b55ad-984b-47ae-9d7a-71e372e6ded7</UserSecretsId>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<Platforms>x64</Platforms>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DocumentationFile>LearningHub.Nhs.Api.xml</DocumentationFile>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Content Remove="nlog.config" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Include="nlog.config">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
+		<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.2.0" />
+		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
+		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
+		<PackageReference Update="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\LearningHub.Nhs.Api.Shared\LearningHub.Nhs.Api.Shared.csproj" />
+		<ProjectReference Include="..\MigrationTool\LearningHub.Nhs.Migration.Staging.Repository\LearningHub.Nhs.Migration.Staging.Repository.csproj" />
+		<ProjectReference Include="..\MigrationTool\LearningHub.Nhs.Migration\LearningHub.Nhs.Migration.csproj" />
+		<ProjectReference Include="..\LearningHub.Nhs.Repository.Interface\LearningHub.Nhs.Repository.Interface.csproj" />
+		<ProjectReference Include="..\LearningHub.Nhs.Repository\LearningHub.Nhs.Repository.csproj" />
+		<ProjectReference Include="..\LearningHub.Nhs.Services.Interface\LearningHub.Nhs.Services.Interface.csproj" />
+		<ProjectReference Include="..\LearningHub.Nhs.Services\LearningHub.Nhs.Services.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<WCFMetadata Include="Connected Services" />
+	</ItemGroup>
+
+	<ProjectExtensions>
+		<VisualStudio>
+			<UserProperties appsettings_1development_1json__JsonSchema="https://datahubproject.io/schemas/datahub_ingestion_schema.json" appsettings_1json__JsonSchema="" />
+		</VisualStudio>
+	</ProjectExtensions>
 
 </Project>

From 9c41649c922e5f1fc9e83e86c03485e70c37a3e3 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Tue, 17 Dec 2024 16:34:00 +0000
Subject: [PATCH 111/143] TD-4180: Moved client side validations to server
 side.

---
 .../Controllers/AccountController.cs          |  5 ++--
 .../LearningHub.Nhs.WebUI.csproj              |  2 +-
 .../CreateAccountCountrySelection.cshtml      |  3 +-
 .../Account/CreateAccountCurrentRole.cshtml   |  1 +
 .../CreateAccountEmailVerification.cshtml     |  1 +
 .../CreateAccountGradeSelection.cshtml        |  1 +
 .../CreateAccountPersonalDetails.cshtml       |  3 +-
 ...ateAccountPrimarySpecialtySelection.cshtml |  1 +
 .../CreateAccountRegionSelection.cshtml       |  3 +-
 .../Account/CreateAccountWorkPlace.cshtml     |  1 +
 .../Account/CreateAccountWorkStartDate.cshtml |  1 +
 .../Shared/Tenant/LearningHub/_Layout.cshtml  | 28 +++++++++++--------
 .../Shared/_ValidationScriptsPartial.cshtml   |  7 +++--
 13 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
index 068e81cdf..476569313 100644
--- a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
@@ -476,6 +476,7 @@ public async Task<IActionResult> CreateAccountRegionSelection(AccountCreationVie
 
             if (accountCreation.CountryId == "1")
             {
+                await this.multiPageFormService.SetMultiPageFormData(accountCreation, MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
                 var regionData = await this.regionService.GetAllPagedAsync(accountCreationViewModel.CurrentPageIndex, UserRegistrationContentPageSize);
                 return this.View(new AccountCreationListViewModel { Region = regionData.Item2, AccountCreationPaging = new AccountCreationPagingModel { TotalItems = regionData.Item1, PageSize = UserRegistrationContentPageSize, HasItems = regionData.Item1 > 0, CurrentPage = accountCreationViewModel.CurrentPageIndex }, RegionId = accountCreation.RegionId, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
             }
@@ -537,7 +538,7 @@ public async Task<IActionResult> CreateAccountSubmitRegionSelection(AccountCreat
 
             if (string.IsNullOrWhiteSpace(accountCreationViewModel.RegionId))
             {
-                if (accountCreation.CountryId == "1")
+                if (accountCreation.CountryId == "1" || accountCreation.CountryId == null)
                 {
                     this.ModelState.AddModelError("RegionId", CommonValidationErrorMessages.RegionRequired);
                     var region = await this.regionService.GetAllPagedAsync(1, UserRegistrationContentPageSize);
@@ -748,7 +749,7 @@ public async Task<IActionResult> CreateAccountPrimarySpecialty(AccountCreationVi
             if (string.IsNullOrWhiteSpace(accountCreationViewModel.GradeId) || !gradeCheck)
             {
                 int gradePageSize = UserRegistrationContentPageSize + 5;
-                this.ModelState.AddModelError(string.Empty, CommonValidationErrorMessages.GradeRequired);
+                this.ModelState.AddModelError("GradeId", CommonValidationErrorMessages.GradeRequired);
                 var gradeLevel = await this.gradeService.GetPagedGradesForJobRoleAsync(int.Parse(accountCreation.CurrentRole), 1, gradePageSize);
                 return this.View("CreateAccountGradeSelection", new AccountCreationListViewModel { GradeList = gradeLevel.Item2, AccountCreationPaging = new AccountCreationPagingModel { TotalItems = gradeLevel.Item1, PageSize = gradePageSize, HasItems = gradeLevel.Item1 > 0, CurrentPage = 1 }, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
             }
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index 29542a834..5941936e3 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -128,7 +128,7 @@
 		<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
 		<PackageReference Include="MK.IO" Version="1.5.0" />
-		<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.25" />
+		<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.26" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySelection.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySelection.cshtml
index ba55dec77..e2f5019ef 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySelection.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCountrySelection.cshtml
@@ -3,6 +3,7 @@
 
 @{
     ViewData["Title"] = "Select Country";
+    ViewData["DisableValidation"] = true;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     bool returnToConfirmation = false;
     if (!string.IsNullOrWhiteSpace(Context.Request.Query["returnToConfirmation"]))
@@ -25,7 +26,7 @@
                 
                 @if (errorHasOccurred)
                 {
-                    <vc:error-summary order-of-property-names="@(new[] { nameof(Model.FilterText) })" />
+                    <vc:error-summary order-of-property-names="@(new[] { nameof(Model.FilterText), nameof(Model.CountryId) })" />
                 }
                 <h1 class="nhsuk-heading-xl">Search results for @Model.FilterText</h1>
                 <form asp-controller="Account" asp-action="CreateAccountCountrySelection" method="get">
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCurrentRole.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCurrentRole.cshtml
index f772e88bf..e0a371597 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCurrentRole.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountCurrentRole.cshtml
@@ -3,6 +3,7 @@
 
 @{
     ViewData["Title"] = "Current Role";
+    ViewData["DisableValidation"] = true;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     bool returnToConfirmation = false;
     if (!string.IsNullOrWhiteSpace(Context.Request.Query["returnToConfirmation"]))
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountEmailVerification.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountEmailVerification.cshtml
index b52b85569..06da30f1b 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountEmailVerification.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountEmailVerification.cshtml
@@ -7,6 +7,7 @@
 
 @{
     ViewData["Title"] = "Email Verification";
+    ViewData["DisableValidation"] = true;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     bool returnToConfirmation = false;
     if (!string.IsNullOrWhiteSpace(Context.Request.Query["returnToConfirmation"]))
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountGradeSelection.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountGradeSelection.cshtml
index 25322f8ad..6a81474bc 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountGradeSelection.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountGradeSelection.cshtml
@@ -3,6 +3,7 @@
 
 @{
     ViewData["Title"] = "Select Grade";
+    ViewData["DisableValidation"] = true;
     string currentRole = !string.IsNullOrWhiteSpace(Context.Request.Query["CurrentRole"]) ? Context.Request.Query["CurrentRole"] : Model.CurrentRole;
     var routeData = new Dictionary<string, string> { { "CurrentRole", currentRole }, { "ReturnToConfirmation", Context.Request.Query["returnToConfirmation"] } };
     var errorHasOccurred = !ViewData.ModelState.IsValid;
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPersonalDetails.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPersonalDetails.cshtml
index 0e289eb4e..95b5fee9d 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPersonalDetails.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPersonalDetails.cshtml
@@ -6,6 +6,7 @@
 
 @{
     ViewData["Title"] = "Personal details";
+    ViewData["DisableValidation"] = true;
     string email = ViewBag.ValidatedEmail;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     AccountCreationTypeEnum accountCreationType = ViewBag.AccountCreationType;
@@ -49,7 +50,7 @@
                     <input type="hidden" name="formSubmission" value="true">
                     @if (errorHasOccurred)
                     {
-                        <vc:error-summary order-of-property-names="@(new[] { nameof(Model) })" />
+                        <vc:error-summary order-of-property-names="@(new[] { nameof(Model.FirstName),nameof(Model.LastName) })" />
                     }
 
                     <vc:text-input asp-for="FirstName"
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialtySelection.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialtySelection.cshtml
index 88de033d4..56c18a5a8 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialtySelection.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialtySelection.cshtml
@@ -4,6 +4,7 @@
 
 @{
     ViewData["Title"] = "Primary Specialty";
+    ViewData["DisableValidation"] = true;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     string grade = !string.IsNullOrWhiteSpace(Context.Request.Query["gradeId"]) ? Context.Request.Query["gradeId"] : Model.GradeId;
     string regNo = !string.IsNullOrWhiteSpace(Context.Request.Query["registrationNumber"]) ? Context.Request.Query["registrationNumber"] : Model.RegistrationNumber;
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountRegionSelection.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountRegionSelection.cshtml
index dacb26bcb..e27f953fc 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountRegionSelection.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountRegionSelection.cshtml
@@ -3,6 +3,7 @@
 
 @{
     ViewData["Title"] = "Region";
+    ViewData["DisableValidation"] = true;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     var routeData = new Dictionary<string, string> { { "ReturnToConfirmation", Context.Request.Query["returnToConfirmation"] } };
 }
@@ -16,7 +17,7 @@
                 <vc:back-link asp-controller="Account" asp-action="CreateAccountCountrySelection" asp-all-route-data="@routeData" link-text="Back to: Search for your country" />
                 @if (errorHasOccurred)
                 {
-                    <vc:error-summary order-of-property-names="@(new[] { nameof(Model) })" />
+                    <vc:error-summary order-of-property-names="@(new[] { nameof(Model.RegionId) })" />
                 }
                 <form asp-controller="Account" asp-action="CreateAccountSubmitRegionSelection" method="post">
                     <input type="hidden" name="formSubmission" value="true">
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkPlace.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkPlace.cshtml
index 0a014d5af..d95658d8f 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkPlace.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkPlace.cshtml
@@ -4,6 +4,7 @@
 
 @{
     ViewData["Title"] = "Work Place";
+    ViewData["DisableValidation"] = true;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     TextInfo textInfo = CultureInfo.CurrentCulture.TextInfo;
     bool returnToConfirmation = false;
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkStartDate.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkStartDate.cshtml
index e62227e4b..456af11e3 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkStartDate.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountWorkStartDate.cshtml
@@ -3,6 +3,7 @@
 
 @{
     ViewData["Title"] = "Start Date";
+    ViewData["DisableValidation"] = true;
     var errorHasOccurred = !ViewData.ModelState.IsValid;
     var exampleDate = DateTime.Today;
     var hintTextLines = new List<string> { $"Enter the date you started your current role, for example, 24 08 2021" };
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
index 31b0e07a5..647e5c3bf 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
@@ -116,8 +116,11 @@
         <script type="text/javascript" src="~/lib/bootstrap/dist/js/bootstrap.bundle.js" asp-append-version="true"></script>
         <script type="text/javascript" src="~/js/jquery.matchHeight.js" asp-append-version="true"></script>
         <script type="text/javascript" src="~/js/site.js" asp-append-version="true"></script>
-        <script type="text/javascript" src="~/lib/jquery-validation/dist/jquery.validate.min.js" asp-append-version="true"></script>
-        <script type="text/javascript" src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js" asp-append-version="true"></script>
+        @if (!ViewData["DisableValidation"]?.Equals(true) ?? true)
+        {
+            <script type="text/javascript" src="~/lib/jquery-validation/dist/jquery.validate.min.js" asp-append-version="true"></script>
+            <script type="text/javascript" src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js" asp-append-version="true"></script>
+        }
     </environment>
     <environment exclude="Development">
         <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"
@@ -127,20 +130,23 @@
                 crossorigin="anonymous"
                 integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=">
         </script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.5/jquery.validate.min.js"
-                asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
-                asp-fallback-test="window.jQuery && window.jQuery.validator"
-                asp-suppress-fallback-integrity="true"
-                crossorigin="anonymous"
-                integrity="sha512-rstIgDs0xPgmG6RX1Aba4KV5cWJbAMcvRCVmglpam9SoHZiUCyQVDdH2LPlxoHtrv17XWblE/V/PP+Tr04hbtA==">
-        </script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/4.0.0/jquery.validate.unobtrusive.min.js"
-                asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
+        @if (!ViewData["DisableValidation"]?.Equals(true) ?? true)
+        {
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.19.5/jquery.validate.min.js"
+            asp-fallback-src="~/lib/jquery-validation/dist/jquery.validate.min.js"
+            asp-fallback-test="window.jQuery && window.jQuery.validator"
+            asp-suppress-fallback-integrity="true"
+            crossorigin="anonymous"
+            integrity="sha512-rstIgDs0xPgmG6RX1Aba4KV5cWJbAMcvRCVmglpam9SoHZiUCyQVDdH2LPlxoHtrv17XWblE/V/PP+Tr04hbtA==">
+            </script>
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validation-unobtrusive/4.0.0/jquery.validate.unobtrusive.min.js"
+            asp-fallback-src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
                 asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
                 asp-suppress-fallback-integrity="true"
                 crossorigin="anonymous"
                 integrity="sha512-xq+Vm8jC94ynOikewaQXMEkJIOBp7iArs3IhFWSWdRT3Pq8wFz46p+ZDFAR7kHnSFf+zUv52B3prRYnbDRdgog==">
         </script>
+        }
         <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js" asp-append-version="true"></script>
         <script type="text/javascript" src="~/js/jquery.matchHeight.min.js" asp-append-version="true"></script>
         <script type="text/javascript" src="~/js/site.min.js" asp-append-version="true"></script>
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
index 528616bed..c5c82e17c 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -1,5 +1,7 @@
-<environment include="Development">
-    <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
+@if (!ViewData["DisableValidation"]?.Equals(true) ?? true)
+{
+    <environment include="Development">
+        <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
     <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
 </environment>
 <environment exclude="Development">
@@ -16,6 +18,7 @@
             integrity="sha256-9GycpJnliUjJDVDqP0UEu/bsm9U+3dnQUH8+3W10vkY=">
     </script>
 </environment>
+}
 <script type="text/javascript">
     // Add/remove class 'input-validation-error' to the div containing the control with error
 

From 42abe23d8666274d8e9e6713181b358649879673 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Wed, 18 Dec 2024 12:25:56 +0000
Subject: [PATCH 112/143] TD-4177: Changed text content accordingly for screen
 reader

---
 .../Views/Account/CreateAccountConfirmation.cshtml          | 6 +++---
 .../Views/LoginWizard/AccountConfirmation.cshtml            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml
index 461d773b2..5f21114a8 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountConfirmation.cshtml
@@ -50,7 +50,7 @@
                         <dd class="nhsuk-summary-list__actions">
 
                             <a asp-action="CreateAccountEmailVerification" asp-route-returnToConfirmation="true">
-                                Change<span class="nhsuk-u-visually-hidden">&nbsp;email</span>
+                                Change<span class="nhsuk-u-visually-hidden">&nbsp;primary email</span>
                             </a>
 
                         </dd>
@@ -68,7 +68,7 @@
                         <dd class="nhsuk-summary-list__actions">
 
                             <a asp-action="CreateAccountPersonalDetails" asp-route-returnToConfirmation="true">
-                                Change<span class="nhsuk-u-visually-hidden">&nbsp;email</span>
+                                Change<span class="nhsuk-u-visually-hidden">&nbsp;secondary email</span>
                             </a>
 
                         </dd>
@@ -122,7 +122,7 @@
                         <dd class="nhsuk-summary-list__actions no-bottom-border">
 
                             <a asp-action="CreateAccountCurrentRole" asp-route-CurrentRole="@Model.AccountCreationViewModel.CurrentRole" asp-route-returnToConfirmation="true">
-                                Change<span class="nhsuk-u-visually-hidden">&nbsp;role</span>
+                                Change<span class="nhsuk-u-visually-hidden">&nbsp;current role</span>
                             </a>
 
                         </dd>
diff --git a/LearningHub.Nhs.WebUI/Views/LoginWizard/AccountConfirmation.cshtml b/LearningHub.Nhs.WebUI/Views/LoginWizard/AccountConfirmation.cshtml
index 0ea2ac8f7..341d6f23d 100644
--- a/LearningHub.Nhs.WebUI/Views/LoginWizard/AccountConfirmation.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/LoginWizard/AccountConfirmation.cshtml
@@ -57,7 +57,7 @@
                                 </dd>
                                 <dd class="nhsuk-summary-list__actions">
                                     <a asp-controller="Account" asp-action="CreateAccountPersonalDetails" asp-route-returnToConfirmation="true">
-                                        Change<span class="nhsuk-u-visually-hidden"> email</span>
+                                        Change<span class="nhsuk-u-visually-hidden">&nbsp;secondary email</span>
                                     </a>
                                 </dd>
                             </div>
@@ -103,7 +103,7 @@
                                 </dd>
                                 <dd class="nhsuk-summary-list__actions no-bottom-border">
                                     <a asp-controller="Account" asp-action="CreateAccountCurrentRole" asp-route-CurrentRole="@Model.AccountCreationViewModel.CurrentRole" asp-route-returnToConfirmation="true">
-                                        Change<span class="nhsuk-u-visually-hidden"> role</span>
+                                        Change<span class="nhsuk-u-visually-hidden">&nbsp;current role</span>
                                     </a>
                                 </dd>
                             </div>

From 135b34714655187648baa1542cafe65e7020b728 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Wed, 18 Dec 2024 14:23:09 +0000
Subject: [PATCH 113/143] TD-5078: My Learning page - activity not loading for
 user

---
 .../LearningHub.Nhs.AdminUI.csproj            |   2 +-
 .../LearningHub.Nhs.WebUI.csproj              |   2 +-
 .../LearningHub.Nhs.OpenApi.Models.csproj     |   2 +-
 ...gHub.Nhs.OpenApi.Services.Interface.csproj |   2 +-
 .../LearningHub.Nhs.OpenApi.Services.csproj   |   2 +-
 .../LearningHub.Nhs.Api.csproj                |   2 +-
 .../LearningHub.Nhs.Api.Shared.csproj         |   2 +-
 .../LearningHub.Nhs.Api.UnitTests.csproj      |   2 +-
 .../LearningHub.Nhs.Database.sqlproj          |   1 +
 ...AssessmentActivityCompletionPercentage.sql |  30 +++
 .../Activity/GetUserLatestActivityCheck.sql   |  54 +++--
 .../Activity/GetUserLearningActivities.sql    |  65 +++--
 .../GetUserLearningActivitiesCount.sql        |  51 ++--
 .../Activity/IResourceActivityRepository.cs   |   9 +
 ...earningHub.Nhs.Repository.Interface.csproj |   2 +-
 .../Activity/ResourceActivityRepository.cs    | 225 +++++++++---------
 .../LearningHub.Nhs.Repository.csproj         |   2 +-
 .../LearningHubDbContext.cs                   |   7 +
 .../LearningHub.Nhs.Services.Interface.csproj |   2 +-
 .../LearningHub.Nhs.Services.UnitTests.csproj |   2 +-
 .../LearningHub.Nhs.Services.csproj           |   2 +-
 .../MyLearningService.cs                      |   5 +-
 ...earningHub.Nhs.Migration.ConsoleApp.csproj |   2 +-
 ...LearningHub.Nhs.Migration.Interface.csproj |   2 +-
 .../LearningHub.Nhs.Migration.Models.csproj   |   2 +-
 ...ub.Nhs.Migration.Staging.Repository.csproj |   2 +-
 ...LearningHub.Nhs.Migration.UnitTests.csproj |   2 +-
 .../LearningHub.Nhs.Migration.csproj          |   2 +-
 28 files changed, 283 insertions(+), 202 deletions(-)
 create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetAssessmentActivityCompletionPercentage.sql

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
index 5be3c7dcf..14ddfdbde 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
+++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
@@ -92,7 +92,7 @@
 		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 		<PackageReference Include="IdentityModel" Version="4.4.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index 5941936e3..a59bfcbcb 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -111,7 +111,7 @@
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
 		<PackageReference Include="IdentityModel" Version="4.3.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
 		<PackageReference Include="linqtotwitter" Version="6.9.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
index 7a4aad8fc..e7faef3dd 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
       <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
     </ItemGroup>
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
index 1f6967d55..38a5e9711 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
index 0ca91c767..3524cb9e4 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
@@ -24,7 +24,7 @@
     <ItemGroup>
       <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
       <PackageReference Include="IdentityModel" Version="4.3.0" />
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.43" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
index 6ffba9df6..6a57923bd 100644
--- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
+++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
@@ -30,7 +30,7 @@
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
 		<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
index 831497bc2..fa26a95ea 100644
--- a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
index 6da2ec625..17b974e8b 100644
--- a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
index 054baf7a8..42a432ae2 100644
--- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
+++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
@@ -535,6 +535,7 @@
     <Build Include="Tables\Resource\ScormResourceReferenceEventType.sql" />
     <None Include="Scripts\Post-Deploy\Scripts\UpdateFileTypes.sql" />
     <None Include="Scripts\Post-Deploy\Scripts\AddDigitalLearningSolutionsExternalSystem.sql" />
+    <Build Include="Stored Procedures\Activity\GetAssessmentActivityCompletionPercentage.sql" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetAssessmentActivityCompletionPercentage.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetAssessmentActivityCompletionPercentage.sql
new file mode 100644
index 000000000..7b8c747ef
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetAssessmentActivityCompletionPercentage.sql	
@@ -0,0 +1,30 @@
+-- =============================================
+-- Author:	Swapnamol Abraham
+-- Create date: 17-12-2024
+-- Description:	To get the details of completion percentage for an assessment with questionBlock
+-- =============================================
+CREATE PROCEDURE [activity].[GetAssessmentActivityCompletionPercentage]
+	@userId INT,
+	@ResourceVersionId INT,
+	@activityId INT
+AS
+BEGIN
+	-- SET NOCOUNT ON added to prevent extra result sets from
+	-- interfering with SELECT statements.
+	SET NOCOUNT ON;
+
+    SELECT @activityId as ResourceActivityId,
+    TotalQuestions,
+    CompletedQuestions,
+	CASE WHEN TotalQuestions = 0 THEN 0 ELSE (CompletedQuestions/TotalQuestions)*100 END AS CompletionPercentage
+FROM 
+    (select count(ARV.Id) as TotalQuestions from resources.AssessmentResourceVersion ARV
+              INNER JOIN [resources].[BlockCollection] AS BC ON BC.Id = ARV.AssessmentContentId
+			  LEFT JOIN [resources].[Block] AS B ON B.BlockCollectionId = BC.Id
+			  WHERE B.BlockType = 4 AND arv.ResourceVersionId  = @ResourceVersionId AND BC.Deleted = 0 ) AS Total,
+
+    (select count(ARA.Id) As completedQuestions from [activity].[AssessmentResourceActivity] ARA
+LEFT JOIN [activity].[AssessmentResourceActivityInteraction] ARAI ON ARA.Id = ARAI.AssessmentResourceActivityId
+Where ResourceActivityId = @activityId AND ARAI.Deleted = 0 ) AS Completed;
+
+END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql
index edb56b5ad..893febb4e 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLatestActivityCheck.sql	
@@ -8,7 +8,7 @@
 -- Sarathlal	20-02-2024
 -- Sarathlal	23-04-2024 TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
 -- Sarathlal	25-04-2024 TD-4067: Resource with muliple version issue resolved
--- Arunima		11-10-2024	TD-4261: Duplicate entries for the assessment results(elearning) in the My Learning page
+-- Swapna   18-12-2024  TD-5078: Removed block collection joins from the SP to improve the performance of the page
 -------------------------------------------------------------------------------
 
 CREATE PROCEDURE [activity].[GetUserLatestActivityCheck] (
@@ -39,9 +39,6 @@ BEGIN
 	,[t2].[MaximumAttempts] AS ResourceVersion_MaximumAttempts, [t2].[PassMark] AS ResourceVersion_PassMark,[t2].[AssessmentType] as ResourceVersion_AssessmentResourceVersion_AssessmentType
 	--Resource version  columns ends here
 
-	--Block columns starts here
-	  ,[t10].Id as Block_BlockId,[t10].[BlockCollectionId] as Block_BlockCollectionId, [t10].[BlockType] as Block_BlockType,[t10].[Title] as Block_Title, [t10].[Order] as Block_Order
-	--Block columns ends here
 	--Video resource version starts here
 	,[VideoResourceVersion].[AmendDate] as VideoResourcVersion_AmendDate, [VideoResourceVersion].[AmendUserId] AS VideoResourcVersion_AmendUserId , [VideoResourceVersion].[ClosedCaptionsFileId] AS VideoResourcVersion_ClosedCaptionsFileId, [VideoResourceVersion].[CreateDate] AS VideoResourcVersion_CreateDate, [VideoResourceVersion].[CreateUserId] AS VideoResourcVersion_CreateUserId,
 	[VideoResourceVersion].[Deleted] AS VideoResourcVersion_Deleted, [VideoResourceVersion].[DurationInMilliseconds] AS VideoResourcVersion_DurationInMilliseconds, [VideoResourceVersion].[ResourceAzureMediaAssetId] AS VideoResourcVersion_ResourceAzureMediaAssetId, [VideoResourceVersion].[ResourceVersionId]  AS VideoResourcVersion_ResourceVersionId,
@@ -75,9 +72,7 @@ BEGIN
 	 --Assessment Resource activity startes here
 	,[t11].[Reason] as AssessmentResourceActivity_Reason, [t11].[ResourceActivityId] as AssessmentResourceActivity_ResourceActivityId
 	,[t11].[Score] as AssessmentResourceActivity_Score
-	,[t11].[Id0] as AssessmentResourceActivity_AssessmentResourceActivityInteraction_Id,[t11].[QuestionBlockId] as AssessmentResourceActivity_AssessmentResourceActivityInteraction_QuestionBlockId,
-	 [t11].[AssessmentResourceActivityId] as AssessmentResourceActivity_AssessmentResourceActivityInteraction_AssessmentResourceActivityId
-	,[t11].[AssessmentResourceActivityId] as AssessmentResourceActivity_AssessmentResourceActivityId
+	,[t11].[Id] as AssessmentResourceActivity_AssessmentResourceActivityId
 	,[t11].[Id] as  AssessmentResourceActivity_Id
 
 	--Assessment resource activity ends here
@@ -176,22 +171,45 @@ FROM (
 ) AS [t2]
 LEFT JOIN [resources].[VideoResourceVersion] AS [VideoResourceVersion] ON [t2].[Id1] = [VideoResourceVersion].[ResourceVersionId]
 LEFT JOIN [resources].[AudioResourceVersion] AS [AudeoResourceVersion] ON [t2].[Id1] = [AudeoResourceVersion].[ResourceVersionId]
-LEFT JOIN [resources].[ScormResourceVersion] AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId] and t3.Deleted=0
-LEFT JOIN [resources].[ScormResourceVersionManifest] AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId] and [t4].[Deleted] = 0
-LEFT JOIN [resources].[BlockCollection]  AS [t5] ON [t2].[AssessmentContentId] = [t5].[Id] AND [t5].[Deleted] = 0
-INNER JOIN [hierarchy].[NodePath] AS [t6] ON [t2].[NodePathId] = [t6].[Id] AND [t6].[Deleted] = 0
-LEFT JOIN [resources].[ResourceReference] AS [t7] ON [t2].[Id0] = [t7].[ResourceId] AND [t7].[Deleted] = 0
-LEFT JOIN [activity].[MediaResourceActivity] AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId] AND [t8].[Deleted] = 0
-LEFT JOIN [activity].[ScormActivity] AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId] AND [t9].[Deleted] = 0
-LEFT JOIN [resources].[Block] AS [t10] ON [t5].[Id] = [t10].[BlockCollectionId] AND [t10].[Deleted] = 0
 LEFT JOIN (
-    SELECT [AssessmentResourceActivity5].[Id], [AssessmentResourceActivity5].[AmendDate], [AssessmentResourceActivity5].[AmendUserID], [AssessmentResourceActivity5].[CreateDate], [AssessmentResourceActivity5].[CreateUserID], [AssessmentResourceActivity5].[Deleted], [AssessmentResourceActivity5].[Reason], [AssessmentResourceActivity5].[ResourceActivityId], [AssessmentResourceActivity5].[Score], [t12].[Id] AS [Id0], [t12].[AmendDate] AS [AmendDate0], [t12].[AmendUserID] AS [AmendUserID0], [t12].[AssessmentResourceActivityId], [t12].[CreateDate] AS [CreateDate0], [t12].[CreateUserID] AS [CreateUserID0], [t12].[Deleted] AS [Deleted0], [t12].[QuestionBlockId]
+    SELECT [ScormResourceVersion2].[Id], [ScormResourceVersion2].[AmendDate], [ScormResourceVersion2].[AmendUserId], [ScormResourceVersion2].[CanDownload], [ScormResourceVersion2].[ClearSuspendData], [ScormResourceVersion2].[ContentFilePath], [ScormResourceVersion2].[CreateDate], [ScormResourceVersion2].[CreateUserId], [ScormResourceVersion2].[Deleted], [ScormResourceVersion2].[DevelopmentId], [ScormResourceVersion2].[EsrLinkTypeId], [ScormResourceVersion2].[FileId], [ScormResourceVersion2].[PopupHeight], [ScormResourceVersion2].[PopupWidth], [ScormResourceVersion2].[ResourceVersionId]
+    FROM [resources].[ScormResourceVersion] AS [ScormResourceVersion2]
+    WHERE [ScormResourceVersion2].[Deleted] = 0
+) AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId]
+LEFT JOIN (
+    SELECT [ScormResourceVersionManifest3].[Id], [ScormResourceVersionManifest3].[AmendDate], [ScormResourceVersionManifest3].[AmendUserId], [ScormResourceVersionManifest3].[Author], [ScormResourceVersionManifest3].[CatalogEntry], [ScormResourceVersionManifest3].[Copyright], [ScormResourceVersionManifest3].[CreateDate], [ScormResourceVersionManifest3].[CreateUserId], [ScormResourceVersionManifest3].[Deleted], [ScormResourceVersionManifest3].[Description], [ScormResourceVersionManifest3].[Duration], [ScormResourceVersionManifest3].[ItemIdentifier], [ScormResourceVersionManifest3].[Keywords], [ScormResourceVersionManifest3].[LaunchData], [ScormResourceVersionManifest3].[ManifestURL], [ScormResourceVersionManifest3].[MasteryScore], [ScormResourceVersionManifest3].[MaxTimeAllowed], [ScormResourceVersionManifest3].[QuicklinkId], [ScormResourceVersionManifest3].[ResourceIdentifier], [ScormResourceVersionManifest3].[ScormResourceVersionId], [ScormResourceVersionManifest3].[TemplateVersion], [ScormResourceVersionManifest3].[TimeLimitAction], [ScormResourceVersionManifest3].[Title]
+    FROM [resources].[ScormResourceVersionManifest] AS [ScormResourceVersionManifest3]
+    WHERE [ScormResourceVersionManifest3].[Deleted] = 0
+) AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId]
+INNER JOIN (
+    SELECT [NodePath].[Id], [NodePath].[AmendDate], [NodePath].[AmendUserId], [NodePath].[CatalogueNodeId], [NodePath].[CreateDate], [NodePath].[CreateUserId], [NodePath].[Deleted], [NodePath].[IsActive], [NodePath].[NodeId], [NodePath].[NodePath]
+    FROM [hierarchy].[NodePath] AS [NodePath]
+    WHERE [NodePath].[Deleted] = 0
+) AS [t6] ON [t2].[NodePathId] = [t6].[Id]
+LEFT JOIN (
+    SELECT [ResourceReference5].[Id], [ResourceReference5].[AmendDate], [ResourceReference5].[AmendUserId], [ResourceReference5].[CreateDate], [ResourceReference5].[CreateUserId], [ResourceReference5].[Deleted], [ResourceReference5].[NodePathId], [ResourceReference5].[OriginalResourceReferenceId], [ResourceReference5].[ResourceId]
+    FROM [resources].[ResourceReference] AS [ResourceReference5]
+    WHERE [ResourceReference5].[Deleted] = 0
+) AS [t7] ON [t2].[Id0] = [t7].[ResourceId]
+LEFT JOIN (
+    SELECT [MediaResourceActivity3].[Id], [MediaResourceActivity3].[ActivityStart], [MediaResourceActivity3].[AmendDate], [MediaResourceActivity3].[AmendUserID], [MediaResourceActivity3].[CreateDate], [MediaResourceActivity3].[CreateUserID], [MediaResourceActivity3].[Deleted], [MediaResourceActivity3].[PercentComplete], [MediaResourceActivity3].[ResourceActivityId], [MediaResourceActivity3].[SecondsPlayed]
+    FROM [activity].[MediaResourceActivity] AS [MediaResourceActivity3]
+    WHERE [MediaResourceActivity3].[Deleted] = 0
+) AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId]
+LEFT JOIN (
+    SELECT [ScormActivity4].[Id], [ScormActivity4].[AmendDate], [ScormActivity4].[AmendUserID], [ScormActivity4].[CmiCoreExit], [ScormActivity4].[CmiCoreLesson_location], [ScormActivity4].[CmiCoreLesson_status], [ScormActivity4].[CmiCoreScoreMax], [ScormActivity4].[CmiCoreScoreMin], [ScormActivity4].[CmiCoreScoreRaw], [ScormActivity4].[CmiCoreSession_time], [ScormActivity4].[CmiSuspend_data], [ScormActivity4].[CreateDate], [ScormActivity4].[CreateUserID], [ScormActivity4].[Deleted], [ScormActivity4].[DurationSeconds], [ScormActivity4].[ResourceActivityId]
+    FROM [activity].[ScormActivity] AS [ScormActivity4]
+    WHERE [ScormActivity4].[Deleted] = 0
+) AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId]
+LEFT JOIN (
+    SELECT [AssessmentResourceActivity5].[Id], [AssessmentResourceActivity5].[AmendDate], [AssessmentResourceActivity5].[AmendUserID], [AssessmentResourceActivity5].[CreateDate], [AssessmentResourceActivity5].[CreateUserID], [AssessmentResourceActivity5].[Deleted], [AssessmentResourceActivity5].[Reason], [AssessmentResourceActivity5].[ResourceActivityId], [AssessmentResourceActivity5].[Score]
     FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5]
-	LEFT JOIN [activity].[AssessmentResourceActivityInteraction] AS [t12] ON [AssessmentResourceActivity5].[Id] = [t12].[AssessmentResourceActivityId] AND [t12].[Deleted] = 0
     WHERE [AssessmentResourceActivity5].[Deleted] = 0
 ) AS [t11] ON [t2].[Id] = [t11].[ResourceActivityId]
 WHERE t2.ResourceVersionId=@ResourceVersionId
-ORDER BY [t2].[ActivityStart] DESC, [t2].[Id], [t2].[Id0], [t2].[Id1], [t2].[Id2], [VideoResourceVersion].[Id], [AudeoResourceVersion].[Id], [t3].[Id], [t4].[Id], [t5].[Id], [t6].[Id], [t7].[Id], [t8].[Id], [t9].[Id], [t10].[Id], [t11].[Id]
+ORDER BY [t2].[ActivityStart] DESC, [t2].[Id], [t2].[Id0], [t2].[Id1], [t2].[Id2], [VideoResourceVersion].[Id], [AudeoResourceVersion].[Id], [t3].[Id], [t4].[Id], 
+[t6].[Id], [t7].[Id], [t8].[Id], [t9].[Id], 
+[t11].[Id]
 	
 	
 END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql
index 0738ac2ac..bc4088a5d 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql	
@@ -10,8 +10,8 @@
 -- Sarathlal	08-03-2024
 -- Sarathlal	23-04-2024 TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
 -- Sarathlal	25-04-2024 TD-4067: Resource with muliple version issue resolved
--- Arunima		26-07-2024 TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
--- Arunima		11-10-2024 TD-4261: Duplicate entries for the assessment results(elearning) in the My Learning page
+-- Arunima	26-07-2024 TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
+-- Swapna   18-12-2024  TD-5078: Removed block collection joins from the SP to improve the performance of the page
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [activity].[GetUserLearningActivities] (
 	 @userId INT	
@@ -80,9 +80,6 @@ BEGIN
 	,[t2].[MaximumAttempts] AS ResourceVersion_MaximumAttempts, [t2].[PassMark] AS ResourceVersion_PassMark, [t2].[AssessmentType] as ResourceVersion_AssessmentResourceVersion_AssessmentType
 	--Resource version  columns ends here
 
-	--Block columns starts here
-	  ,[t10].Id as Block_BlockId,[t10].[BlockCollectionId] as Block_BlockCollectionId, [t10].[BlockType] as Block_BlockType,[t10].[Title] as Block_Title, [t10].[Order] as Block_Order
-	--Block columns ends here
 	--Video resource version starts here
 	,[VideoResourceVersion].[AmendDate] as VideoResourcVersion_AmendDate, [VideoResourceVersion].[AmendUserId] AS VideoResourcVersion_AmendUserId , [VideoResourceVersion].[ClosedCaptionsFileId] AS VideoResourcVersion_ClosedCaptionsFileId, [VideoResourceVersion].[CreateDate] AS VideoResourcVersion_CreateDate, [VideoResourceVersion].[CreateUserId] AS VideoResourcVersion_CreateUserId,
 	[VideoResourceVersion].[Deleted] AS VideoResourcVersion_Deleted, [VideoResourceVersion].[DurationInMilliseconds] AS VideoResourcVersion_DurationInMilliseconds, [VideoResourceVersion].[ResourceAzureMediaAssetId] AS VideoResourcVersion_ResourceAzureMediaAssetId, [VideoResourceVersion].[ResourceVersionId]  AS VideoResourcVersion_ResourceVersionId,
@@ -118,9 +115,7 @@ BEGIN
 	
 	,[t11].[Reason] as AssessmentResourceActivity_Reason, [t11].[ResourceActivityId] as AssessmentResourceActivity_ResourceActivityId
 	,[t11].[Score] as AssessmentResourceActivity_Score
-	,[t11].[Id0] as AssessmentResourceActivity_AssessmentResourceActivityInteraction_Id,[t11].[QuestionBlockId] as AssessmentResourceActivity_AssessmentResourceActivityInteraction_QuestionBlockId,
-	 [t11].[AssessmentResourceActivityId] as AssessmentResourceActivity_AssessmentResourceActivityInteraction_AssessmentResourceActivityId
-	,[t11].[AssessmentResourceActivityId] as AssessmentResourceActivity_AssessmentResourceActivityId
+	,[t11].ResourceActivityId  as AssessmentResourceActivity_AssessmentResourceActivityId
 	,[t11].[Id] as  AssessmentResourceActivity_Id
 
 	--Assessment resource activity ends here
@@ -216,7 +211,7 @@ FROM (
                      WHERE  ([ScormActivity].[Deleted] = 0 AND [ResourceActivity].[Id] = [ScormActivity].[ResourceActivityId])										 
 				) 
 					IS NULL
-			)
+			)		
 		AND   
 				(
 					(
@@ -228,17 +223,12 @@ FROM (
 								))
 					)
 				OR  
-				(
 					-- or launch resource activity completed
 					EXISTS
 					(
 							SELECT 1	FROM   [activity].[ResourceActivity] AS [ResAct2]
 							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] in (3,7,5,4)
 					)
-					AND
-					(
-						[Res].[ResourceTypeId] <> 6)
-					)
 					
 				)
 			AND
@@ -364,7 +354,7 @@ FROM (
 												(
 													(SELECT TOP(1) [ScormActivity1].[CmiCoreLesson_status]
 													FROM   [activity].[ScormActivity] AS [ScormActivity1]
-													WHERE [ScormActivity1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ScormActivity1].[ResourceActivityId]) = 7
+													WHERE [ScormActivity1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ScormActivity1].[ResourceActivityId]) = 2
 												)
 										)
 			
@@ -487,20 +477,43 @@ FROM (
 ) AS [t2]
 LEFT JOIN [resources].[VideoResourceVersion] AS [VideoResourceVersion] ON [t2].[Id1] = [VideoResourceVersion].[ResourceVersionId]
 LEFT JOIN [resources].[AudioResourceVersion] AS [AudeoResourceVersion] ON [t2].[Id1] = [AudeoResourceVersion].[ResourceVersionId]
-LEFT JOIN [resources].[ScormResourceVersion] AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId] and t3.Deleted=0
-LEFT JOIN [resources].[ScormResourceVersionManifest] AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId] and [t4].[Deleted] = 0
-LEFT JOIN [resources].[BlockCollection]  AS [t5] ON [t2].[AssessmentContentId] = [t5].[Id] AND [t5].[Deleted] = 0
-INNER JOIN [hierarchy].[NodePath] AS [t6] ON [t2].[NodePathId] = [t6].[Id] AND [t6].[Deleted] = 0
-LEFT JOIN [resources].[ResourceReference] AS [t7] ON [t2].[Id0] = [t7].[ResourceId] AND [t7].[Deleted] = 0
-LEFT JOIN [activity].[MediaResourceActivity] AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId] AND [t8].[Deleted] = 0
-LEFT JOIN [activity].[ScormActivity] AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId] AND [t9].[Deleted] = 0
-LEFT JOIN [resources].[Block] AS [t10] ON [t5].[Id] = [t10].[BlockCollectionId] AND [t10].[Deleted] = 0
 LEFT JOIN (
-    SELECT [AssessmentResourceActivity5].[Id], [AssessmentResourceActivity5].[AmendDate], [AssessmentResourceActivity5].[AmendUserID], [AssessmentResourceActivity5].[CreateDate], [AssessmentResourceActivity5].[CreateUserID], [AssessmentResourceActivity5].[Deleted], [AssessmentResourceActivity5].[Reason], [AssessmentResourceActivity5].[ResourceActivityId], [AssessmentResourceActivity5].[Score], [t12].[Id] AS [Id0], [t12].[AmendDate] AS [AmendDate0], [t12].[AmendUserID] AS [AmendUserID0], [t12].[AssessmentResourceActivityId], [t12].[CreateDate] AS [CreateDate0], [t12].[CreateUserID] AS [CreateUserID0], [t12].[Deleted] AS [Deleted0], [t12].[QuestionBlockId]
+    SELECT [ScormResourceVersion2].[Id], [ScormResourceVersion2].[AmendDate], [ScormResourceVersion2].[AmendUserId], [ScormResourceVersion2].[CanDownload], [ScormResourceVersion2].[ClearSuspendData], [ScormResourceVersion2].[ContentFilePath], [ScormResourceVersion2].[CreateDate], [ScormResourceVersion2].[CreateUserId], [ScormResourceVersion2].[Deleted], [ScormResourceVersion2].[DevelopmentId], [ScormResourceVersion2].[EsrLinkTypeId], [ScormResourceVersion2].[FileId], [ScormResourceVersion2].[PopupHeight], [ScormResourceVersion2].[PopupWidth], [ScormResourceVersion2].[ResourceVersionId]
+    FROM [resources].[ScormResourceVersion] AS [ScormResourceVersion2]
+    WHERE [ScormResourceVersion2].[Deleted] = 0
+) AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId]
+LEFT JOIN (
+    SELECT [ScormResourceVersionManifest3].[Id], [ScormResourceVersionManifest3].[AmendDate], [ScormResourceVersionManifest3].[AmendUserId], [ScormResourceVersionManifest3].[Author], [ScormResourceVersionManifest3].[CatalogEntry], [ScormResourceVersionManifest3].[Copyright], [ScormResourceVersionManifest3].[CreateDate], [ScormResourceVersionManifest3].[CreateUserId], [ScormResourceVersionManifest3].[Deleted], [ScormResourceVersionManifest3].[Description], [ScormResourceVersionManifest3].[Duration], [ScormResourceVersionManifest3].[ItemIdentifier], [ScormResourceVersionManifest3].[Keywords], [ScormResourceVersionManifest3].[LaunchData], [ScormResourceVersionManifest3].[ManifestURL], [ScormResourceVersionManifest3].[MasteryScore], [ScormResourceVersionManifest3].[MaxTimeAllowed], [ScormResourceVersionManifest3].[QuicklinkId], [ScormResourceVersionManifest3].[ResourceIdentifier], [ScormResourceVersionManifest3].[ScormResourceVersionId], [ScormResourceVersionManifest3].[TemplateVersion], [ScormResourceVersionManifest3].[TimeLimitAction], [ScormResourceVersionManifest3].[Title]
+    FROM [resources].[ScormResourceVersionManifest] AS [ScormResourceVersionManifest3]
+    WHERE [ScormResourceVersionManifest3].[Deleted] = 0
+) AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId]
+INNER JOIN (
+    SELECT [NodePath].[Id], [NodePath].[AmendDate], [NodePath].[AmendUserId], [NodePath].[CatalogueNodeId], [NodePath].[CreateDate], [NodePath].[CreateUserId], [NodePath].[Deleted], [NodePath].[IsActive], [NodePath].[NodeId], [NodePath].[NodePath]
+    FROM [hierarchy].[NodePath] AS [NodePath]
+    WHERE [NodePath].[Deleted] = 0
+) AS [t6] ON [t2].[NodePathId] = [t6].[Id]
+LEFT JOIN (
+    SELECT [ResourceReference5].[Id], [ResourceReference5].[AmendDate], [ResourceReference5].[AmendUserId], [ResourceReference5].[CreateDate], [ResourceReference5].[CreateUserId], [ResourceReference5].[Deleted], [ResourceReference5].[NodePathId], [ResourceReference5].[OriginalResourceReferenceId], [ResourceReference5].[ResourceId]
+    FROM [resources].[ResourceReference] AS [ResourceReference5]
+    WHERE [ResourceReference5].[Deleted] = 0
+) AS [t7] ON [t2].[Id0] = [t7].[ResourceId]
+LEFT JOIN (
+    SELECT [MediaResourceActivity3].[Id], [MediaResourceActivity3].[ActivityStart], [MediaResourceActivity3].[AmendDate], [MediaResourceActivity3].[AmendUserID], [MediaResourceActivity3].[CreateDate], [MediaResourceActivity3].[CreateUserID], [MediaResourceActivity3].[Deleted], [MediaResourceActivity3].[PercentComplete], [MediaResourceActivity3].[ResourceActivityId], [MediaResourceActivity3].[SecondsPlayed]
+    FROM [activity].[MediaResourceActivity] AS [MediaResourceActivity3]
+    WHERE [MediaResourceActivity3].[Deleted] = 0
+) AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId]
+LEFT JOIN (
+    SELECT [ScormActivity4].[Id], [ScormActivity4].[AmendDate], [ScormActivity4].[AmendUserID], [ScormActivity4].[CmiCoreExit], [ScormActivity4].[CmiCoreLesson_location], [ScormActivity4].[CmiCoreLesson_status], [ScormActivity4].[CmiCoreScoreMax], [ScormActivity4].[CmiCoreScoreMin], [ScormActivity4].[CmiCoreScoreRaw], [ScormActivity4].[CmiCoreSession_time], [ScormActivity4].[CmiSuspend_data], [ScormActivity4].[CreateDate], [ScormActivity4].[CreateUserID], [ScormActivity4].[Deleted], [ScormActivity4].[DurationSeconds], [ScormActivity4].[ResourceActivityId]
+    FROM [activity].[ScormActivity] AS [ScormActivity4]
+    WHERE [ScormActivity4].[Deleted] = 0
+) AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId]
+LEFT JOIN (
+    SELECT [AssessmentResourceActivity5].[Id], [AssessmentResourceActivity5].[AmendDate], [AssessmentResourceActivity5].[AmendUserID], [AssessmentResourceActivity5].[CreateDate], [AssessmentResourceActivity5].[CreateUserID], [AssessmentResourceActivity5].[Deleted], [AssessmentResourceActivity5].[Reason], [AssessmentResourceActivity5].[ResourceActivityId], [AssessmentResourceActivity5].[Score]
     FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5]
-	LEFT JOIN [activity].[AssessmentResourceActivityInteraction] AS [t12] ON [AssessmentResourceActivity5].[Id] = [t12].[AssessmentResourceActivityId] AND [t12].[Deleted] = 0
     WHERE [AssessmentResourceActivity5].[Deleted] = 0
 ) AS [t11] ON [t2].[Id] = [t11].[ResourceActivityId]
-ORDER BY [t2].[ActivityStart] DESC, [t2].[Id], [t2].[Id0], [t2].[Id1], [t2].[Id2], [VideoResourceVersion].[Id], [AudeoResourceVersion].[Id], [t3].[Id], [t4].[Id], [t5].[Id], [t6].[Id], [t7].[Id], [t8].[Id], [t9].[Id], [t10].[Id], [t11].[Id]
+ORDER BY [t2].[ActivityStart] DESC, [t2].[Id], [t2].[Id0], [t2].[Id1], [t2].[Id2], [VideoResourceVersion].[Id], [AudeoResourceVersion].[Id], [t3].[Id], [t4].[Id], 
+[t6].[Id], [t7].[Id], [t8].[Id], [t9].[Id],
+[t11].[Id]
 		
 END
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql
index 255339687..19801209f 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql	
@@ -9,8 +9,8 @@
 -- Sarathlal	18-12-2023
 -- Sarathlal	08-03-2024
 -- Sarathlal	23-04-2024	TD-2954: Audio/Video/Assessment issue resolved and duplicate issue also resolved
--- Arunima		26-07-2024  TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
--- Arunima		11-10-2024	TD-4261: Duplicate entries for the assessment results(elearning) in the My Learning page
+-- Arunima	26-07-2024  TD-4411: "Completed" filter along with "Assessment" doesn't display the correct results
+-- Swapna   18-12-2024  TD-5078: Removed block collection joins from the SP to improve the performance of the page
 -------------------------------------------------------------------------------
 CREATE PROCEDURE [activity].[GetUserLearningActivitiesCount] (
 	 @userId INT	
@@ -143,16 +143,12 @@ FROM (
 								))
 					)
 				OR  
-				(
 					-- or launch resource activity completed
 					EXISTS
 					(
 							SELECT 1	FROM   [activity].[ResourceActivity] AS [ResAct2]
 							WHERE  [ResAct2].[Deleted] = 0 AND  [ResourceActivity].[Id] = [ResAct2].[LaunchResourceActivityId] AND  [ResAct2].[ActivityStatusId] in (3,7,5,4)
 					)
-					AND
-					([Res].[ResourceTypeId] <> 6)
-					)
 					
 				)
 			AND
@@ -278,7 +274,7 @@ FROM (
 												(
 													(SELECT TOP(1) [ScormActivity1].[CmiCoreLesson_status]
 													FROM   [activity].[ScormActivity] AS [ScormActivity1]
-													WHERE [ScormActivity1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ScormActivity1].[ResourceActivityId]) = 7
+													WHERE [ScormActivity1].[Deleted] = 0 AND [ResourceActivity].[Id] = [ScormActivity1].[ResourceActivityId]) = 2
 												)
 										)
 			
@@ -398,18 +394,39 @@ FROM (
 ) AS [t2]
 LEFT JOIN [resources].[VideoResourceVersion] AS [VideoResourceVersion] ON [t2].[Id1] = [VideoResourceVersion].[ResourceVersionId]
 LEFT JOIN [resources].[AudioResourceVersion] AS [AudeoResourceVersion] ON [t2].[Id1] = [AudeoResourceVersion].[ResourceVersionId]
-LEFT JOIN [resources].[ScormResourceVersion] AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId] and t3.Deleted=0
-LEFT JOIN [resources].[ScormResourceVersionManifest] AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId] and [t4].[Deleted] = 0
-LEFT JOIN [resources].[BlockCollection]  AS [t5] ON [t2].[AssessmentContentId] = [t5].[Id] AND [t5].[Deleted] = 0
-INNER JOIN [hierarchy].[NodePath] AS [t6] ON [t2].[NodePathId] = [t6].[Id] AND [t6].[Deleted] = 0
-LEFT JOIN [resources].[ResourceReference] AS [t7] ON [t2].[Id0] = [t7].[ResourceId] AND [t7].[Deleted] = 0
-LEFT JOIN [activity].[MediaResourceActivity] AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId] AND [t8].[Deleted] = 0
-LEFT JOIN [activity].[ScormActivity] AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId] AND [t9].[Deleted] = 0
-LEFT JOIN [resources].[Block] AS [t10] ON [t5].[Id] = [t10].[BlockCollectionId] AND [t10].[Deleted] = 0
 LEFT JOIN (
-    SELECT [AssessmentResourceActivity5].[Id], [AssessmentResourceActivity5].[AmendDate], [AssessmentResourceActivity5].[AmendUserID], [AssessmentResourceActivity5].[CreateDate], [AssessmentResourceActivity5].[CreateUserID], [AssessmentResourceActivity5].[Deleted], [AssessmentResourceActivity5].[Reason], [AssessmentResourceActivity5].[ResourceActivityId], [AssessmentResourceActivity5].[Score], [t12].[Id] AS [Id0], [t12].[AmendDate] AS [AmendDate0], [t12].[AmendUserID] AS [AmendUserID0], [t12].[AssessmentResourceActivityId], [t12].[CreateDate] AS [CreateDate0], [t12].[CreateUserID] AS [CreateUserID0], [t12].[Deleted] AS [Deleted0], [t12].[QuestionBlockId]
+    SELECT [ScormResourceVersion2].[Id], [ScormResourceVersion2].[AmendDate], [ScormResourceVersion2].[AmendUserId], [ScormResourceVersion2].[CanDownload], [ScormResourceVersion2].[ClearSuspendData], [ScormResourceVersion2].[ContentFilePath], [ScormResourceVersion2].[CreateDate], [ScormResourceVersion2].[CreateUserId], [ScormResourceVersion2].[Deleted], [ScormResourceVersion2].[DevelopmentId], [ScormResourceVersion2].[EsrLinkTypeId], [ScormResourceVersion2].[FileId], [ScormResourceVersion2].[PopupHeight], [ScormResourceVersion2].[PopupWidth], [ScormResourceVersion2].[ResourceVersionId]
+    FROM [resources].[ScormResourceVersion] AS [ScormResourceVersion2]
+    WHERE [ScormResourceVersion2].[Deleted] = 0
+) AS [t3] ON [t2].[Id1] = [t3].[ResourceVersionId]
+LEFT JOIN (
+    SELECT [ScormResourceVersionManifest3].[Id], [ScormResourceVersionManifest3].[AmendDate], [ScormResourceVersionManifest3].[AmendUserId], [ScormResourceVersionManifest3].[Author], [ScormResourceVersionManifest3].[CatalogEntry], [ScormResourceVersionManifest3].[Copyright], [ScormResourceVersionManifest3].[CreateDate], [ScormResourceVersionManifest3].[CreateUserId], [ScormResourceVersionManifest3].[Deleted], [ScormResourceVersionManifest3].[Description], [ScormResourceVersionManifest3].[Duration], [ScormResourceVersionManifest3].[ItemIdentifier], [ScormResourceVersionManifest3].[Keywords], [ScormResourceVersionManifest3].[LaunchData], [ScormResourceVersionManifest3].[ManifestURL], [ScormResourceVersionManifest3].[MasteryScore], [ScormResourceVersionManifest3].[MaxTimeAllowed], [ScormResourceVersionManifest3].[QuicklinkId], [ScormResourceVersionManifest3].[ResourceIdentifier], [ScormResourceVersionManifest3].[ScormResourceVersionId], [ScormResourceVersionManifest3].[TemplateVersion], [ScormResourceVersionManifest3].[TimeLimitAction], [ScormResourceVersionManifest3].[Title]
+    FROM [resources].[ScormResourceVersionManifest] AS [ScormResourceVersionManifest3]
+    WHERE [ScormResourceVersionManifest3].[Deleted] = 0
+) AS [t4] ON [t3].[Id] = [t4].[ScormResourceVersionId]
+INNER JOIN (
+    SELECT [NodePath].[Id], [NodePath].[AmendDate], [NodePath].[AmendUserId], [NodePath].[CatalogueNodeId], [NodePath].[CreateDate], [NodePath].[CreateUserId], [NodePath].[Deleted], [NodePath].[IsActive], [NodePath].[NodeId], [NodePath].[NodePath]
+    FROM [hierarchy].[NodePath] AS [NodePath]
+    WHERE [NodePath].[Deleted] = 0
+) AS [t6] ON [t2].[NodePathId] = [t6].[Id]
+LEFT JOIN (
+    SELECT [ResourceReference5].[Id], [ResourceReference5].[AmendDate], [ResourceReference5].[AmendUserId], [ResourceReference5].[CreateDate], [ResourceReference5].[CreateUserId], [ResourceReference5].[Deleted], [ResourceReference5].[NodePathId], [ResourceReference5].[OriginalResourceReferenceId], [ResourceReference5].[ResourceId]
+    FROM [resources].[ResourceReference] AS [ResourceReference5]
+    WHERE [ResourceReference5].[Deleted] = 0
+) AS [t7] ON [t2].[Id0] = [t7].[ResourceId]
+LEFT JOIN (
+    SELECT [MediaResourceActivity3].[Id], [MediaResourceActivity3].[ActivityStart], [MediaResourceActivity3].[AmendDate], [MediaResourceActivity3].[AmendUserID], [MediaResourceActivity3].[CreateDate], [MediaResourceActivity3].[CreateUserID], [MediaResourceActivity3].[Deleted], [MediaResourceActivity3].[PercentComplete], [MediaResourceActivity3].[ResourceActivityId], [MediaResourceActivity3].[SecondsPlayed]
+    FROM [activity].[MediaResourceActivity] AS [MediaResourceActivity3]
+    WHERE [MediaResourceActivity3].[Deleted] = 0
+) AS [t8] ON [t2].[Id] = [t8].[ResourceActivityId]
+LEFT JOIN (
+    SELECT [ScormActivity4].[Id], [ScormActivity4].[AmendDate], [ScormActivity4].[AmendUserID], [ScormActivity4].[CmiCoreExit], [ScormActivity4].[CmiCoreLesson_location], [ScormActivity4].[CmiCoreLesson_status], [ScormActivity4].[CmiCoreScoreMax], [ScormActivity4].[CmiCoreScoreMin], [ScormActivity4].[CmiCoreScoreRaw], [ScormActivity4].[CmiCoreSession_time], [ScormActivity4].[CmiSuspend_data], [ScormActivity4].[CreateDate], [ScormActivity4].[CreateUserID], [ScormActivity4].[Deleted], [ScormActivity4].[DurationSeconds], [ScormActivity4].[ResourceActivityId]
+    FROM [activity].[ScormActivity] AS [ScormActivity4]
+    WHERE [ScormActivity4].[Deleted] = 0
+) AS [t9] ON [t2].[Id] = [t9].[ResourceActivityId]
+LEFT JOIN (
+    SELECT [AssessmentResourceActivity5].[Id], [AssessmentResourceActivity5].[AmendDate], [AssessmentResourceActivity5].[AmendUserID], [AssessmentResourceActivity5].[CreateDate], [AssessmentResourceActivity5].[CreateUserID], [AssessmentResourceActivity5].[Deleted], [AssessmentResourceActivity5].[Reason], [AssessmentResourceActivity5].[ResourceActivityId], [AssessmentResourceActivity5].[Score]
     FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5]
-	LEFT JOIN [activity].[AssessmentResourceActivityInteraction] AS [t12] ON [AssessmentResourceActivity5].[Id] = [t12].[AssessmentResourceActivityId] AND [t12].[Deleted] = 0
     WHERE [AssessmentResourceActivity5].[Deleted] = 0
 ) AS [t11] ON [t2].[Id] = [t11].[ResourceActivityId]
 GROUP BY [t2].[Id]	
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/Activity/IResourceActivityRepository.cs b/WebAPI/LearningHub.Nhs.Repository.Interface/Activity/IResourceActivityRepository.cs
index b1e5cdf06..25ecf5d39 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/Activity/IResourceActivityRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/Activity/IResourceActivityRepository.cs
@@ -95,5 +95,14 @@ int CreateActivity(
         /// <param name="resourceId">The resource id.</param>
         /// <returns>The <see cref="Task"/>.</returns>
         Task<List<ResourceActivity>> GetAllTheActivitiesFromSP(int userId, int resourceId);
+
+        /// <summary>
+        /// Get the assessment activity completion details.
+        /// </summary>
+        /// <param name="userId">The userId.</param>
+        /// <param name="resourceVersionId">The resourceVersionId.</param>
+        /// <param name="activityId">The activityId.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<AssessmentActivityCompletionViewModel> GetAssessmentActivityCompletionPercentage(int userId, int resourceVersionId, int activityId);
     }
 }
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
index ac60ee1b6..b44a4bb5b 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
    <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs
index 46a7405fa..79c5260df 100644
--- a/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs
@@ -10,10 +10,8 @@ namespace LearningHub.Nhs.Repository.Activity
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Entities.Activity;
     using LearningHub.Nhs.Models.Entities.Resource;
-    using LearningHub.Nhs.Models.Entities.Resource.Blocks;
     using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.MyLearning;
-    using LearningHub.Nhs.Models.Resource.Blocks;
     using LearningHub.Nhs.Repository.Helpers;
     using LearningHub.Nhs.Repository.Interface;
     using LearningHub.Nhs.Repository.Interface.Activity;
@@ -183,54 +181,54 @@ public async Task<bool> IsScormActivityFinished(int userId, int scormActivityId)
         /// <returns>ResourceActivity.</returns>
         public async Task<IQueryable<ResourceActivity>> GetByUserIdFromSP(int userId, Models.MyLearning.MyLearningRequestModel requestModel, DateTimeOffset detailedMediaActivityRecordingStartDate)
         {
-            (DateTimeOffset? startDate, DateTimeOffset? endDate) = this.ApplyDatesFilter(requestModel);
-            (string strResourceTypes, bool resourceTypeFlag) = this.ApplyResourceTypesfilters(requestModel);
-            (string strActivityStatus, bool activityStatusEnumFlag) = this.ApplyActivityStatusFilter(requestModel);
-            var param0 = new SqlParameter("@userId", SqlDbType.Int) { Value = userId };
-            var param1 = new SqlParameter("@searchText", SqlDbType.NVarChar) { Value = requestModel.SearchText == null ? DBNull.Value : requestModel.SearchText };
-            var param2 = new SqlParameter("@activityStatuses", SqlDbType.NVarChar) { Value = activityStatusEnumFlag == false ? DBNull.Value : strActivityStatus };
-            var param3 = new SqlParameter("@resourceTypes", SqlDbType.NVarChar) { Value = resourceTypeFlag == false ? DBNull.Value : strResourceTypes };
-            var param4 = new SqlParameter("@activityStartDate", SqlDbType.DateTimeOffset) { Value = startDate == null ? DBNull.Value : startDate };
-            var param5 = new SqlParameter("@activityEndDate", SqlDbType.DateTimeOffset) { Value = endDate == null ? DBNull.Value : endDate };
-            var param6 = new SqlParameter("@mediaActivityRecordingStartDate", SqlDbType.DateTimeOffset) { Value = detailedMediaActivityRecordingStartDate };
-            var param7 = new SqlParameter("@certificateEnabled", SqlDbType.Bit) { Value = requestModel.CertificateEnabled == false ? DBNull.Value : requestModel.CertificateEnabled };
-            var param8 = new SqlParameter("@offSet", SqlDbType.Int) { Value = requestModel.Skip };
-            var param9 = new SqlParameter("@fetchRows", SqlDbType.Int) { Value = requestModel.Take };
-            var result = await this.DbContext.MyLearningActivity.FromSqlRaw("[activity].[GetUserLearningActivities] @userId, @searchText, @activityStatuses, @resourceTypes,@activityStartDate,@activityEndDate,@mediaActivityRecordingStartDate,@certificateEnabled,@offSet,@fetchRows ", param0, param1, param2, param3, param4, param5, param6, param7, param8, param9)
-                .AsNoTracking().ToListAsync();
-
-            // Bind result to ResourceActivity model
-            this.BindNestedData(result);
-            List<ResourceActivity> listOfresourceActivities = result.Select(i => new ResourceActivity()
-            {
-                ActivityEnd = i.ActivityEnd,
-                ActivityStart = i.ActivityStart,
-                ActivityStatusId = i.ActivityStatusId,
-                AmendDate = i.AmendDate,
-                AmendUserId = i.AmendUserId,
-                AssessmentResourceActivity = i.AssessmentResourceActivity,
-                CreateDate = i.CreateDate,
-                CreateUserId = i.CreateUserId,
-                Deleted = i.Deleted,
-                DurationSeconds = i.DurationSeconds ?? 0,
-                Id = i.Id,
-                InverseLaunchResourceActivity = i.Resource_InverseLaunchResourceActivity,
-                LaunchResourceActivityId = i.LaunchResourceActivityId,
-                MajorVersion = i.MajorVersion,
-                MediaResourceActivity = i.MediaResourceActivity,
-                MinorVersion = i.MinorVersion,
-                NodePath = i.NodePath,
-                NodePathId = i.NodePathId,
-                Resource = i.Resource,
-                ResourceId = i.ResourceId,
-                ResourceVersion = i.ResourceVersion,
-                ResourceVersionId = i.ResourceVersionId,
-                Score = i.Score,
-                ScormActivity = i.ScormActivity,
-                UserId = i.UserId,
-            }).ToList();
-
-            return listOfresourceActivities.OrderByDescending(r => r.ActivityStart).AsQueryable();
+                (DateTimeOffset? startDate, DateTimeOffset? endDate) = this.ApplyDatesFilter(requestModel);
+                (string strResourceTypes, bool resourceTypeFlag) = this.ApplyResourceTypesfilters(requestModel);
+                (string strActivityStatus, bool activityStatusEnumFlag) = this.ApplyActivityStatusFilter(requestModel);
+                var param0 = new SqlParameter("@userId", SqlDbType.Int) { Value = userId };
+                var param1 = new SqlParameter("@searchText", SqlDbType.NVarChar) { Value = requestModel.SearchText == null ? DBNull.Value : requestModel.SearchText };
+                var param2 = new SqlParameter("@activityStatuses", SqlDbType.NVarChar) { Value = activityStatusEnumFlag == false ? DBNull.Value : strActivityStatus };
+                var param3 = new SqlParameter("@resourceTypes", SqlDbType.NVarChar) { Value = resourceTypeFlag == false ? DBNull.Value : strResourceTypes };
+                var param4 = new SqlParameter("@activityStartDate", SqlDbType.DateTimeOffset) { Value = startDate == null ? DBNull.Value : startDate };
+                var param5 = new SqlParameter("@activityEndDate", SqlDbType.DateTimeOffset) { Value = endDate == null ? DBNull.Value : endDate };
+                var param6 = new SqlParameter("@mediaActivityRecordingStartDate", SqlDbType.DateTimeOffset) { Value = detailedMediaActivityRecordingStartDate };
+                var param7 = new SqlParameter("@certificateEnabled", SqlDbType.Bit) { Value = requestModel.CertificateEnabled == false ? DBNull.Value : requestModel.CertificateEnabled };
+                var param8 = new SqlParameter("@offSet", SqlDbType.Int) { Value = requestModel.Skip };
+                var param9 = new SqlParameter("@fetchRows", SqlDbType.Int) { Value = requestModel.Take };
+                var result = await this.DbContext.MyLearningActivity.FromSqlRaw("[activity].[GetUserLearningActivities] @userId, @searchText, @activityStatuses, @resourceTypes,@activityStartDate,@activityEndDate,@mediaActivityRecordingStartDate,@certificateEnabled,@offSet,@fetchRows ", param0, param1, param2, param3, param4, param5, param6, param7, param8, param9)
+                    .AsNoTracking().ToListAsync();
+
+                // Bind result to ResourceActivity model
+                this.BindNestedData(result);
+                List<ResourceActivity> listOfresourceActivities = result.Select(i => new ResourceActivity()
+                {
+                    ActivityEnd = i.ActivityEnd,
+                    ActivityStart = i.ActivityStart,
+                    ActivityStatusId = i.ActivityStatusId,
+                    AmendDate = i.AmendDate,
+                    AmendUserId = i.AmendUserId,
+                    AssessmentResourceActivity = i.AssessmentResourceActivity,
+                    CreateDate = i.CreateDate,
+                    CreateUserId = i.CreateUserId,
+                    Deleted = i.Deleted,
+                    DurationSeconds = i.DurationSeconds ?? 0,
+                    Id = i.Id,
+                    InverseLaunchResourceActivity = i.Resource_InverseLaunchResourceActivity,
+                    LaunchResourceActivityId = i.LaunchResourceActivityId,
+                    MajorVersion = i.MajorVersion,
+                    MediaResourceActivity = i.MediaResourceActivity,
+                    MinorVersion = i.MinorVersion,
+                    NodePath = i.NodePath,
+                    NodePathId = i.NodePathId,
+                    Resource = i.Resource,
+                    ResourceId = i.ResourceId,
+                    ResourceVersion = i.ResourceVersion,
+                    ResourceVersionId = i.ResourceVersionId,
+                    Score = i.Score,
+                    ScormActivity = i.ScormActivity,
+                    UserId = i.UserId,
+                }).ToList();
+
+                return listOfresourceActivities.OrderByDescending(r => r.ActivityStart).AsQueryable();
         }
 
         /// <summary>
@@ -271,6 +269,28 @@ public async Task<List<ResourceActivity>> GetAllTheActivitiesFromSP(int userId,
             return activities;
         }
 
+        /// <summary>
+        /// Gets a list of all the user's activities for a given resource version.
+        /// </summary>
+        /// <param name="userId">The user id.</param>>
+        /// <param name="resourceVersionId">The resource version id.</param>
+        /// <param name="activityId">The resource activity id.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task<AssessmentActivityCompletionViewModel> GetAssessmentActivityCompletionPercentage(int userId, int resourceVersionId, int activityId)
+        {
+                var param0 = new SqlParameter("@p0", SqlDbType.Int) { Value = userId };
+                var param1 = new SqlParameter("@p1", SqlDbType.Int) { Value = resourceVersionId };
+                var param2 = new SqlParameter("@p2", SqlDbType.Int) { Value = activityId };
+
+                var retVal = await this.DbContext.AssessmentActivityCompletionViewModel
+                    .FromSqlRaw("EXEC activity.GetAssessmentActivityCompletionPercentage @p0, @p1, @p2", param0, param1, param2)
+                    .AsNoTracking()
+                    .ToListAsync();
+
+                AssessmentActivityCompletionViewModel assessmentResourceActivityQuestion = retVal.FirstOrDefault();
+                return assessmentResourceActivityQuestion;
+        }
+
         /// <summary>
         /// Get Resource Activity by user id.
         /// </summary>
@@ -279,42 +299,42 @@ public async Task<List<ResourceActivity>> GetAllTheActivitiesFromSP(int userId,
         /// <returns>ResourceActivity.</returns>
         public async Task<IQueryable<ResourceActivity>> GetByUserIdWithResourceVersionId(int userId, int resourceVersionId)
         {
-            var param0 = new SqlParameter("@userId", SqlDbType.Int) { Value = userId };
-            var param1 = new SqlParameter("@resourceVersionId", SqlDbType.Int) { Value = resourceVersionId };
-            var result = await this.DbContext.MyLearningActivity.FromSqlRaw("[activity].[GetUserLatestActivityCheck] @userId, @resourceVersionId ", param0, param1)
-                .AsNoTracking().ToListAsync();
-
-            // Bind result to ResourceActivity model
-            this.BindNestedData(result);
-            List<ResourceActivity> listOfresourceActivities = result.Select(i => new ResourceActivity()
-            {
-                ActivityEnd = i.ActivityEnd,
-                ActivityStart = i.ActivityStart,
-                ActivityStatusId = i.ActivityStatusId,
-                AmendDate = i.AmendDate,
-                AmendUserId = i.AmendUserId,
-                AssessmentResourceActivity = i.AssessmentResourceActivity,
-                CreateDate = i.CreateDate,
-                CreateUserId = i.CreateUserId,
-                Deleted = i.Deleted,
-                DurationSeconds = i.DurationSeconds ?? 0,
-                Id = i.Id,
-                InverseLaunchResourceActivity = i.Resource_InverseLaunchResourceActivity,
-                LaunchResourceActivityId = i.LaunchResourceActivityId,
-                MajorVersion = i.MajorVersion,
-                MediaResourceActivity = i.Resource_MediaResourceActivity,
-                MinorVersion = i.MinorVersion,
-                NodePath = i.NodePath,
-                NodePathId = i.NodePathId,
-                Resource = i.Resource,
-                ResourceId = i.ResourceId,
-                ResourceVersion = i.ResourceVersion,
-                ResourceVersionId = i.ResourceVersionId,
-                Score = i.Score,
-                ScormActivity = i.ScormActivity,
-                UserId = i.UserId,
-            }).ToList();
-            return listOfresourceActivities.OrderByDescending(r => r.ActivityStart).AsQueryable();
+                var param0 = new SqlParameter("@userId", SqlDbType.Int) { Value = userId };
+                var param1 = new SqlParameter("@resourceVersionId", SqlDbType.Int) { Value = resourceVersionId };
+                var result = await this.DbContext.MyLearningActivity.FromSqlRaw("[activity].[GetUserLatestActivityCheck] @userId, @resourceVersionId ", param0, param1)
+                    .AsNoTracking().ToListAsync();
+
+                // Bind result to ResourceActivity model
+                this.BindNestedData(result);
+                List<ResourceActivity> listOfresourceActivities = result.Select(i => new ResourceActivity()
+                {
+                    ActivityEnd = i.ActivityEnd,
+                    ActivityStart = i.ActivityStart,
+                    ActivityStatusId = i.ActivityStatusId,
+                    AmendDate = i.AmendDate,
+                    AmendUserId = i.AmendUserId,
+                    AssessmentResourceActivity = i.AssessmentResourceActivity,
+                    CreateDate = i.CreateDate,
+                    CreateUserId = i.CreateUserId,
+                    Deleted = i.Deleted,
+                    DurationSeconds = i.DurationSeconds ?? 0,
+                    Id = i.Id,
+                    InverseLaunchResourceActivity = i.Resource_InverseLaunchResourceActivity,
+                    LaunchResourceActivityId = i.LaunchResourceActivityId,
+                    MajorVersion = i.MajorVersion,
+                    MediaResourceActivity = i.Resource_MediaResourceActivity,
+                    MinorVersion = i.MinorVersion,
+                    NodePath = i.NodePath,
+                    NodePathId = i.NodePathId,
+                    Resource = i.Resource,
+                    ResourceId = i.ResourceId,
+                    ResourceVersion = i.ResourceVersion,
+                    ResourceVersionId = i.ResourceVersionId,
+                    Score = i.Score,
+                    ScormActivity = i.ScormActivity,
+                    UserId = i.UserId,
+                }).ToList();
+                return listOfresourceActivities.OrderByDescending(r => r.ActivityStart).AsQueryable();
         }
 
         private void BindNestedData(List<MyLearningActivity> result)
@@ -343,25 +363,7 @@ private void BindResourceVersionBlockData(List<MyLearningActivity> result)
         {
             result.ToList().ForEach(i =>
             {
-                var a = result.Where(x => x.Id == i.Id).ToList().DistinctBy(l => l.Block_BlockId);
-                List<Block> blocksList = new List<Block>();
-                foreach (var b in a)
-                {
-                    Block blocks = new Block();
-                    blocks.Id = b.Block_BlockId ?? 0;
-                    blocks.BlockCollectionId = b.Block_BlockCollectionId ?? 0;
-                    var blockType = b.Block_BlockType ?? 0;
-                    blocks.BlockType = (BlockType)blockType;
-                    blocks.Title = b.Block_Title;
-                    blocks.Order = b.Block_Order ?? 0;
-                    blocksList.Add(blocks);
-                }
-
-                i.ResourceVersion_AssessmentResourceVersion.AssessmentContent = new BlockCollection();
-                i.ResourceVersion_AssessmentResourceVersion.AssessmentContent.Blocks = blocksList;
                 i.ResourceVersion.AssessmentResourceVersion = new AssessmentResourceVersion();
-                i.ResourceVersion.AssessmentResourceVersion.AssessmentContent = new BlockCollection();
-                i.ResourceVersion.AssessmentResourceVersion.AssessmentContent.Blocks = blocksList;
                 int assessmentType = i.ResourceVersion_AssessmentResourceVersion_AssessmentType ?? 0;
                 i.ResourceVersion.AssessmentResourceVersion.AssessmentType = (AssessmentTypeEnum)assessmentType;
                 i.ResourceVersion.AssessmentResourceVersion.PassMark = i.ResourceVersion_PassMark;
@@ -397,21 +399,6 @@ private void BindAssessmentResourceActivityNestedData(List<MyLearningActivity> r
                     assessmentResourceActivity.Id = i.AssessmentResourceActivity_Id ?? 0;
                     assessmentResourceActivity.Score = i.AssessmentResourceActivity_Score;
                     assessmentResourceActivity.Reason = i.AssessmentResourceActivity_Reason;
-                    var c = result.Where(x => x.Id == i.Id).ToList().DistinctBy(l => l.AssessmentResourceActivity_AssessmentResourceActivityInteraction_QuestionBlockId);
-                    List<AssessmentResourceActivityInteraction> assessmentResourceActivityInteractionList = new List<AssessmentResourceActivityInteraction>();
-                    foreach (var item in c)
-                    {
-                        if (i.AssessmentResourceActivity_AssessmentResourceActivityInteraction_Id != null)
-                        {
-                            AssessmentResourceActivityInteraction assessmentResourceActivityInteraction = new AssessmentResourceActivityInteraction();
-                            assessmentResourceActivityInteraction.AssessmentResourceActivityId = i.AssessmentResourceActivity_AssessmentResourceActivityInteraction_AssessmentResourceActivityId ?? 0;
-                            assessmentResourceActivityInteraction.Id = i.AssessmentResourceActivity_AssessmentResourceActivityInteraction_Id ?? 0;
-                            assessmentResourceActivityInteraction.QuestionBlockId = i.AssessmentResourceActivity_AssessmentResourceActivityInteraction_QuestionBlockId ?? 0;
-                            assessmentResourceActivityInteractionList.Add(assessmentResourceActivityInteraction);
-                        }
-                    }
-
-                    assessmentResourceActivity.AssessmentResourceActivityInteractions = assessmentResourceActivityInteractionList;
                     i.AssessmentResourceActivity.Add(assessmentResourceActivity);
                 }
             });
diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
index 3027cdbc6..a94854e89 100644
--- a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHubDbContext.cs b/WebAPI/LearningHub.Nhs.Repository/LearningHubDbContext.cs
index 1d94dc9b6..77f14343c 100644
--- a/WebAPI/LearningHub.Nhs.Repository/LearningHubDbContext.cs
+++ b/WebAPI/LearningHub.Nhs.Repository/LearningHubDbContext.cs
@@ -15,9 +15,11 @@ namespace LearningHub.Nhs.Repository
     using LearningHub.Nhs.Models.Entities.Resource.Blocks;
     using LearningHub.Nhs.Models.Hierarchy;
     using LearningHub.Nhs.Models.Messaging;
+    using LearningHub.Nhs.Models.MyLearning;
     using LearningHub.Nhs.Models.Resource;
     using LearningHub.Nhs.Models.Resource.ResourceDisplay;
     using LearningHub.Nhs.Models.User;
+    using LearningHub.Nhs.Repository.Activity;
     using Microsoft.EntityFrameworkCore;
 
     /// <summary>
@@ -780,6 +782,11 @@ public LearningHubDbContextOptions Options
         /// </summary>
         public virtual DbSet<AllCatalogueViewModel> AllCatalogueViewModel { get; set; }
 
+        /// <summary>
+        /// Gets or sets the AssessmentResourceActivityQuestionViewModel.
+        /// </summary>
+        public virtual DbSet<AssessmentActivityCompletionViewModel> AssessmentActivityCompletionViewModel { get; set; }
+
         /// <summary>
         /// The on model creating.
         /// </summary>
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
index b49011e8c..aa9b8c854 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
@@ -16,7 +16,7 @@
 	<PackageReference Include="Azure.Storage.Queues" Version="12.11.0" />
 	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
index ef4a2180b..c8970073f 100644
--- a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="EntityFrameworkCore.Testing.Moq" Version="4.0.0" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
index 9a2ab84b2..c1db140fe 100644
--- a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
+++ b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
     <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.28.0" />
     <PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
diff --git a/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs b/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
index a4d6049f9..82e2ce2f8 100644
--- a/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/MyLearningService.cs
@@ -362,13 +362,12 @@ public async Task<List<MyLearningDetailedItemViewModel>> PopulateMyLearningDetai
                     {
                         viewModel.AssessmentResourceActivityId = activity.Id;
                         viewModel.Complete = activity.Score != null;
-                        var totalQuestions = resourceActivity.ResourceVersion.AssessmentResourceVersion.AssessmentContent.Blocks.Where(b => b.BlockType == BlockType.Question).Count();
-                        var completedQuestions = activity.AssessmentResourceActivityInteractions.Count();
-                        viewModel.CompletionPercentage = totalQuestions == 0 ? 0 : Convert.ToInt32(100 * completedQuestions / Convert.ToDecimal(totalQuestions));
                         viewModel.ScorePercentage = activity.Score.HasValue ? (int)Math.Round(activity.Score.Value, MidpointRounding.AwayFromZero) : 0;
 
                         var currentAttempt = allAttempts.FindIndex(a => a.Id == resourceActivity.Id) + 1;
 
+                        var assessmemntActivityQuestion = await this.resourceActivityRepository.GetAssessmentActivityCompletionPercentage(resourceActivity.CreateUserId, resourceActivity.ResourceVersionId, resourceActivity.Id);
+                        viewModel.CompletionPercentage = (int)assessmemntActivityQuestion.CompletionPercentage;
                         if (viewModel.CompletionPercentage == 100)
                         {
                             if (resourceActivity.ResourceVersion.AssessmentResourceVersion.AssessmentType == AssessmentTypeEnum.Informal)
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
index 28730e740..22f02c0cf 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="IdentityModel" Version="5.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
index d08aa9391..8a45f5232 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
index 28916df8b..64a326d3b 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
index e71105e0b..226acf08a 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
   </ItemGroup>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
index 9addb85a0..70df59e57 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
index 8e0c512aa..fb53d0e90 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="FluentValidation" Version="10.3.4" />
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.44" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From 680116a66759d1c3dcb4e3d185c992f462150ffd Mon Sep 17 00:00:00 2001
From: Anju Jose <Anju.Jose@hee.nhs.uk>
Date: Wed, 18 Dec 2024 15:54:37 +0000
Subject: [PATCH 114/143] revert changes

---
 .../Components/DateInput/Default.cshtml       | 22 +++++++++----------
 .../Components/ErrorSummary/Default.cshtml    |  4 ----
 .../Components/RadioList/Default.cshtml       | 16 +-------------
 3 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
index d1b0f1294..426e57235 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
@@ -54,12 +54,12 @@
                            id="@Model.DayId"
                            name="@Model.DayId"
                            value="@Model.DayValue"
-                           type="text"
+                           type="number"
+                           pattern="[0-9]*"
                            min="1"
                            max="31"
                            step="1"
-                           inputmode="numeric"
-                           aria-describedby="date-error" aria-invalid="false" />
+                           inputmode="numeric" />
                 </div>
             </div>
             <div class="nhsuk-date-input__item">
@@ -69,12 +69,12 @@
                            id="@Model.MonthId"
                            name="@Model.MonthId"
                            value="@Model.MonthValue"
-                           type="text"
+                           type="number"
+                           pattern="[0-9]*"
                            min="1"
                            max="12"
                            step="1"
-                           inputmode="numeric"
-                           aria-describedby="date-error" aria-invalid="false" />
+                           inputmode="numeric" />
                 </div>
             </div>
             <div class="nhsuk-date-input__item">
@@ -84,16 +84,14 @@
                            id="@Model.YearId"
                            name="@Model.YearId"
                            value="@Model.YearValue"
-                           type="text"
+                           type="number"
+                           pattern="[0-9]*"
                            min="1900"
                            max="9999"
                            step="1"
-                           inputmode="numeric"
-                           aria-describedby="date-error" aria-invalid="false" />
+                           inputmode="numeric" />
                 </div>
             </div>
-            <span id="date-error" class="error-message--margin-bottom-1 nhsuk-error-message" aria-live="polite" style="visibility: hidden;">
-            </span>
         </div>
     </fieldset>
-</div>
\ No newline at end of file
+</div>
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml
index 7f438d581..269b174f8 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml
@@ -21,10 +21,6 @@
             </ul>
         </div>
     </div>
-    <script>
-        const errorSummary = document.querySelector("#error-summary-title").parentElement;
-        errorSummary.focus();
-    </script>
 }
 else
 {
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
index 2bcd6dae9..05eb26699 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
@@ -44,7 +44,7 @@
 
         @if (Model.Required && !Model.HasError)
         {
-            <div data-valmsg-for="@Model.AspFor" data-valmsg-replace="true" class="error-message--margin-bottom-1 nhsuk-error-message field-validation-valid nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3" aria-live="assertive" role="alert">
+            <div data-valmsg-for="@Model.AspFor" data-valmsg-replace="true" class="error-message--margin-bottom-1 nhsuk-error-message field-validation-valid nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3">
             </div>
         }
 
@@ -131,19 +131,5 @@
 
         </div>
     </fieldset>
-    <script>
-        window.onload = function() {
-            const id = "@Model.AspFor";
-            const radioForm = document.querySelector("main form[novalidate='novalidate']");
-            radioForm.addEventListener("submit", () => {
-                const errorMessageParent = document.querySelector("div[data-valmsg-for='" + id + "']");
-                const errorMessage = errorMessageParent.innerHTML;
-                errorMessageParent.innerHTML = "";
 
-                setTimeout(function () {
-                    errorMessageParent.innerHTML = errorMessage;
-                }, 0);
-            });
-        };
-    </script>
 </div>
\ No newline at end of file

From 735deb0829eb237473628011ff5579df1783be9b Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Thu, 19 Dec 2024 11:04:49 +0000
Subject: [PATCH 115/143] TD-4180: updated view component version

---
 LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index a59bfcbcb..e44f4f060 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -128,7 +128,7 @@
 		<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
 		<PackageReference Include="MK.IO" Version="1.5.0" />
-		<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.26" />
+		<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.27" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From 244e59772f6bb5e345df15a52178fb0622f20e18 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Fri, 20 Dec 2024 09:00:41 +0000
Subject: [PATCH 116/143] TD-4180: Updating View Component files

---
 .../Components/DateInput/Default.cshtml       | 20 +++++++++----------
 .../Components/ErrorSummary/Default.cshtml    |  4 ++++
 .../Components/RadioList/Default.cshtml       |  5 ++---
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
index 426e57235..049706326 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/DateInput/Default.cshtml
@@ -8,7 +8,7 @@
     var yearErrorCss = Model.HasYearError ? "nhsuk-input--error" : "";
     var hintTextLine = string.Empty;
 }
-
+@* Removed pattern property *@
 <div class="@Model.CssClass @errorCss" id="@Model.Id">
     <fieldset class="nhsuk-fieldset" aria-describedby="@Model.Id-hint" role="group">
         <legend class="nhsuk-fieldset__legend nhsuk-label">
@@ -54,12 +54,12 @@
                            id="@Model.DayId"
                            name="@Model.DayId"
                            value="@Model.DayValue"
-                           type="number"
-                           pattern="[0-9]*"
+                           type="text"
                            min="1"
                            max="31"
                            step="1"
-                           inputmode="numeric" />
+                           inputmode="numeric"
+                           aria-describedby="date-error" aria-invalid="false" />
                 </div>
             </div>
             <div class="nhsuk-date-input__item">
@@ -69,12 +69,12 @@
                            id="@Model.MonthId"
                            name="@Model.MonthId"
                            value="@Model.MonthValue"
-                           type="number"
-                           pattern="[0-9]*"
+                           type="text"
                            min="1"
                            max="12"
                            step="1"
-                           inputmode="numeric" />
+                           inputmode="numeric"
+                           aria-describedby="date-error" aria-invalid="false" />
                 </div>
             </div>
             <div class="nhsuk-date-input__item">
@@ -84,12 +84,12 @@
                            id="@Model.YearId"
                            name="@Model.YearId"
                            value="@Model.YearValue"
-                           type="number"
-                           pattern="[0-9]*"
+                           type="text"
                            min="1900"
                            max="9999"
                            step="1"
-                           inputmode="numeric" />
+                           inputmode="numeric"
+                           aria-describedby="date-error" aria-invalid="false" />
                 </div>
             </div>
         </div>
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml
index 269b174f8..7f438d581 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/ErrorSummary/Default.cshtml
@@ -21,6 +21,10 @@
             </ul>
         </div>
     </div>
+    <script>
+        const errorSummary = document.querySelector("#error-summary-title").parentElement;
+        errorSummary.focus();
+    </script>
 }
 else
 {
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
index 05eb26699..eddfb332c 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
@@ -9,7 +9,7 @@
 
 <div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
 
-    <fieldset class="nhsuk-fieldset" aria-describedby="@(!string.IsNullOrEmpty(Model.HintText) ? $"{Model.Label.RemoveWhitespace()}-hint" : string.Empty)">
+    <fieldset id="@Model.AspFor" class="nhsuk-fieldset" aria-describedby="@(!string.IsNullOrEmpty(Model.HintText) ? $"{Model.Label.RemoveWhitespace()}-hint" : string.Empty)">
         <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m">
             @if (Model.IsPageHeading.GetValueOrDefault() == true)
             {
@@ -44,7 +44,7 @@
 
         @if (Model.Required && !Model.HasError)
         {
-            <div data-valmsg-for="@Model.AspFor" data-valmsg-replace="true" class="error-message--margin-bottom-1 nhsuk-error-message field-validation-valid nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3">
+            <div data-valmsg-for="@Model.AspFor" data-valmsg-replace="true" class="error-message--margin-bottom-1 nhsuk-error-message field-validation-valid nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3" aria-live="assertive" role="alert">
             </div>
         }
 
@@ -131,5 +131,4 @@
 
         </div>
     </fieldset>
-
 </div>
\ No newline at end of file

From ecef65a6db57a856fb32e91d5c02be57c79da006 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Fri, 20 Dec 2024 09:57:04 +0000
Subject: [PATCH 117/143] TD-4072: Heading level corrected

---
 LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml | 2 +-
 LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml    | 4 ++--
 LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml     | 4 ++--
 LearningHub.Nhs.WebUI/Views/Home/_StaticTray.cshtml       | 8 ++++----
 .../Views/Search/_CatalogueSearchResult.cshtml            | 4 ++--
 .../Views/Search/_ResourceSearchResult.cshtml             | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml
index 702e4277c..fe51ac243 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml
@@ -49,7 +49,7 @@
             </div>
         </div>
         <div class="nhsuk-grid-row">
-            <h3 class="allCatalogue-lettercard nhsuk-u-font-size-36">@Model.FilterChar</h3>
+            <h2 class="allCatalogue-lettercard nhsuk-u-font-size-36">@Model.FilterChar</h2>
 
         </div>
         <hr class="nhsuk-section-break nhsuk-section-break--m nhsuk-section-break--visible">
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
index ac50513b8..341556517 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
@@ -33,9 +33,9 @@
   }
 
   <div class="nhsuk-card__content dashboard-card-content">
-    <h2 class="nhsuk-card__heading nhsuk-heading-m">
+    <h3 class="nhsuk-card__heading nhsuk-heading-m">
       <a class="nhsuk-card__link" asp-controller="Catalogue" asp-action="Index" asp-route-reference="@Model.Url">@Model.Name</a>
-    </h2>
+    </h3>
     <div class="nhsuk-card__description dashboard-card-body">
       <div class="line-clamp-3 nhsuk-u-margin-bottom-2point5">
         @UtilityHelper.StripHtmlFromString(Model.Description)
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
index 6379cddb7..7e70482ab 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
@@ -28,10 +28,10 @@
 
   <div class="nhsuk-card__content dashboard-card-content">
     <div>
-      <h2 class="nhsuk-card__heading nhsuk-heading-m line-clamp-2">
+      <h3 class="nhsuk-card__heading nhsuk-heading-m line-clamp-2">
         <a class="nhsuk-card__link" asp-controller="Dashboard" asp-action="RecordDashboardNavigation" asp-route-eventType="@EventTypeEnum.DashBoardResourceView"
            asp-route-url="@("/Resource/" + Model.Item2.ResourceReferenceId)" asp-route-resourceReference="@Model.Item2.ResourceReferenceId">@UtilityHelper.StripHtmlFromString(Model.Item2.Title)</a>
-      </h2>
+      </h3>
     </div>
     <div class="nhsuk-card__description dashboard-card-body">
       <div>
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_StaticTray.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_StaticTray.cshtml
index 4cd9b013f..d008caed6 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_StaticTray.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_StaticTray.cshtml
@@ -7,10 +7,10 @@
         <li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
             <div class="nhsuk-card">
                 <div class="nhsuk-card__content">
-                    <h2 class="nhsuk-card__heading nhsuk-heading-m">
+                    <h3 class="nhsuk-card__heading nhsuk-heading-m">
                         <a class="nhsuk-card__link" asp-controller="Dashboard" asp-action="RecordDashboardNavigation" asp-route-eventType="@EventTypeEnum.DashBoardElfh"
                            asp-route-url="/catalogue/pathologyportal">The Pathology Portal</a>
-                    </h2>
+                    </h3>
                     <p class="nhsuk-card__description">
                         Developed for pathology trainees and practising pathologists, the portal features innovative and interactive
                         short modules to support training curricula and CPD from world class faculty.
@@ -24,10 +24,10 @@
                     <div class="bmj-best-practice-logo-border">
                         <div class="bmj-best-practice-logo-image"></div>
                     </div>
-                    <h2 class="nhsuk-card__heading nhsuk-heading-m">
+                    <h3 class="nhsuk-card__heading nhsuk-heading-m">
                         <a class="nhsuk-card__link" asp-controller="Dashboard" asp-action="RecordDashboardNavigation" asp-route-eventType="@EventTypeEnum.DashBoardBmj"
                            asp-route-url="https://www.bmj.com/company/hee/">BMJ Best Practice</a>
-                    </h2>
+                    </h3>
                     <p class="nhsuk-card__description">
                         This tool uses the latest evidence-based research, guidelines and expert opinion to offer step-by-step guidance on diagnosis, prognosis, treatment and prevention.
                     </p>
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml
index 6c1149b38..55b297410 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml
@@ -73,9 +73,9 @@
           }
           <div class="nhsuk-card__content catalogue-card-content">
 
-            <h2 class="nhsuk-card__heading nhsuk-heading-m">
+            <h3 class="nhsuk-card__heading nhsuk-heading-m">
               <a class="nhsuk-card__link" href="@GetCatalogueUrl(item.Url, item.NodePathId, index, Int32.Parse(item.Id), item.Click.Payload)">@item.Name</a>
-            </h2>
+            </h3>
 
             <div class="nhsuk-card__description catalogue-card-body">
               <div class="line-clamp-3 nhsuk-u-margin-bottom-2point5">
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
index d4faffd0d..ea636286c 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
@@ -36,9 +36,9 @@
   var provider = item.Providers?.FirstOrDefault();
 
   <div class="resource-item nhsuk-list-item--border nhsuk-u-padding-bottom-4 nhsuk-u-margin-bottom-4">
-    <h2 class="nhsuk-heading-xs nhsuk-u-margin-bottom-2">
+    <h3 class="nhsuk-heading-xs nhsuk-u-margin-bottom-2">
       <a class="nhsuk-card__link" href="@GetUrl(item.ResourceReferenceId, index, item.NodePathId??0, item.Click.Payload)">@item.Title</a>
-    </h2>
+    </h3>
 
     @if (provider != null)
     {

From 1bdac89554d68eb8ac87569fb049a932c52ed4dd Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Fri, 20 Dec 2024 12:00:21 +0000
Subject: [PATCH 118/143] headerFix

---
 LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml
index fe51ac243..832bc47a8 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/AllCatalogue.cshtml
@@ -14,7 +14,7 @@
 <div class="all-catalogue">
 <div class="nhsuk-width-container app-width-container" style="width:100%">
     <h1 class="nhsuk-u-margin-top-5">
-        A-Z of catalogues
+        A-Z of Catalogues
     </h1>
         
         <div class="nhsuk-grid-row">

From 8e5af6906f35cbc7988543d409d109210b7d437b Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Mon, 23 Dec 2024 03:25:32 +0000
Subject: [PATCH 119/143] TD-5176 Large file download fix.

---
 .../Interfaces/IFileService.cs                |   4 +-
 .../Models/FileDownloadResponse.cs            |  25 ++++
 LearningHub.Nhs.WebUI/Services/FileService.cs | 107 +++++++++++++++---
 3 files changed, 119 insertions(+), 17 deletions(-)
 create mode 100644 LearningHub.Nhs.WebUI/Models/FileDownloadResponse.cs

diff --git a/LearningHub.Nhs.WebUI/Interfaces/IFileService.cs b/LearningHub.Nhs.WebUI/Interfaces/IFileService.cs
index c74a1681f..eb94d0185 100644
--- a/LearningHub.Nhs.WebUI/Interfaces/IFileService.cs
+++ b/LearningHub.Nhs.WebUI/Interfaces/IFileService.cs
@@ -5,6 +5,7 @@
     using System.Threading.Tasks;
     using Azure.Storage.Files.Shares.Models;
     using LearningHub.Nhs.Models.Resource;
+    using LearningHub.Nhs.WebUI.Models;
 
     /// <summary>
     /// Defines the <see cref="IFileService" />.
@@ -25,7 +26,8 @@ public interface IFileService
         /// <param name="filePath">File path.</param>
         /// <param name="fileName">File name.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        Task<ShareFileDownloadInfo> DownloadFileAsync(string filePath, string fileName);
+        // Task<ShareFileDownloadInfo> DownloadFileAsync(string filePath, string fileName);
+        Task<FileDownloadResponse> DownloadFileAsync(string filePath, string fileName);
 
         /// <summary>
         /// The StreamFileAsync.
diff --git a/LearningHub.Nhs.WebUI/Models/FileDownloadResponse.cs b/LearningHub.Nhs.WebUI/Models/FileDownloadResponse.cs
new file mode 100644
index 000000000..8036e9320
--- /dev/null
+++ b/LearningHub.Nhs.WebUI/Models/FileDownloadResponse.cs
@@ -0,0 +1,25 @@
+namespace LearningHub.Nhs.WebUI.Models
+{
+    using System.IO;
+
+    /// <summary>
+    /// Defines the <see cref="FileDownloadResponse" />.
+    /// </summary>
+    public class FileDownloadResponse
+    {
+        /// <summary>
+        /// Gets or sets the Content.
+        /// </summary>
+        public Stream Content { get; set; }
+
+        /// <summary>
+        /// Gets or sets the ContentType.
+        /// </summary>
+        public string ContentType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the ContentType.
+        /// </summary>
+        public long ContentLength { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Services/FileService.cs b/LearningHub.Nhs.WebUI/Services/FileService.cs
index 4e02db124..de74a44e3 100644
--- a/LearningHub.Nhs.WebUI/Services/FileService.cs
+++ b/LearningHub.Nhs.WebUI/Services/FileService.cs
@@ -1,15 +1,20 @@
 namespace LearningHub.Nhs.WebUI.Services
 {
     using System;
+    using System.Buffers;
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
+    using System.Threading;
     using System.Threading.Tasks;
+    using System.Threading.Tasks.Dataflow;
+    using Azure;
     using Azure.Storage.Files.Shares;
     using Azure.Storage.Files.Shares.Models;
     using LearningHub.Nhs.Models.Resource;
     using LearningHub.Nhs.WebUI.Configuration;
     using LearningHub.Nhs.WebUI.Interfaces;
+    using LearningHub.Nhs.WebUI.Models;
     using Microsoft.AspNetCore.StaticFiles;
     using Microsoft.Extensions.Options;
 
@@ -125,32 +130,79 @@ public async Task DeleteChunkDirectory(string directoryRef, int chunks)
         /// </summary>
         /// <param name="filePath">The filePath.</param>
         /// <param name="fileName">The fileName.</param>
-        /// <returns>The <see cref="Task{CloudFile}"/>.</returns>
-        public async Task<ShareFileDownloadInfo> DownloadFileAsync(string filePath, string fileName)
+        /// <returns>The <see cref="Task{FileDownloadResponse}"/>.</returns>
+        public async Task<FileDownloadResponse> DownloadFileAsync(string filePath, string fileName)
         {
-            var directory = this.ShareClient.GetDirectoryClient(filePath);
-            var sourceDirectory = this.InputArchiveShareClient.GetDirectoryClient(filePath);
+            const int ChunkSizeInMB = 100;
+            const int MaxParallelDownloads = 8;
+            int chunkSize = ChunkSizeInMB * 1024 * 1024;
 
-            if (await directory.ExistsAsync())
+            var file = await this.FindFileAsync(filePath, fileName);
+            if (file == null)
             {
-                var file = directory.GetFileClient(fileName);
+                return null;
+            }
 
-                if (await file.ExistsAsync())
+            var properties = await file.GetPropertiesAsync();
+            long fileSize = properties.Value.ContentLength;
+
+            // If the file size is less than 500 MB, download it directly
+            if (fileSize <= 500 * 1024 * 1024)
+            {
+                var response = await file.DownloadAsync();
+                return new FileDownloadResponse
                 {
-                    return await file.DownloadAsync();
-                }
+                    Content = response.Value.Content,
+                    ContentType = properties.Value.ContentType,
+                    ContentLength = fileSize,
+                };
             }
-            else if (await sourceDirectory.ExistsAsync())
-            {
-                var file = sourceDirectory.GetFileClient(fileName);
 
-                if (await file.ExistsAsync())
+            var pipe = new System.IO.Pipelines.Pipe();
+            var semaphore = new SemaphoreSlim(1, 1);
+
+            var downloadBlock = new ActionBlock<long>(
+                async offset =>
                 {
-                    return await file.DownloadAsync();
-                }
+                    long rangeSize = Math.Min(chunkSize, fileSize - offset);
+                    try
+                    {
+                        var response = await file.DownloadAsync(new HttpRange(offset, rangeSize));
+                        var buffer = new byte[rangeSize];
+                        await response.Value.Content.ReadAsync(buffer, 0, (int)rangeSize);
+
+                        await semaphore.WaitAsync();
+                        try
+                        {
+                            pipe.Writer.Write(buffer);
+                        }
+                        finally
+                        {
+                            semaphore.Release();
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new Exception($"Error downloading chunk at offset {offset}: {ex.Message}");
+                    }
+                },
+                new ExecutionDataflowBlockOptions { MaxDegreeOfParallelism = MaxParallelDownloads, EnsureOrdered = false });
+
+            for (long offset = 0; offset < fileSize; offset += chunkSize)
+            {
+                downloadBlock.Post(offset);
             }
 
-            return null;
+            downloadBlock.Complete();
+            await downloadBlock.Completion;
+            await pipe.Writer.CompleteAsync();
+
+            return new FileDownloadResponse
+            {
+                Content = pipe.Reader.AsStream(),
+                ContentType = properties.Value.ContentType,
+                ContentLength = fileSize,
+            };
         }
 
         /// <summary>
@@ -418,5 +470,28 @@ private async Task MoveInPutDirectoryToArchive(List<string> allDirectoryRef)
                 }
             }
         }
+
+        private async Task<ShareFileClient> FindFileAsync(string filePath, string fileName)
+        {
+            var directories = new[]
+            {
+                this.ShareClient.GetDirectoryClient(filePath),
+                this.InputArchiveShareClient.GetDirectoryClient(filePath),
+            };
+
+            foreach (var directory in directories)
+            {
+                if (await directory.ExistsAsync())
+                {
+                    var file = directory.GetFileClient(fileName);
+                    if (await file.ExistsAsync())
+                    {
+                        return file;
+                    }
+                }
+            }
+
+            return null;
+        }
     }
 }
\ No newline at end of file

From 81017cd56af2907bc3a8ad1517684176daa619a4 Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Mon, 23 Dec 2024 14:27:50 +0000
Subject: [PATCH 120/143] Fixes

---
 AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_Layout.cshtml    | 1 +
 .../Views/Shared/Tenant/LearningHub/_Layout.cshtml             | 1 +
 .../LearningHub.Nhs.ReportApi/ServiceCollectionExtension.cs    | 3 ++-
 WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs       | 3 ++-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_Layout.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_Layout.cshtml
index 658a30add..d12be205a 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_Layout.cshtml
+++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Shared/_Layout.cshtml
@@ -81,4 +81,5 @@
     @RenderSection("Scripts", required: false)
 </body>
 </html>
+<!-- Build number: @settings.Value.BuildNumber -->
 @await Component.InvokeAsync("Version")
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
index 647e5c3bf..0c96940f7 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Tenant/LearningHub/_Layout.cshtml
@@ -164,6 +164,7 @@
 
 </body>
 </html>
+<!-- Build number: @settings.Value.BuildNumber -->
 @await Component.InvokeAsync("Version")
 @functions {
     public async Task<bool> DisplayOffline()
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi/ServiceCollectionExtension.cs b/ReportAPI/LearningHub.Nhs.ReportApi/ServiceCollectionExtension.cs
index d01574338..0d8cb488d 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi/ServiceCollectionExtension.cs
+++ b/ReportAPI/LearningHub.Nhs.ReportApi/ServiceCollectionExtension.cs
@@ -37,9 +37,10 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
             var settings = new Settings();
             configuration.Bind("Settings", settings);
 
+            var buildNumber = $"Build Number: {configuration["Swagger:BuildNumber"]}";
             var swaggerTitle = configuration["Swagger:Title"];
             var swaggerVersion = configuration["Swagger:Version"];
-            var swaggerDescription = "This is the API documentation for version ";
+            var swaggerDescription = "This is the API documentation for " + buildNumber + " and version ";
 
             services.AddSwaggerGen(c =>
             {
diff --git a/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs b/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs
index 9c8229639..58095800b 100644
--- a/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs
+++ b/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs
@@ -62,9 +62,10 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
             IMapper mapper = mappingConfig.CreateMapper();
             services.AddSingleton(mapper);
 
+            var buildNumber = $"Build Number: {configuration["Swagger:BuildNumber"]}";
             var swaggerTitle = configuration["Swagger:Title"];
             var swaggerVersion = configuration["Swagger:Version"];
-            var swaggerDescription = "This is the API documentation for version ";
+            var swaggerDescription = "This is the API documentation for " + buildNumber + " and version ";
             services.AddSwaggerGen(c =>
             {
                 var version = typeof(Program).Assembly.GetName().Version;

From 5caadb0795a23a78336038d520f8883b9231f0b6 Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Thu, 2 Jan 2025 09:17:24 +0000
Subject: [PATCH 121/143] TD-5176 file download refactor

---
 LearningHub.Nhs.WebUI/Services/FileService.cs | 55 ++-----------------
 1 file changed, 5 insertions(+), 50 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Services/FileService.cs b/LearningHub.Nhs.WebUI/Services/FileService.cs
index de74a44e3..a55433c9f 100644
--- a/LearningHub.Nhs.WebUI/Services/FileService.cs
+++ b/LearningHub.Nhs.WebUI/Services/FileService.cs
@@ -9,6 +9,7 @@
     using System.Threading.Tasks;
     using System.Threading.Tasks.Dataflow;
     using Azure;
+    using Azure.Storage;
     using Azure.Storage.Files.Shares;
     using Azure.Storage.Files.Shares.Models;
     using LearningHub.Nhs.Models.Resource;
@@ -133,10 +134,6 @@ public async Task DeleteChunkDirectory(string directoryRef, int chunks)
         /// <returns>The <see cref="Task{FileDownloadResponse}"/>.</returns>
         public async Task<FileDownloadResponse> DownloadFileAsync(string filePath, string fileName)
         {
-            const int ChunkSizeInMB = 100;
-            const int MaxParallelDownloads = 8;
-            int chunkSize = ChunkSizeInMB * 1024 * 1024;
-
             var file = await this.FindFileAsync(filePath, fileName);
             if (file == null)
             {
@@ -146,9 +143,9 @@ public async Task<FileDownloadResponse> DownloadFileAsync(string filePath, strin
             var properties = await file.GetPropertiesAsync();
             long fileSize = properties.Value.ContentLength;
 
-            // If the file size is less than 500 MB, download it directly
-            if (fileSize <= 500 * 1024 * 1024)
+            try
             {
+                // Directly download the entire file as a stream
                 var response = await file.DownloadAsync();
                 return new FileDownloadResponse
                 {
@@ -157,52 +154,10 @@ public async Task<FileDownloadResponse> DownloadFileAsync(string filePath, strin
                     ContentLength = fileSize,
                 };
             }
-
-            var pipe = new System.IO.Pipelines.Pipe();
-            var semaphore = new SemaphoreSlim(1, 1);
-
-            var downloadBlock = new ActionBlock<long>(
-                async offset =>
-                {
-                    long rangeSize = Math.Min(chunkSize, fileSize - offset);
-                    try
-                    {
-                        var response = await file.DownloadAsync(new HttpRange(offset, rangeSize));
-                        var buffer = new byte[rangeSize];
-                        await response.Value.Content.ReadAsync(buffer, 0, (int)rangeSize);
-
-                        await semaphore.WaitAsync();
-                        try
-                        {
-                            pipe.Writer.Write(buffer);
-                        }
-                        finally
-                        {
-                            semaphore.Release();
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        throw new Exception($"Error downloading chunk at offset {offset}: {ex.Message}");
-                    }
-                },
-                new ExecutionDataflowBlockOptions { MaxDegreeOfParallelism = MaxParallelDownloads, EnsureOrdered = false });
-
-            for (long offset = 0; offset < fileSize; offset += chunkSize)
+            catch (Exception ex)
             {
-                downloadBlock.Post(offset);
+                throw new Exception($"Error downloading file: {ex.Message}");
             }
-
-            downloadBlock.Complete();
-            await downloadBlock.Completion;
-            await pipe.Writer.CompleteAsync();
-
-            return new FileDownloadResponse
-            {
-                Content = pipe.Reader.AsStream(),
-                ContentType = properties.Value.ContentType,
-                ContentLength = fileSize,
-            };
         }
 
         /// <summary>

From 73db50a521d91886d2bb4131ea4d65ba34af4f40 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Thu, 2 Jan 2025 15:45:56 +0000
Subject: [PATCH 122/143] TD-5130: Clearing country selection on new search

---
 .../Controllers/AccountController.cs               | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
index 476569313..ded28c046 100644
--- a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
@@ -474,18 +474,18 @@ public async Task<IActionResult> CreateAccountRegionSelection(AccountCreationVie
                 accountCreation.CountryId = accountCreationViewModel.CountryId;
             }
 
-            if (accountCreation.CountryId == "1")
-            {
-                await this.multiPageFormService.SetMultiPageFormData(accountCreation, MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
-                var regionData = await this.regionService.GetAllPagedAsync(accountCreationViewModel.CurrentPageIndex, UserRegistrationContentPageSize);
-                return this.View(new AccountCreationListViewModel { Region = regionData.Item2, AccountCreationPaging = new AccountCreationPagingModel { TotalItems = regionData.Item1, PageSize = UserRegistrationContentPageSize, HasItems = regionData.Item1 > 0, CurrentPage = accountCreationViewModel.CurrentPageIndex }, RegionId = accountCreation.RegionId, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
-            }
-            else if (string.IsNullOrWhiteSpace(accountCreationViewModel.CountryId) || !countryCheck)
+            if (string.IsNullOrWhiteSpace(accountCreationViewModel.CountryId) || !countryCheck)
             {
                 this.ModelState.AddModelError("CountryId", CommonValidationErrorMessages.CountryRequired);
                 var countries = await this.countryService.GetFilteredAsync(accountCreationViewModel.FilterText);
                 return this.View("CreateAccountCountrySelection", new AccountCreationListViewModel { FilterText = accountCreationViewModel.FilterText, CountryList = countries.ToList(), ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
             }
+            else if (accountCreation.CountryId == "1")
+            {
+                await this.multiPageFormService.SetMultiPageFormData(accountCreation, MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
+                var regionData = await this.regionService.GetAllPagedAsync(accountCreationViewModel.CurrentPageIndex, UserRegistrationContentPageSize);
+                return this.View(new AccountCreationListViewModel { Region = regionData.Item2, AccountCreationPaging = new AccountCreationPagingModel { TotalItems = regionData.Item1, PageSize = UserRegistrationContentPageSize, HasItems = regionData.Item1 > 0, CurrentPage = accountCreationViewModel.CurrentPageIndex }, RegionId = accountCreation.RegionId, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
+            }
             else
             {
                 accountCreation.CountryId = accountCreationViewModel.CountryId;

From c87962faa16d89c8429d62dc0aba6950a46b82bc Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Mon, 6 Jan 2025 11:49:07 +0000
Subject: [PATCH 123/143] TD-4196: Fixed focus issue on my contibutions page

---
 .../vuesrc/mycontributions/gridcomponent.vue   |  2 +-
 .../vuesrc/mycontributions/mycontributions.vue | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/gridcomponent.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/gridcomponent.vue
index 78bd5d506..b76204b83 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/gridcomponent.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/gridcomponent.vue
@@ -23,7 +23,7 @@
                     </template>
                 </div>
                 <div class="load-more text-center pb-5" v-if="!this.hideLoadMore">
-                    <button class="btn btn-outline-custom" @click="loadNextRecordBatch()">{{ getLoadMoreButtonText() }}</button>
+                    <button class="nhsuk-button nhsuk-button--secondary" @click="loadNextRecordBatch()">{{ getLoadMoreButtonText() }}</button>
                 </div>
 
             </div>
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributions.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributions.vue
index f133b9135..a73753e16 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributions.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/mycontributions/mycontributions.vue
@@ -16,8 +16,8 @@
                         <a class="dropdown-toggle" href="#" role="button" id="dropdownCatalogueSelect" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             Change catalogue
                         </a>
-                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownCatalogueSelect">
-                            <a v-for="(catalogue, index) in userCatalogues" class="dropdown-item" @click="catalogueChange(catalogue.id, catalogue.nodeId)" :tabindex="index">{{getCatalogueName(catalogue)}}</a>
+                        <div id="catalogueMenuItem" role="menu" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownCatalogueSelect">
+                            <a v-for="(catalogue, index) in userCatalogues" role="menuitem" class="dropdown-item" v-on:keyup.enter="keyboardCatalogueSelection(catalogue.id, catalogue.nodeId)" @click="catalogueChange(catalogue.id, catalogue.nodeId)"  :tabindex="index">{{getCatalogueName(catalogue)}}</a>
                         </div>
                     </div>
                 </div>
@@ -255,6 +255,13 @@
             setRestrictToCurrentUser() {
                 this.$store.commit("myContributionsState/setRestrictToCurrentUser", this.restrictToCurrentUser);
             },
+            keyboardCatalogueSelection(catalogueNodeVersionId: number, nodeId: number) {
+                this.catalogueChange(catalogueNodeVersionId, nodeId);
+                const dropdownMenu = document.getElementById('catalogueMenuItem');
+                if (dropdownMenu) {
+                    dropdownMenu.classList.remove('show'); 
+                }
+            },
             keyboardSelection(tabIndex: number) {
                 switch (tabIndex) {
                     case MyContributeTabEnum.ActionRequired:
@@ -382,6 +389,13 @@
         margin-right: auto;
     }
 
+    a.dropdown-item:hover,
+    a.dropdown-item:focus {
+        background-color: $nhsuk-blue !important;
+        color: $nhsuk-white !important;
+        box-shadow: none !important;
+    }
+
     @media (min-width: 769px) {
         .border-y-grey {
             border-top: 1px solid $nhsuk-grey-light;

From 8842058d286a2b6c9f435a964ba59aae933100a9 Mon Sep 17 00:00:00 2001
From: Arunima George <arunima.george@nhs.net>
Date: Mon, 6 Jan 2025 12:46:48 +0000
Subject: [PATCH 124/143] TD-5130: Fixed unknown error

---
 .../Views/Account/CreateAccountSearchRole.cshtml               | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml
index e42fd6f45..af00e7ca5 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountSearchRole.cshtml
@@ -5,7 +5,8 @@
 @{
     ViewData["Title"] = "Role";
     var errorHasOccurred = !ViewData.ModelState.IsValid;
-    var routeData = new Dictionary<string, string> { { "CountryId", Context.Request.Query["CountryId"] } };
+    string currentCountry = !string.IsNullOrWhiteSpace(Context.Request.Query["CountryId"]) ? Context.Request.Query["CountryId"] : Model.CountryId;
+    var routeData = new Dictionary<string, string> { { "CountryId", currentCountry } };
 }
 
 @section styles{

From fe29a4ce13196adf41928c082b5bc0c15912a8a8 Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Tue, 7 Jan 2025 11:09:20 +0000
Subject: [PATCH 125/143] download file code refactor

---
 LearningHub.Nhs.WebUI/Services/FileService.cs | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Services/FileService.cs b/LearningHub.Nhs.WebUI/Services/FileService.cs
index a55433c9f..e0d19d7f2 100644
--- a/LearningHub.Nhs.WebUI/Services/FileService.cs
+++ b/LearningHub.Nhs.WebUI/Services/FileService.cs
@@ -145,14 +145,26 @@ public async Task<FileDownloadResponse> DownloadFileAsync(string filePath, strin
 
             try
             {
-                // Directly download the entire file as a stream
-                var response = await file.DownloadAsync();
-                return new FileDownloadResponse
+                if (fileSize <= 900 * 1024 * 1024)
                 {
-                    Content = response.Value.Content,
-                    ContentType = properties.Value.ContentType,
-                    ContentLength = fileSize,
-                };
+                    // Directly download the entire file as a stream
+                    var response = await file.DownloadAsync();
+                    return new FileDownloadResponse
+                    {
+                        Content = response.Value.Content,
+                        ContentType = properties.Value.ContentType,
+                        ContentLength = fileSize,
+                    };
+                }
+                else
+                {
+                    return new FileDownloadResponse
+                    {
+                        Content = await file.OpenReadAsync(),
+                        ContentType = properties.Value.ContentType,
+                        ContentLength = fileSize,
+                    };
+                }
             }
             catch (Exception ex)
             {

From 4505abe003c36e51ec549b9be2858f3df220c555 Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Wed, 8 Jan 2025 03:08:04 +0000
Subject: [PATCH 126/143] update view component package

---
 LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj            | 2 +-
 .../Views/Shared/Components/RadioList/Default.cshtml          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index e44f4f060..47744a321 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -128,7 +128,7 @@
 		<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
 		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
 		<PackageReference Include="MK.IO" Version="1.5.0" />
-		<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.27" />
+		<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.28" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml b/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
index eddfb332c..c901ebde3 100644
--- a/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Shared/Components/RadioList/Default.cshtml
@@ -52,7 +52,7 @@
             @foreach (var (radio, index) in Model.Radios.Select((r, i) => (r, i)))
             {
                 counter = index;
-                var radioId = $"{radio.Value}-{index}";
+                var radioId = $"{Model.AspFor}-{index}";
                 if (!string.IsNullOrWhiteSpace(Model.Class))
                 {
                     <div class="@Model.Class">
@@ -106,7 +106,7 @@
             @if (Model.OptionalRadio != null)
             {
                 <div class="nhsuk-radios__divider nhsuk-u-padding-left-2">or</div>
-                var radioId = $"{Model.OptionalRadio.Value}-{++counter}";
+                var radioId = $"{Model.AspFor}-{++counter}";
                 <div class="nhsuk-radios__item">
                     <input class="nhsuk-radios__input"
                            id="@radioId"

From d9075853292126ddcb43f97e6fe1a9b5cd4e18fe Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Wed, 8 Jan 2025 03:08:56 +0000
Subject: [PATCH 127/143] Code changes for TD-4180

---
 .../Controllers/AccountController.cs          | 15 ++++++++--
 .../Helpers/AccountCreationFormHelper.cs      | 28 +++++++++++++++++++
 .../CreateAccountPrimarySpecialty.cshtml      |  2 +-
 ...ateAccountPrimarySpecialtySelection.cshtml |  2 +-
 4 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 LearningHub.Nhs.WebUI/Helpers/AccountCreationFormHelper.cs

diff --git a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
index ded28c046..00def9c2d 100644
--- a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
@@ -429,6 +429,7 @@ public async Task<IActionResult> CreateAccountCountrySearch()
         public async Task<IActionResult> CreateAccountCountrySelection(AccountCreationViewModel accountCreationViewModel)
         {
             var accountDetails = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
+            AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
             if (!string.IsNullOrWhiteSpace(accountCreationViewModel.FilterText))
             {
                 string filterText = Regex.Replace(accountCreationViewModel.FilterText, "[:!@#$%^&*()}{|\":?><\\[\\]\\;'/.,~\\\"\"\\'\\\\/]", " ");
@@ -469,6 +470,7 @@ public async Task<IActionResult> CreateAccountRegionSelection(AccountCreationVie
         {
             var countryCheck = int.TryParse(accountCreationViewModel.CountryId, out int countryId);
             var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
+            AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
             if (accountCreationViewModel.CountryId != null)
             {
                 accountCreation.CountryId = accountCreationViewModel.CountryId;
@@ -535,7 +537,7 @@ public async Task<IActionResult> CreateAccountRegionSelection(AccountCreationVie
         public async Task<IActionResult> CreateAccountSubmitRegionSelection(AccountCreationViewModel accountCreationViewModel)
         {
             var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
-
+            AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
             if (string.IsNullOrWhiteSpace(accountCreationViewModel.RegionId))
             {
                 if (accountCreation.CountryId == "1" || accountCreation.CountryId == null)
@@ -593,6 +595,7 @@ public async Task<IActionResult> CreateAccountSearchRole(AccountCreationViewMode
         public async Task<IActionResult> CreateAccountCurrentRole(AccountCreationViewModel accountCreationViewModel)
         {
             var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
+            AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
             if (!string.IsNullOrWhiteSpace(accountCreationViewModel.FilterText))
             {
                 string filterText = Regex.Replace(accountCreationViewModel.FilterText, "[:!@#$%^&*()}{|\":?><\\[\\]\\;'/.,~\\\"\"\\'\\\\/]", " ");
@@ -649,6 +652,7 @@ public async Task<IActionResult> CreateAccountCurrentRole(AccountCreationViewMod
         public async Task<IActionResult> CreateAccountProfessionalRegNumber(AccountCreationViewModel accountCreationViewModel)
         {
             var roleCheck = int.TryParse(accountCreationViewModel.CurrentRole, out int roleId);
+            AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
             var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
 
             if (string.IsNullOrWhiteSpace(accountCreationViewModel.CurrentRole) || !roleCheck)
@@ -681,6 +685,7 @@ public async Task<IActionResult> CreateAccountProfessionalRegNumber(AccountCreat
         public async Task<IActionResult> CreateAccountGradeSelection(AccountCreationViewModel accountCreationViewModel)
         {
             var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
+            AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
             int gradePageSize = UserRegistrationContentPageSize + 5;
             var roleCheck = int.TryParse(accountCreation.CurrentRole, out int roleId);
             if (!roleCheck || roleId == 0)
@@ -745,6 +750,7 @@ public async Task<IActionResult> CreateAccountGradeSelection(AccountCreationView
         public async Task<IActionResult> CreateAccountPrimarySpecialty(AccountCreationViewModel accountCreationViewModel)
         {
             var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
+            AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
             var gradeCheck = int.TryParse(accountCreationViewModel.GradeId, out int gradeId);
             if (string.IsNullOrWhiteSpace(accountCreationViewModel.GradeId) || !gradeCheck)
             {
@@ -777,6 +783,7 @@ public async Task<IActionResult> CreateAccountPrimarySpecialty(AccountCreationVi
         public async Task<IActionResult> CreateAccountPrimarySpecialtySelection(AccountCreationViewModel accountCreationViewModel)
         {
             var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
+            AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
             if (accountCreationViewModel.PrimarySpecialtyId?.ToLower() == "not applicable")
             {
                 var specialties = await this.specialtyService.GetSpecialtiesAsync();
@@ -953,6 +960,7 @@ public async Task<IActionResult> CreateAccountStartDate(bool? returnToConfirmati
         public async Task<IActionResult> CreateAccountWorkPlaceSearch()
         {
             var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
+            AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
             if (!string.IsNullOrWhiteSpace(accountCreation.LocationId) && !this.CheckConfirmationUpdate())
             {
                 return this.RedirectToAction("CreateAccountWorkPlace", new AccountCreationViewModel { LocationId = accountCreation.LocationId });
@@ -972,6 +980,7 @@ public async Task<IActionResult> CreateAccountWorkPlaceSearch()
         public async Task<IActionResult> CreateAccountWorkPlace(AccountCreationViewModel accountCreationViewModel)
         {
             var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
+            AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
             if (string.IsNullOrWhiteSpace(accountCreationViewModel.FilterText))
             {
                 if (!string.IsNullOrWhiteSpace(accountCreation.LocationId))
@@ -1014,7 +1023,7 @@ public async Task<IActionResult> CreateAccountWorkPlace(AccountCreationViewModel
         public async Task<IActionResult> CreateAccountConfirmation(AccountCreationViewModel accountCreationViewModel)
         {
             var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
-
+            AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
             if (accountCreation.AccountCreationType == AccountCreationTypeEnum.FullAccess)
             {
                 var placeOfWorkCheck = int.TryParse(accountCreationViewModel.LocationId, out int locationId);
@@ -1051,7 +1060,7 @@ public async Task<IActionResult> CreateAccountConfirmation()
         {
             var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
             this.ViewBag.AccountCreationType = accountCreation.AccountCreationType;
-
+            AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
             if (accountCreation.CountryId == "1" && (string.IsNullOrWhiteSpace(accountCreation.RegionId) || accountCreation.RegionId == "0"))
             {
                 this.ModelState.AddModelError(string.Empty, CommonValidationErrorMessages.RegionRequiredSummary);
diff --git a/LearningHub.Nhs.WebUI/Helpers/AccountCreationFormHelper.cs b/LearningHub.Nhs.WebUI/Helpers/AccountCreationFormHelper.cs
new file mode 100644
index 000000000..657c0828f
--- /dev/null
+++ b/LearningHub.Nhs.WebUI/Helpers/AccountCreationFormHelper.cs
@@ -0,0 +1,28 @@
+namespace LearningHub.Nhs.WebUI.Helpers
+{
+    using System.Collections.Generic;
+    using Microsoft.AspNetCore.Mvc.ViewFeatures;
+
+    /// <summary>
+    /// Defines the <see cref="AccountCreationFormHelper" />.
+    /// </summary>
+    public static class AccountCreationFormHelper
+    {
+        /// <summary>
+        /// The PopulateGroupedFormControlMetadata.
+        /// </summary>
+        /// <param name="viewData">viewData.</param>
+        public static void PopulateGroupedFormControlMetadata(ViewDataDictionary viewData)
+        {
+            viewData["GroupedFormControlMetadata"] = new Dictionary<string, bool>
+            {
+                { "CountryId", true },
+                { "RegionId", true },
+                { "CurrentRole", true },
+                { "PrimarySpecialtyId", true },
+                { "GradeId", true },
+                { "LocationId", true },
+            };
+        }
+    }
+}
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialty.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialty.cshtml
index 5a7e9d41c..0bc9979cf 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialty.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialty.cshtml
@@ -62,7 +62,7 @@
                             <div class="nhsuk-radios">
 
                                 <div class="nhsuk-radios__item">
-                                    <input class="nhsuk-radios__input" id="PrimarySpecialtyId" name="PrimarySpecialtyId" type="radio" value="Not applicable">
+                                    <input class="nhsuk-radios__input" id="PrimarySpecialtyId-0" name="PrimarySpecialtyId" type="radio" value="Not applicable">
                                     <label class="nhsuk-label nhsuk-radios__label" for="PrimarySpecialtyId">
                                         Not applicable
                                     </label>
diff --git a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialtySelection.cshtml b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialtySelection.cshtml
index 56c18a5a8..495df4081 100644
--- a/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialtySelection.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Account/CreateAccountPrimarySpecialtySelection.cshtml
@@ -144,7 +144,7 @@
                                 <div class="nhsuk-radios">
 
                                     <div class="nhsuk-radios__item">
-                                    <input class="nhsuk-radios__input" id="PrimarySpecialtyId" name="PrimarySpecialtyId" type="radio" value="Not applicable">
+                                    <input class="nhsuk-radios__input" id="PrimarySpecialtyId-0" name="PrimarySpecialtyId" type="radio" value="Not applicable">
                                         <label class="nhsuk-label nhsuk-radios__label" for="FilterText">
                                             Not applicable
                                         </label>

From 60825ed21cd27b2bf0e203befef2a46ec6f978e9 Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Wed, 8 Jan 2025 10:45:56 +0000
Subject: [PATCH 128/143] TD-4180 fix

---
 LearningHub.Nhs.WebUI/Controllers/AccountController.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
index 00def9c2d..12c6ae98a 100644
--- a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
@@ -859,6 +859,7 @@ public async Task<IActionResult> CreateAccountWorkStartDate(AccountCreationViewM
         {
             int specialtyId;
             var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
+            AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
             if (accountCreationViewModel.PrimarySpecialtyId?.ToLower() == "not applicable")
             {
                 var specialties = await this.specialtyService.GetSpecialtiesAsync();
@@ -906,6 +907,7 @@ public async Task<IActionResult> CreateAccountWorkStartDate(AccountCreationViewM
         [TypeFilter(typeof(RedirectMissingMultiPageFormData), Arguments = new object[] { nameof(MultiPageFormDataFeature.AddRegistrationPrompt) })]
         public async Task<IActionResult> CreateAccountStartDate(AccountCreationDateViewModel accountCreationDateViewModel)
         {
+            AccountCreationFormHelper.PopulateGroupedFormControlMetadata(this.ViewData);
             if (!this.ModelState.IsValid)
             {
                 return this.View("CreateAccountWorkStartDate", accountCreationDateViewModel);

From 40e54d3bf1c0f7adee53081e34d67f6a6e9be47d Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Wed, 8 Jan 2025 14:06:23 +0000
Subject: [PATCH 129/143] Added a missing parameter: gardeId

---
 LearningHub.Nhs.WebUI/Controllers/AccountController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
index 12c6ae98a..979c1ac33 100644
--- a/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/AccountController.cs
@@ -879,7 +879,7 @@ public async Task<IActionResult> CreateAccountWorkStartDate(AccountCreationViewM
                         this.ModelState.AddModelError("PrimarySpecialtyId", CommonValidationErrorMessages.SpecialtyNotApplicable);
                     }
 
-                    return this.View("CreateAccountPrimarySpecialtySelection", new AccountCreationListViewModel { FilterText = accountCreationViewModel.FilterText, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation, SpecialtyList = shortlist.Item2, OptionalSpecialtyItem = optionalSpecialty.FirstOrDefault(x => x.Name.ToLower() == "not applicable"), AccountCreationPaging = new AccountCreationPagingModel { TotalItems = shortlist.Item1, PageSize = UserRegistrationContentPageSize, HasItems = shortlist.Item1 > 0, CurrentPage = 1 } });
+                    return this.View("CreateAccountPrimarySpecialtySelection", new AccountCreationListViewModel { FilterText = accountCreationViewModel.FilterText, GradeId = accountCreation.GradeId, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation, SpecialtyList = shortlist.Item2, OptionalSpecialtyItem = optionalSpecialty.FirstOrDefault(x => x.Name.ToLower() == "not applicable"), AccountCreationPaging = new AccountCreationPagingModel { TotalItems = shortlist.Item1, PageSize = UserRegistrationContentPageSize, HasItems = shortlist.Item1 > 0, CurrentPage = 1 } });
                 }
 
                 accountCreation.PrimarySpecialtyId = accountCreationViewModel.PrimarySpecialtyId;

From 9e35311aee5459b5378e7c97300eb6d0afef932d Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Mon, 13 Jan 2025 13:10:18 +0000
Subject: [PATCH 130/143] TEST

---
 WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
index 83ba526b3..6fd06c036 100644
--- a/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
+++ b/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
@@ -225,7 +225,7 @@ public async Task<ActionResult> GetResourceVersionExtendedViewModelAsync(int res
         /// Publish ResourceVersion
         ///   TODO - requires validation.
         /// </summary>
-        /// <param name="publishViewModel">The publishViewModel<see cref="PublishViewModel"/>.</param>
+        /// <param name="publishViewModel">The publishViewMol<see cref="PublishViewModel"/>.</param>
         /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
         [HttpPost]
         [Route("PublishResourceVersion")]

From c57d6c8a31b7d38f7739d5bf1da1567da4adfd5d Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Mon, 13 Jan 2025 13:21:55 +0000
Subject: [PATCH 131/143] TD-5236 style update

---
 .../Styles/nhsuk/pages/catalogue.scss               | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss
index dd64e5a88..db8c8eb43 100644
--- a/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss
+++ b/LearningHub.Nhs.WebUI/Styles/nhsuk/pages/catalogue.scss
@@ -19,6 +19,13 @@ textarea {
     margin-right: 16px;
     height: 60px;
     min-width: 60px;
+
+}
+
+.catalogue-card-badge {
+    margin-right: 16px;
+    height: 60px;
+    min-width: 60px;
 }
 
 .folder-title {
@@ -81,6 +88,12 @@ textarea {
         min-width: 40px;
         margin-right: 10px;
     }
+
+    .catalogue-card-badge {
+        height: 40px;
+        min-width: 40px;
+        margin-right: 10px;
+    }
 }
 
 .btn-catalogue-search {

From 54b8786fd2fdfc21c3075ef269a918709df5d4cb Mon Sep 17 00:00:00 2001
From: Oluwatobi Awe <Oluwatobi.Awe@hee.nhs.uk>
Date: Mon, 13 Jan 2025 13:22:13 +0000
Subject: [PATCH 132/143] .

---
 WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
index 6fd06c036..83ba526b3 100644
--- a/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
+++ b/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
@@ -225,7 +225,7 @@ public async Task<ActionResult> GetResourceVersionExtendedViewModelAsync(int res
         /// Publish ResourceVersion
         ///   TODO - requires validation.
         /// </summary>
-        /// <param name="publishViewModel">The publishViewMol<see cref="PublishViewModel"/>.</param>
+        /// <param name="publishViewModel">The publishViewModel<see cref="PublishViewModel"/>.</param>
         /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
         [HttpPost]
         [Route("PublishResourceVersion")]

From a2e9a1b49ccc039aa335aed670732dcfb85d1131 Mon Sep 17 00:00:00 2001
From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com>
Date: Mon, 13 Jan 2025 13:46:14 +0000
Subject: [PATCH 133/143] fix issue for elaerning

---
 .../Scripts/vuesrc/resource/ResourceContent.vue           | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ResourceContent.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ResourceContent.vue
index d2b4de725..1f966cfac 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ResourceContent.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ResourceContent.vue
@@ -722,14 +722,6 @@
             async launchScorm() {
                 var targetWin;
                 var targetWinName = "lhContent" + this.resourceItem.resourceId;
-                // Use a placeholder window to avoid popup blockers
-                targetWin = window.open("about:blank", targetWinName, "location=0,menubar=0,resizable=0,width=" + this.resourceItem.scormDetails.popupWidth + ",height=" + this.resourceItem.scormDetails.popupHeight);
-
-                // If the pop-up was blocked
-                if (!targetWin) {
-                    alert("Please allow pop-ups to view this content.");
-                    return;
-                }
                 var activeContent = await userData.getActiveContent();
 
                 if (activeContent.filter(ac => ac.resourceId === this.resourceItem.resourceId).length > 0) {

From 2d151fafa59f150433995fe0121ac7e0e1382f05 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Thu, 16 Jan 2025 12:27:43 +0000
Subject: [PATCH 134/143] TD-4168: Upgrade LH solutions to .NET 8 (LTS)

---
 .../LearningHub.Nhs.AdminUI.csproj            | 16 +++----
 .../ServiceCollectionExtension.cs             |  7 +++
 .../LearningHub.Nhs.WebUI.csproj              |  8 ++--
 .../ServiceCollectionExtension.cs             |  1 +
 .../LearningHub.Nhs.OpenApi.Models.csproj     |  4 +-
 ....Nhs.OpenApi.Repositories.Interface.csproj |  2 +-
 .../EntityFramework/ServiceMappings.cs        |  8 +++-
 ...earningHub.Nhs.OpenApi.Repositories.csproj |  2 +-
 ...gHub.Nhs.OpenApi.Services.Interface.csproj |  4 +-
 .../LearningHub.Nhs.OpenApi.Services.csproj   |  8 ++--
 .../LearningHub.Nhs.OpenApi.Tests.csproj      |  2 +-
 .../LearningHub.NHS.OpenAPI.csproj            |  4 +-
 ...ub.Nhs.ReportApi.Services.Interface.csproj |  4 +-
 ...ub.Nhs.ReportApi.Services.UnitTests.csproj |  4 +-
 .../LearningHub.Nhs.ReportApi.Services.csproj |  4 +-
 .../LearningHub.Nhs.ReportApi.Shared.csproj   |  4 +-
 .../LearningHub.Nhs.ReportApi.csproj          | 12 ++++-
 .../LearningHub.Nhs.ReportApi.csproj.user     |  9 ++++
 .../Properties/launchSettings.json            | 40 ++++++++++------
 .../ServiceMappings.cs                        |  2 +
 .../Controllers/CatalogueController.cs        |  2 +-
 .../Controllers/ResourceController.cs         |  6 +--
 .../LearningHub.Nhs.Api.csproj                |  8 ++--
 .../ServiceCollectionExtension.cs             |  7 +++
 .../LearningHub.Nhs.Api.Shared.csproj         |  4 +-
 .../LearningHub.Nhs.Api.UnitTests.csproj      |  4 +-
 ...earningHub.Nhs.Repository.Interface.csproj |  4 +-
 .../LearningHub.Nhs.Repository.csproj         |  4 +-
 .../LearningHub.Nhs.Services.Interface.csproj |  6 +--
 .../LearningHub.Nhs.Services.UnitTests.csproj |  4 +-
 .../AzureDataFactoryService.cs                |  2 +-
 .../LearningHub.Nhs.Services.csproj           |  8 ++--
 .../LearningHub.Nhs.Services/UserService.cs   | 12 ++++-
 ...earningHub.Nhs.Migration.ConsoleApp.csproj |  4 +-
 ...LearningHub.Nhs.Migration.Interface.csproj |  4 +-
 .../LearningHub.Nhs.Migration.Models.csproj   |  8 ++--
 ...ub.Nhs.Migration.Staging.Repository.csproj |  4 +-
 ...LearningHub.Nhs.Migration.UnitTests.csproj |  4 +-
 .../LearningHub.Nhs.Migration.csproj          | 48 +++++++++----------
 39 files changed, 174 insertions(+), 114 deletions(-)
 create mode 100644 ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj.user

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
index 798171c31..be891c451 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
+++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <UserSecretsId>31abd8b9-4223-4ff3-896b-a46530c9e15c</UserSecretsId>
     <ApplicationInsightsResourceId>/subscriptions/57c55d5f-78c1-4373-a021-ff8357548f51/resourceGroups/LearningHubNhsUk-AdminUI-Prod-RG/providers/microsoft.insights/components/LearningHubNhsUk-AdminUI-Prod</ApplicationInsightsResourceId>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
@@ -80,12 +80,12 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
     <PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
     <PackageReference Include="BuildWebCompiler" Version="1.12.405" />
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-    <PackageReference Include="FluentValidation" Version="10.3.4" />
-    <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
+    <PackageReference Include="FluentValidation" Version="11.11.0" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 	<PackageReference Include="IdentityModel" Version="4.4.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
@@ -97,8 +97,8 @@
     <PackageReference Include="Microsoft.FeatureManagement" Version="3.2.0" />
     <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.2.0" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.14.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.2.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.2.1" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
     <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.5.2">
       <PrivateAssets>all</PrivateAssets>
@@ -108,8 +108,8 @@
     <PackageReference Include="MK.IO" Version="1.6.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
   </ItemGroup>
 
 
diff --git a/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs b/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
index 5517fa636..4699e7c35 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
@@ -195,8 +195,15 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
             // Auto Mapper Configurations
             var mappingConfig = new MapperConfiguration(mc =>
             {
+                mc.AllowNullCollections = true;
+                mc.ShouldMapMethod = m => false;
                 mc.AddProfile(new MappingProfile());
             });
+
+            ////var mappingConfig = new MapperConfiguration(mc =>
+            ////{
+            ////    mc.AddProfile(new MappingProfile());
+            ////});
             IMapper mapper = mappingConfig.CreateMapper();
             services.AddSingleton(mapper);
 
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index 3f3f09de7..89fcd5b7f 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>  
 		<UserSecretsId>a2ecb5d2-cf13-4551-9cb6-3d86dfbcf8ef</UserSecretsId>
 		<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
@@ -101,9 +101,9 @@
 
 
 	<ItemGroup>
-		<PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
+		<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
 		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-		<PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
+		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
         <PackageReference Include="GDS.MultiPageFormData" Version="1.0.5" />
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
 		<PackageReference Include="IdentityModel" Version="4.3.0" />
@@ -130,7 +130,7 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0" />
+		<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.0" />
 		<PackageReference Include="tusdotnet" Version="2.5.0" />
 		<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.5.2">
 			<PrivateAssets>all</PrivateAssets>
diff --git a/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs b/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs
index dad5f5001..92db5602b 100644
--- a/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs
+++ b/LearningHub.Nhs.WebUI/ServiceCollectionExtension.cs
@@ -129,6 +129,7 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
                 opt.DefaultExpiryInMinutes = 60;
             });
 
+            services.AddControllersWithViews().AddNewtonsoftJson();
             services.AddControllersWithViews().AddRazorRuntimeCompilation();
 
             services.AddFeatureManagement();
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
index 6062a7b7a..574da8de0 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <Nullable>enable</Nullable>
 		<Platforms>x64</Platforms>
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
       <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
     </ItemGroup>
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/LearningHub.Nhs.OpenApi.Repositories.Interface.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/LearningHub.Nhs.OpenApi.Repositories.Interface.csproj
index 12c0510c1..ab98388ad 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/LearningHub.Nhs.OpenApi.Repositories.Interface.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories.Interface/LearningHub.Nhs.OpenApi.Repositories.Interface.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>LearningHub.Nhs.OpenApi.Repositories.Interface</RootNamespace>
         <Nullable>enable</Nullable>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/ServiceMappings.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/ServiceMappings.cs
index 8db1cd876..0841ca2e4 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/ServiceMappings.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/ServiceMappings.cs
@@ -24,7 +24,13 @@ public static class ServiceMappings
         /// <param name="services">The IServiceCollection.</param>
         public static void ConfigureAutomapper(this IServiceCollection services)
         {
-            var mappingConfig = new MapperConfiguration(mc => { mc.AddProfile(new MappingProfile()); });
+            var mappingConfig = new MapperConfiguration(mc =>
+            {
+                mc.AllowNullCollections = true;
+                mc.ShouldMapMethod = m => false;
+                mc.AddProfile(new MappingProfile());
+            });
+            ////var mappingConfig = new MapperConfiguration(mc => { mc.AddProfile(new MappingProfile()); });
             IMapper mapper = mappingConfig.CreateMapper();
             services.AddSingleton(mapper);
         }
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/LearningHub.Nhs.OpenApi.Repositories.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/LearningHub.Nhs.OpenApi.Repositories.csproj
index 04fdc5493..bdd370fd8 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/LearningHub.Nhs.OpenApi.Repositories.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/LearningHub.Nhs.OpenApi.Repositories.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>LearningHub.Nhs.OpenApi.Repositories</RootNamespace>
         <Nullable>enable</Nullable>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
index 3d46e57aa..3296a986c 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<Platforms>x64</Platforms>
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
index 26457744e..17c994f59 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>LearningHub.Nhs.OpenApi.Services</RootNamespace>
         <Nullable>enable</Nullable>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -22,12 +22,12 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
+      <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
       <PackageReference Include="IdentityModel" Version="4.3.0" />
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
       <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
     </ItemGroup>
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/LearningHub.Nhs.OpenApi.Tests.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/LearningHub.Nhs.OpenApi.Tests.csproj
index 8b4bb1c88..6d5aad53f 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Tests/LearningHub.Nhs.OpenApi.Tests.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Tests/LearningHub.Nhs.OpenApi.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <Nullable>enable</Nullable>
 		<Platforms>x64</Platforms>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi/LearningHub.NHS.OpenAPI.csproj b/OpenAPI/LearningHub.Nhs.OpenApi/LearningHub.NHS.OpenAPI.csproj
index 2702cc7e4..0cf25231a 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi/LearningHub.NHS.OpenAPI.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi/LearningHub.NHS.OpenAPI.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Nullable>enable</Nullable>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<Platforms>x64</Platforms>
     </PropertyGroup>
@@ -27,7 +27,7 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" />
-        <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+        <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj
index 6d8538c7c..ad6fd8993 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -16,7 +16,7 @@
 
    <ItemGroup>
     <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.11.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="2.1.12" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj
index c9fa3106c..c9394fb06 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoFixture" Version="4.17.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="2.1.12" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="Moq" Version="4.18.2" />
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj
index c116ea9d9..b41503f69 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -19,7 +19,7 @@
     <PackageReference Include="AutoMapper" Version="10.1.1" />
     <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.11.0" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.13.1" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="2.1.12" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj
index 619335ab9..9c05c4ac0 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn),1573,1591,1712</NoWarn>
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LearningHub.Nhs.Models" Version="2.1.12" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
index 24bfc4239..60f16e637 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>
@@ -17,7 +17,7 @@
 
   <ItemGroup>
    
-    <PackageReference Include="LearningHub.Nhs.Models" Version="2.1.12" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
    
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
    
@@ -34,6 +34,14 @@
     <ProjectReference Include="..\LearningHub.Nhs.ReportApi.Shared\LearningHub.Nhs.ReportApi.Shared.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Update="appsettings.Development.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="LearningHub.Nhs.ReportApi.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj.user b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj.user
new file mode 100644
index 000000000..7571e14ce
--- /dev/null
+++ b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj.user
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ActiveDebugProfile>IIS Local</ActiveDebugProfile>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi/Properties/launchSettings.json b/ReportAPI/LearningHub.Nhs.ReportApi/Properties/launchSettings.json
index 416233779..514fff299 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi/Properties/launchSettings.json
+++ b/ReportAPI/LearningHub.Nhs.ReportApi/Properties/launchSettings.json
@@ -1,23 +1,14 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:30505",
-      "sslPort": 44345
-    }
-  },
+{
   "profiles": {
     "LearningHub.Nhs.ReportingServiceApi": {
       "commandName": "Project",
-      "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7137;http://localhost:5137",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "https://localhost:7137;http://localhost:5137"
     },
     "IIS Express": {
       "commandName": "IISExpress",
@@ -26,6 +17,27 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
+    },
+    "IIS Local": {
+      "commandName": "IIS",
+      "launchBrowser": true,
+      "launchUrl": "https://lh-report.dev.local",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  },
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iis": {
+      "applicationUrl": "https://lh-report.dev.local",
+      "sslPort": 0
+    },
+    "iisExpress": {
+      "applicationUrl": "http://localhost:30505",
+      "sslPort": 44345
     }
   }
-}
+}
\ No newline at end of file
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi/ServiceMappings.cs b/ReportAPI/LearningHub.Nhs.ReportApi/ServiceMappings.cs
index f68b7ab52..250359dc1 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi/ServiceMappings.cs
+++ b/ReportAPI/LearningHub.Nhs.ReportApi/ServiceMappings.cs
@@ -78,6 +78,8 @@ private static void AddAutomapper(this IServiceCollection services)
         {
             services.AddSingleton(new MapperConfiguration(mc =>
             {
+                mc.AllowNullCollections = true;
+                mc.ShouldMapMethod = m => false;
                 mc.AddProfile(new MappingProfile());
             }).CreateMapper());
         }
diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/CatalogueController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/CatalogueController.cs
index b5dbf58a9..814d16dd4 100644
--- a/WebAPI/LearningHub.Nhs.API/Controllers/CatalogueController.cs
+++ b/WebAPI/LearningHub.Nhs.API/Controllers/CatalogueController.cs
@@ -103,7 +103,7 @@ public IActionResult GetCataloguesForCurrentUser()
         /// <returns>The actionResult.</returns>
         [HttpPost]
         [Route("Catalogues")]
-        public async Task<IActionResult> CreateCatalogue(CatalogueViewModel viewModel)
+        public async Task<IActionResult> CreateCatalogue([FromBody] CatalogueViewModel viewModel)
         {
             try
             {
diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
index b556e211d..ea5465453 100644
--- a/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
+++ b/WebAPI/LearningHub.Nhs.API/Controllers/ResourceController.cs
@@ -87,7 +87,7 @@ public async Task<ActionResult> GetAsync(int id)
         /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
         [HttpPost]
         [Route("CreateResource")]
-        public async Task<IActionResult> CreateResourceAsync(ResourceDetailViewModel viewModel)
+        public async Task<IActionResult> CreateResourceAsync([FromBody] ResourceDetailViewModel viewModel)
         {
             var vr = await this.resourceService.CreateResourceAsync(viewModel, this.CurrentUserId);
             if (vr.IsValid)
@@ -367,7 +367,7 @@ public async Task<IActionResult> RevertToDraft([FromBody] int resourceVersionId)
         [HttpPost]
         [Authorize(Policy = "ReadWrite")]
         [Route("UpdateResourceVersion")]
-        public async Task<IActionResult> UpdateResourceVersionAsync(ResourceDetailViewModel resourceDetailViewModel)
+        public async Task<IActionResult> UpdateResourceVersionAsync([FromBody] ResourceDetailViewModel resourceDetailViewModel)
         {
             var vr = await this.resourceService.UpdateResourceVersionAsync(resourceDetailViewModel, this.CurrentUserId);
 
@@ -732,7 +732,7 @@ public async Task<ActionResult> GetArticleDetailsAsync(int resourceVersionId)
         /// <returns>The <see cref="Task{IActionResult}"/>.</returns>
         [HttpPost]
         [Route("UpdateArticleDetail")]
-        public async Task<IActionResult> UpdateArticleDetailAsync(ArticleUpdateRequestViewModel articleViewModel)
+        public async Task<IActionResult> UpdateArticleDetailAsync([FromBody] ArticleUpdateRequestViewModel articleViewModel)
         {
             var vr = await this.resourceService.UpdateArticleDetailAsync(articleViewModel, this.CurrentUserId);
 
diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
index b1b3f6e95..f1d31fa71 100644
--- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
+++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <UserSecretsId>234b55ad-984b-47ae-9d7a-71e372e6ded7</UserSecretsId>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -27,7 +27,7 @@
 	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
 	<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
 	<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
+	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
 	<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 	<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
@@ -39,8 +39,8 @@
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	</PackageReference>
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.36.0" />
 	<PackageReference Update="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
   </ItemGroup>
 
diff --git a/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs b/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs
index 528533f0d..9f39ed277 100644
--- a/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs
+++ b/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs
@@ -56,9 +56,16 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
             // Auto Mapper Configurations
             var mappingConfig = new MapperConfiguration(mc =>
             {
+                mc.AllowNullCollections = true;
+                mc.ShouldMapMethod = m => false;
                 mc.AddProfile(new MappingProfile());
                 mc.AddProfile(new ElfhMappingProfile());
             });
+            ////var mappingConfig = new MapperConfiguration(mc =>
+            ////{
+            ////    mc.AddProfile(new MappingProfile());
+            ////    mc.AddProfile(new ElfhMappingProfile());
+            ////});
             IMapper mapper = mappingConfig.CreateMapper();
             services.AddSingleton(mapper);
 
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
index 4a089b9a3..82dd62e29 100644
--- a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	<Platforms>x64</Platforms>
   </PropertyGroup>
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
index 02c58af7b..67236bbfd 100644
--- a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>false</IsPackable>
 	<Platforms>x64</Platforms>
@@ -11,7 +11,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
index a6c146998..f1e1ddf60 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	<Platforms>x64</Platforms>
   </PropertyGroup>
@@ -9,7 +9,7 @@
   <ItemGroup>
    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
    <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
+   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
index 3173c4895..6ba6d5282 100644
--- a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	<Platforms>x64</Platforms>
   </PropertyGroup>
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
index a7a9f0048..5991ff72e 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	<Platforms>x64</Platforms>
   </PropertyGroup>
@@ -16,8 +16,8 @@
 	<PackageReference Include="Azure.Storage.Queues" Version="12.11.0" />
 	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
index d64166759..d8f51205e 100644
--- a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>false</IsPackable>
 	<Platforms>x64</Platforms>
@@ -13,7 +13,7 @@
     <PackageReference Include="EntityFrameworkCore.Testing.Moq" Version="4.0.0" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
diff --git a/WebAPI/LearningHub.Nhs.Services/AzureDataFactoryService.cs b/WebAPI/LearningHub.Nhs.Services/AzureDataFactoryService.cs
index 52226631a..3bb2008d1 100644
--- a/WebAPI/LearningHub.Nhs.Services/AzureDataFactoryService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/AzureDataFactoryService.cs
@@ -158,7 +158,7 @@ protected virtual void Dispose(bool disposing)
         }
 
         /// <summary>
-        /// Get AzureMedia Credentials.
+        /// Get AzureMedia Credentials.wwedzx
         /// </summary>
         /// <returns>The <see cref="Task"/>.</returns>
         private async Task<ServiceClientCredentials> GetCredentialsAsync()
diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
index c8b4ec333..3bb7466b3 100644
--- a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
+++ b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	<Platforms>x64</Platforms>
   </PropertyGroup>
@@ -11,9 +11,9 @@
     <PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
     <PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-    <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
     <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.28.0" />
     <PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
@@ -23,7 +23,7 @@
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	</PackageReference>
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.36.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/WebAPI/LearningHub.Nhs.Services/UserService.cs b/WebAPI/LearningHub.Nhs.Services/UserService.cs
index 65ecfdd52..5ea126ecb 100644
--- a/WebAPI/LearningHub.Nhs.Services/UserService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/UserService.cs
@@ -1,5 +1,6 @@
 namespace LearningHub.Nhs.Services
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
@@ -188,8 +189,15 @@ public async Task<User> GetByUsernameAsync(string userName)
         /// <returns>The <see cref="Task"/>.</returns>
         public async Task<UserLHBasicViewModel> GetByIdAsync(int id)
         {
-            var user = await this.userRepository.GetByIdAsync(id);
-            return this.mapper.Map<UserLHBasicViewModel>(user);
+            try
+            {
+                var user = await this.userRepository.GetByIdAsync(id);
+                return this.mapper.Map<UserLHBasicViewModel>(user);
+            }
+            catch (Exception ex)
+            {
+                return null;
+            }
         }
 
         /// <inheritdoc/>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
index f59f836ec..b1df4abaa 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>7.3</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	<Platforms>x64</Platforms>
@@ -24,7 +24,7 @@
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="IdentityModel" Version="5.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
index 306bfba43..06a9839f5 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	<Platforms>x64</Platforms>
   </PropertyGroup>
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
index fe0eec05d..0f5530c16 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	<Platforms>x64</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-    <PackageReference Include="FluentValidation.AspNetCore" Version="10.3.4" />
+    <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
-	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+	<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
index 5a85cff3e..56401ab92 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
 	<Platforms>x64</Platforms>
   </PropertyGroup>
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
   </ItemGroup>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
index c167e11e4..bd0366fd0 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>false</IsPackable>
 	<Platforms>x64</Platforms>
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
index 6c31da645..26b9a6a0c 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
@@ -1,30 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-	<Platforms>x64</Platforms>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<Platforms>x64</Platforms>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.16.1" />
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
-    <PackageReference Include="FluentValidation" Version="10.3.4" />
-    <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
-    <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
-	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
-		<PrivateAssets>all</PrivateAssets>
-		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-	</PackageReference>
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="AngleSharp" Version="0.16.1" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="FluentValidation" Version="11.11.0" />
+		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\LearningHub.Nhs.Api.Shared\LearningHub.Nhs.Api.Shared.csproj" />
-    <ProjectReference Include="..\..\LearningHub.Nhs.Repository.Interface\LearningHub.Nhs.Repository.Interface.csproj" />
-    <ProjectReference Include="..\..\LearningHub.Nhs.Services.Interface\LearningHub.Nhs.Services.Interface.csproj" />
-    <ProjectReference Include="..\LearningHub.Nhs.Migration.Interface\LearningHub.Nhs.Migration.Interface.csproj" />
-    <ProjectReference Include="..\LearningHub.Nhs.Migration.Models\LearningHub.Nhs.Migration.Models.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\LearningHub.Nhs.Api.Shared\LearningHub.Nhs.Api.Shared.csproj" />
+		<ProjectReference Include="..\..\LearningHub.Nhs.Repository.Interface\LearningHub.Nhs.Repository.Interface.csproj" />
+		<ProjectReference Include="..\..\LearningHub.Nhs.Services.Interface\LearningHub.Nhs.Services.Interface.csproj" />
+		<ProjectReference Include="..\LearningHub.Nhs.Migration.Interface\LearningHub.Nhs.Migration.Interface.csproj" />
+		<ProjectReference Include="..\LearningHub.Nhs.Migration.Models\LearningHub.Nhs.Migration.Models.csproj" />
+	</ItemGroup>
 
 </Project>

From f53adc66e4628a630f41d9eaab5d9c0521a5fb8f Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Thu, 16 Jan 2025 13:00:25 +0000
Subject: [PATCH 135/143] TD-4168: Removed commented lines

---
 .../LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs   | 5 -----
 .../EntityFramework/ServiceMappings.cs                      | 2 +-
 WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs    | 6 +-----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs b/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
index 4699e7c35..822279fd3 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
+++ b/AdminUI/LearningHub.Nhs.AdminUI/ServiceCollectionExtension.cs
@@ -199,11 +199,6 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
                 mc.ShouldMapMethod = m => false;
                 mc.AddProfile(new MappingProfile());
             });
-
-            ////var mappingConfig = new MapperConfiguration(mc =>
-            ////{
-            ////    mc.AddProfile(new MappingProfile());
-            ////});
             IMapper mapper = mappingConfig.CreateMapper();
             services.AddSingleton(mapper);
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/ServiceMappings.cs b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/ServiceMappings.cs
index 0841ca2e4..8129bc9c8 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/ServiceMappings.cs
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Repositories/EntityFramework/ServiceMappings.cs
@@ -30,7 +30,7 @@ public static void ConfigureAutomapper(this IServiceCollection services)
                 mc.ShouldMapMethod = m => false;
                 mc.AddProfile(new MappingProfile());
             });
-            ////var mappingConfig = new MapperConfiguration(mc => { mc.AddProfile(new MappingProfile()); });
+
             IMapper mapper = mappingConfig.CreateMapper();
             services.AddSingleton(mapper);
         }
diff --git a/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs b/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs
index 9f39ed277..d93a45ee9 100644
--- a/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs
+++ b/WebAPI/LearningHub.Nhs.API/ServiceCollectionExtension.cs
@@ -61,11 +61,7 @@ public static void ConfigureServices(this IServiceCollection services, IConfigur
                 mc.AddProfile(new MappingProfile());
                 mc.AddProfile(new ElfhMappingProfile());
             });
-            ////var mappingConfig = new MapperConfiguration(mc =>
-            ////{
-            ////    mc.AddProfile(new MappingProfile());
-            ////    mc.AddProfile(new ElfhMappingProfile());
-            ////});
+
             IMapper mapper = mappingConfig.CreateMapper();
             services.AddSingleton(mapper);
 

From 0e15d1818936ec8ed89c3dcd631f842b939cdddc Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Fri, 17 Jan 2025 09:44:22 +0000
Subject: [PATCH 136/143] TD-5255: The My learning page does show the activity
 but it's not showing up under accessed learning

---
 .../Resources/GetMyInProgressDashboardResources.sql             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql
index 7464de6e3..0b4c79c4a 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql	
@@ -31,7 +31,7 @@ BEGIN
 	INSERT INTO @MyActivity					
 			SELECT TOP (@MaxRows) ra.ResourceId, MAX(ra.Id) ResourceActivityId
 				FROM 
-				(SELECT a.Id,a.ResourceId,a.ResourceVersionId,a.LaunchResourceActivityId,a.UserId,a.ActivityStatusId,a.ActivityStart FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity GROUP BY ResourceId) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id  order by a.Id desc OFFSET 0 ROWS) ra	
+				(SELECT a.Id,a.ResourceId,a.ResourceVersionId,a.LaunchResourceActivityId,a.UserId,a.ActivityStatusId,a.ActivityStart FROM activity.ResourceActivity a INNER JOIN (SELECT ResourceId, MAX(Id) as id FROM activity.ResourceActivity WHERE UserId = @UserId GROUP BY ResourceId) AS b ON a.ResourceId = b.ResourceId AND a.id = b.id  order by a.Id desc OFFSET 0 ROWS) ra	
 				JOIN [resources].[Resource] r ON  ra.ResourceId = r.Id
 				JOIN [resources].[ResourceVersion] rv ON  rv.Id = ra.ResourceVersionId
 				LEFT JOIN [resources].[AssessmentResourceVersion] arv ON arv.ResourceVersionId = ra.ResourceVersionId

From 86f0068e9ab18f1d665d9431aba3063dfe39ab92 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Fri, 17 Jan 2025 09:45:16 +0000
Subject: [PATCH 137/143] Comments added

---
 .../Resources/GetMyInProgressDashboardResources.sql              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql
index 0b4c79c4a..a56e37084 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/GetMyInProgressDashboardResources.sql	
@@ -7,6 +7,7 @@
 --
 -- 24 Jun 2024	OA	Initial Revision
 -- 27 Jun 2024	SA My Learning Dashboard Tray showing Wrong Counts
+-- 17 Jan 2025  TD-5255: SA The My learning page does show the activity but it's not showing up under accessed learning
 -------------------------------------------------------------------------------
 
 CREATE PROCEDURE [resources].[GetMyInProgressDashboardResources]

From 8ac2b5093545d661aa60102e3b4b6ca6769319c2 Mon Sep 17 00:00:00 2001
From: swapnamol-abraham <swapnamol.abraham@nhs.net>
Date: Mon, 20 Jan 2025 12:43:25 +0000
Subject: [PATCH 138/143] Update continuous-integration-workflow.yml

.net framework upgarde from .net6 to .net 8
---
 .github/workflows/continuous-integration-workflow.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index 027e35695..a92e14bb5 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -10,10 +10,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup .NET Core SDK 6.0
+      - name: Setup .NET Core SDK 8.0
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 6.0.x     
+          dotnet-version: 8.0.x     
 
       - name: Add Azure artifact
         run: dotnet nuget add source 'https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json' --name 'LearningHubFeed'  --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text      

From 9f96ee933428e0810ada20d59ba07dbdb1f778f4 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Mon, 20 Jan 2025 14:20:07 +0000
Subject: [PATCH 139/143] Upgrade LH solutions to .NET 8 (LTS)

---
 .../LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj    | 4 ++--
 LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj            | 4 ++--
 .../LearningHub.Nhs.OpenApi.Models.csproj                     | 2 +-
 .../LearningHub.Nhs.OpenApi.Services.Interface.csproj         | 2 +-
 .../LearningHub.Nhs.OpenApi.Services.csproj                   | 2 +-
 .../LearningHub.Nhs.ReportApi.Services.Interface.csproj       | 2 +-
 .../LearningHub.Nhs.ReportApi.Services.UnitTests.csproj       | 2 +-
 .../LearningHub.Nhs.ReportApi.Services.csproj                 | 2 +-
 .../LearningHub.Nhs.ReportApi.Shared.csproj                   | 2 +-
 .../LearningHub.Nhs.ReportApi.csproj                          | 2 +-
 WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj         | 4 ++--
 .../LearningHub.Nhs.Api.Shared.csproj                         | 4 ++--
 .../LearningHub.Nhs.Api.UnitTests.csproj                      | 4 ++--
 .../LearningHub.Nhs.Repository.Interface.csproj               | 4 ++--
 .../LearningHub.Nhs.Repository.csproj                         | 4 ++--
 .../LearningHub.Nhs.Services.Interface.csproj                 | 4 ++--
 .../LearningHub.Nhs.Services.UnitTests.csproj                 | 4 ++--
 WebAPI/LearningHub.Nhs.Services/AzureDataFactoryService.cs    | 2 +-
 .../LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj  | 4 ++--
 .../LearningHub.Nhs.Migration.ConsoleApp.csproj               | 4 ++--
 .../LearningHub.Nhs.Migration.Interface.csproj                | 4 ++--
 .../LearningHub.Nhs.Migration.Models.csproj                   | 4 ++--
 .../LearningHub.Nhs.Migration.Staging.Repository.csproj       | 4 ++--
 .../LearningHub.Nhs.Migration.UnitTests.csproj                | 4 ++--
 .../LearningHub.Nhs.Migration.csproj                          | 4 ++--
 25 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
index ac75315bc..5e0d49099 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
+++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
@@ -37,13 +37,13 @@
     <PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
     <PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
     <PackageReference Include="BuildWebCompiler" Version="1.12.405" />
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
     <PackageReference Include="FluentValidation" Version="11.11.0" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 	<PackageReference Include="IdentityModel" Version="4.4.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.41" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index c79a68e8e..1a7931474 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -105,13 +105,13 @@
 
 	<ItemGroup>
 		<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
 		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
     <PackageReference Include="GDS.MultiPageFormData" Version="1.0.5" />
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
 		<PackageReference Include="IdentityModel" Version="4.3.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
 		<PackageReference Include="linqtotwitter" Version="6.9.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
index c2d722a2e..df17ab914 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Models/LearningHub.Nhs.OpenApi.Models.csproj
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
       <PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
     </ItemGroup>
 
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
index 58b11f5d1..1eb8f1661 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services.Interface/LearningHub.Nhs.OpenApi.Services.Interface.csproj
@@ -16,7 +16,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
index 31451e78f..a6985d957 100644
--- a/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
+++ b/OpenAPI/LearningHub.Nhs.OpenApi.Services/LearningHub.Nhs.OpenApi.Services.csproj
@@ -24,7 +24,7 @@
     <ItemGroup>
       <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
       <PackageReference Include="IdentityModel" Version="4.3.0" />
-      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+      <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj
index ad6fd8993..6a741a915 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services.Interface/LearningHub.Nhs.ReportApi.Services.Interface.csproj
@@ -16,7 +16,7 @@
 
    <ItemGroup>
     <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.11.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj
index c9394fb06..8662991bb 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/LearningHub.Nhs.ReportApi.Services.UnitTests.csproj
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoFixture" Version="4.17.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="Moq" Version="4.18.2" />
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj
index b41503f69..8a6a92d23 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services/LearningHub.Nhs.ReportApi.Services.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="AutoMapper" Version="10.1.1" />
     <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.11.0" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.13.1" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.10" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj b/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj
index 9c05c4ac0..b971872bc 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi.Shared/LearningHub.Nhs.ReportApi.Shared.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
index e45dcf794..a50564b06 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
@@ -20,7 +20,7 @@
 
   <ItemGroup>
    
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
    
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
    
diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
index 2c39ba754..bf383c531 100644
--- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
+++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
@@ -26,10 +26,10 @@
 
   <ItemGroup>
 	<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
 	<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
 	<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+	<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
 	<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 	<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
   <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
diff --git a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
index c21e9b0aa..858dadba4 100644
--- a/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.Shared/LearningHub.Nhs.Api.Shared.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
   	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
index c69582a15..c9e534127 100644
--- a/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Api.UnitTests/LearningHub.Nhs.Api.UnitTests.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
index 196d4856f..6adc152e0 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/LearningHub.Nhs.Repository.Interface.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-   <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+   <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
    <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+   <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	 <PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
index 48c5dcbfa..d56373fd5 100644
--- a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
+++ b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
index 9789783d8..5e298ec21 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/LearningHub.Nhs.Services.Interface.csproj
@@ -14,9 +14,9 @@
 
   <ItemGroup>
 	<PackageReference Include="Azure.Storage.Queues" Version="12.11.0" />
-	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+	<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
   <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-  <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+  <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
   <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
index 72718179d..0a0dd8b18 100644
--- a/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
+++ b/WebAPI/LearningHub.Nhs.Services.UnitTests/LearningHub.Nhs.Services.UnitTests.csproj
@@ -9,11 +9,11 @@
 
   <ItemGroup>
     <PackageReference Include="AutoFixture" Version="4.17.0" />
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
     <PackageReference Include="EntityFrameworkCore.Testing.Moq" Version="4.0.0" />
     <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
diff --git a/WebAPI/LearningHub.Nhs.Services/AzureDataFactoryService.cs b/WebAPI/LearningHub.Nhs.Services/AzureDataFactoryService.cs
index 3bb2008d1..89a04fabe 100644
--- a/WebAPI/LearningHub.Nhs.Services/AzureDataFactoryService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/AzureDataFactoryService.cs
@@ -158,7 +158,7 @@ protected virtual void Dispose(bool disposing)
         }
 
         /// <summary>
-        /// Get AzureMedia Credentials.wwedzx
+        /// Get AzureMedia Credentials.wwedzx.
         /// </summary>
         /// <returns>The <see cref="Task"/>.</returns>
         private async Task<ServiceClientCredentials> GetCredentialsAsync()
diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
index 0aaf94e88..48bc6e2ec 100644
--- a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
+++ b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj
@@ -10,10 +10,10 @@
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
     <PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="Microsoft.Azure.Management.DataFactory" Version="4.28.0" />
     <PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
index 0bd6cf916..55c0bf3e6 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.ConsoleApp/LearningHub.Nhs.Migration.ConsoleApp.csproj
@@ -21,10 +21,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
     <PackageReference Include="IdentityModel" Version="5.2.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
index 727a72688..3053b6bed 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Interface/LearningHub.Nhs.Migration.Interface.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
 		<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
index 22a6858ad..12f5062b3 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Models/LearningHub.Nhs.Migration.Models.csproj
@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
 	  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	  <PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 		<PrivateAssets>all</PrivateAssets>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
index 31a6d49b3..bc04e875e 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Repository/LearningHub.Nhs.Migration.Staging.Repository.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
   </ItemGroup>
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
index 0eed34ce1..d27458c6a 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration.UnitTests/LearningHub.Nhs.Migration.UnitTests.csproj
@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.45" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
 	<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
index 26b9a6a0c..39a526010 100644
--- a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
+++ b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj
@@ -8,11 +8,11 @@
 
 	<ItemGroup>
 		<PackageReference Include="AngleSharp" Version="0.16.1" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
 		<PackageReference Include="FluentValidation" Version="11.11.0" />
 		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.42" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
 		<PackageReference Update="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From e146f76753372d5a3f8c9d673fd324f757556710 Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Mon, 20 Jan 2025 14:32:39 +0000
Subject: [PATCH 140/143] formatted

---
 .../LearningHub.Nhs.AdminUI.csproj            | 69 ++++++++++---------
 .../LearningHub.Nhs.WebUI.csproj              |  4 +-
 .../LearningHub.Nhs.Api.csproj                |  4 +-
 3 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
index 5e0d49099..71e4744db 100644
--- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
+++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj
@@ -2,6 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+	<AssemblyVersion>1.0.0.0</AssemblyVersion>
+	<FileVersion>1.0.0.0</FileVersion>
+	<Version>1.0.0</Version>
     <UserSecretsId>31abd8b9-4223-4ff3-896b-a46530c9e15c</UserSecretsId>
     <ApplicationInsightsResourceId>/subscriptions/57c55d5f-78c1-4373-a021-ff8357548f51/resourceGroups/LearningHubNhsUk-AdminUI-Prod-RG/providers/microsoft.insights/components/LearningHubNhsUk-AdminUI-Prod</ApplicationInsightsResourceId>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
@@ -32,39 +35,6 @@
 	<ItemGroup>
 		<_ContentIncludedByDefault Remove="bundleconfig.json" />
 	</ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
-    <PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
-    <PackageReference Include="BuildWebCompiler" Version="1.12.405" />
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
-    <PackageReference Include="FluentValidation" Version="11.11.0" />
-    <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
-    <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
-	<PackageReference Include="IdentityModel" Version="4.4.0" />
-    <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
-    <PackageReference Include="Microsoft.FeatureManagement" Version="3.2.0" />
-    <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
-    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.2.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.2.1" />
-    <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
-    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.5.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
-    <PackageReference Include="MK.IO" Version="1.6.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
-  </ItemGroup>
 	<ItemGroup>
 		<Content Include="node_modules\%40ckeditor\ckeditor5-build-classic\package.json" />
 		<Content Include="node_modules\%40ckeditor\ckeditor5-core\lang\contexts.json" />
@@ -108,6 +78,39 @@
 		<Content Include="node_modules\%40ckeditor\ckeditor5-utils\package.json" />
 		<Content Include="node_modules\%40ckeditor\ckeditor5-vue\package.json" />
 	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
+		<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
+		<PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0" />
+		<PackageReference Include="BuildWebCompiler" Version="1.12.405" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.9" />
+		<PackageReference Include="FluentValidation" Version="11.11.0" />
+		<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
+		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
+		<PackageReference Include="IdentityModel" Version="4.4.0" />
+		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.46" />
+		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
+		<PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
+		<PackageReference Include="Microsoft.FeatureManagement" Version="3.2.0" />
+		<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.2.0" />
+		<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
+		<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.2.1" />
+		<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.2.1" />
+		<PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.4.1" />
+		<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.5.2">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
+		<PackageReference Include="MK.IO" Version="1.6.0" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="NLog.Web.AspNetCore" Version="4.14.0" />
+		<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
+	</ItemGroup>
 	<ItemGroup>
 		<Folder Include="Properties\" />
 		<Folder Include="Scripts\vuesrc\content\upload\" />
diff --git a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
index 1a7931474..cac4c673e 100644
--- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
+++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
-		<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>  
+		<TargetFramework>net8.0</TargetFramework> 
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<FileVersion>1.0.0.0</FileVersion>
 		<Version>1.0.0</Version>
+		<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
 		<UserSecretsId>a2ecb5d2-cf13-4551-9cb6-3d86dfbcf8ef</UserSecretsId>
 		<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
index bf383c531..936fbbc22 100644
--- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
+++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
-		<FileVersion>1.0.0.0</FileVersion>
-		<Version>1.0.0</Version>
+    <FileVersion>1.0.0.0</FileVersion>
+	<Version>1.0.0</Version>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <UserSecretsId>234b55ad-984b-47ae-9d7a-71e372e6ded7</UserSecretsId>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

From d98e4643cd91f836a0bcc5cf72e370ff9a72679d Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Mon, 20 Jan 2025 14:36:11 +0000
Subject: [PATCH 141/143] formatted

---
 .../LearningHub.Nhs.ReportApi.csproj                          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
index a50564b06..13513ac38 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
+++ b/ReportAPI/LearningHub.Nhs.ReportApi/LearningHub.Nhs.ReportApi.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
    	<AssemblyVersion>1.0.0.0</AssemblyVersion>
-		<FileVersion>1.0.0.0</FileVersion>
-		<Version>1.0.0</Version>
+	<FileVersion>1.0.0.0</FileVersion>
+	<Version>1.0.0</Version>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>False</GenerateDocumentationFile>

From 9aeeb918f2e7a0cb2e876c48ee2ea8273b038a1a Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Tue, 21 Jan 2025 10:38:00 +0000
Subject: [PATCH 142/143] Automapper issue fixed after framework upgrade

---
 .../PdfReportServicesTests.cs                                   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/PdfReportServicesTests.cs b/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/PdfReportServicesTests.cs
index a333c4358..73ebbf55c 100644
--- a/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/PdfReportServicesTests.cs
+++ b/ReportAPI/LearningHub.Nhs.ReportApi.Services.UnitTests/PdfReportServicesTests.cs
@@ -388,6 +388,8 @@ private IMapper NewMapper()
         {
             var mappingConfig = new MapperConfiguration(mc =>
             {
+                mc.AllowNullCollections = true;
+                mc.ShouldMapMethod = m => false;
                 mc.AddProfile(new MappingProfile());
             });
             IMapper mapper = mappingConfig.CreateMapper();

From 8be80d6196601811ca2780e8ffbd906d41a6e23c Mon Sep 17 00:00:00 2001
From: Swapnamol Abraham <Swapnamol.Abraham@hee.nhs.uk>
Date: Thu, 23 Jan 2025 13:52:44 +0000
Subject: [PATCH 143/143] Fixed the issue with the User group creation from the
 Admin UI

---
 WebAPI/LearningHub.Nhs.API/Controllers/UserGroupController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebAPI/LearningHub.Nhs.API/Controllers/UserGroupController.cs b/WebAPI/LearningHub.Nhs.API/Controllers/UserGroupController.cs
index 158692a23..844e106f9 100644
--- a/WebAPI/LearningHub.Nhs.API/Controllers/UserGroupController.cs
+++ b/WebAPI/LearningHub.Nhs.API/Controllers/UserGroupController.cs
@@ -102,7 +102,7 @@ public async Task<IActionResult> GetRoleUserGroupDetail()
         /// <returns>The <see cref="Task"/>.</returns>
         [HttpPost]
         [Route("CreateUserGroup")]
-        public async Task<IActionResult> CreateUserGroupAsync(UserGroupAdminDetailViewModel userGroup)
+        public async Task<IActionResult> CreateUserGroupAsync([FromBody]UserGroupAdminDetailViewModel userGroup)
         {
             var vr = await this.userGroupService.CreateUserGroupAsync(userGroup, this.CurrentUserId);
             if (vr.IsValid)