From 4a6d933370953b83defa779994134449767315a9 Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Tue, 9 Apr 2024 12:27:16 +0100 Subject: [PATCH 01/15] Fixes-TD-3959 --- .../Views/Home/Accessibility.cshtml | 1 + .../Views/Home/NhsSites.cshtml | 43 +++++++++---------- .../Views/Policies/AcceptableUsePolicy.cshtml | 2 +- .../Views/Policies/ContentPolicy.cshtml | 2 +- .../Views/Policies/CookiePolicy.cshtml | 2 +- .../Views/Policies/PrivacyPolicy.cshtml | 2 +- .../Views/Policies/TermsConditions.cshtml | 3 +- 7 files changed, 28 insertions(+), 27 deletions(-) diff --git a/LearningHub.Nhs.WebUI/Views/Home/Accessibility.cshtml b/LearningHub.Nhs.WebUI/Views/Home/Accessibility.cshtml index 5d4b15a55..b81898990 100644 --- a/LearningHub.Nhs.WebUI/Views/Home/Accessibility.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Home/Accessibility.cshtml @@ -66,6 +66,7 @@ Download as PDF + @await Html.PartialAsync("~/Views/Shared/_PageReviewPartial.cshtml", new PageReviewModel { LastReviewedDate = new DateTime(2023, 3, 17), NextReviewDate = new DateTime(2026, 8, 16) }) diff --git a/LearningHub.Nhs.WebUI/Views/Home/NhsSites.cshtml b/LearningHub.Nhs.WebUI/Views/Home/NhsSites.cshtml index b0fadfc6e..2af4bc4bc 100644 --- a/LearningHub.Nhs.WebUI/Views/Home/NhsSites.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Home/NhsSites.cshtml @@ -1,33 +1,32 @@ @{ ViewData["Title"] = "NHS sites"; } -@section styles{ +@section styles { }
-
+
-
-
-

- @ViewData["Title"] -

-
-
+
+
+

+ @ViewData["Title"] +

+
+
-
-
-
-

Health Education England

-

NHS Scotland

-

NHS Northern Ireland

-

NHS 111 Wales

-

Department of Health and Social Care

-

NHS England and NHS Improvement

- @await Html.PartialAsync("~/Views/Shared/_PageReviewPartial.cshtml", new PageReviewModel { LastReviewedDate = DateTimeOffset.Now, NextReviewDate = DateTimeOffset.Now.AddYears(3) }) -
-
+
+
+
+

NHS Scotland

+

NHS Northern Ireland

+

NHS 111 Wales

+

Department of Health and Social Care

+

NHS England

+ @await Html.PartialAsync("~/Views/Shared/_PageReviewPartial.cshtml", new PageReviewModel { LastReviewedDate = DateTimeOffset.Now, NextReviewDate = DateTimeOffset.Now.AddYears(3) }) +
+
+
-
\ No newline at end of file diff --git a/LearningHub.Nhs.WebUI/Views/Policies/AcceptableUsePolicy.cshtml b/LearningHub.Nhs.WebUI/Views/Policies/AcceptableUsePolicy.cshtml index 27ef9f801..9b120fef4 100644 --- a/LearningHub.Nhs.WebUI/Views/Policies/AcceptableUsePolicy.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Policies/AcceptableUsePolicy.cshtml @@ -218,7 +218,7 @@ - @await Html.PartialAsync("~/Views/Shared/_PageReviewPartial.cshtml", new PageReviewModel { LastReviewedDate = new DateTime(2023, 6, 01), NextReviewDate = new DateTime(2026, 6, 01) }) + @await Html.PartialAsync("~/Views/Shared/_PageReviewPartial.cshtml", new PageReviewModel { LastReviewedDate = new DateTime(2023, 6, 01), NextReviewDate = new DateTime(2026, 8, 16) })
diff --git a/LearningHub.Nhs.WebUI/Views/Policies/ContentPolicy.cshtml b/LearningHub.Nhs.WebUI/Views/Policies/ContentPolicy.cshtml index 67e19a1df..b8910df0e 100644 --- a/LearningHub.Nhs.WebUI/Views/Policies/ContentPolicy.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Policies/ContentPolicy.cshtml @@ -125,7 +125,7 @@ We ask that where practicable, all content should aim to meet accessibility standards as described in our Accessibility Statement and as set out in the AA standard Web Content Accessibility Guidelines v2.0.

- @await Html.PartialAsync("~/Views/Shared/_PageReviewPartial.cshtml", new PageReviewModel { LastReviewedDate = new DateTime(2020, 5, 26), NextReviewDate = new DateTime(2023, 5, 26) }) + @await Html.PartialAsync("~/Views/Shared/_PageReviewPartial.cshtml", new PageReviewModel { LastReviewedDate = new DateTime(2020, 5, 26), NextReviewDate = new DateTime(2026, 8, 16) }) \ No newline at end of file diff --git a/LearningHub.Nhs.WebUI/Views/Policies/CookiePolicy.cshtml b/LearningHub.Nhs.WebUI/Views/Policies/CookiePolicy.cshtml index e378741c0..232966df9 100644 --- a/LearningHub.Nhs.WebUI/Views/Policies/CookiePolicy.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Policies/CookiePolicy.cshtml @@ -317,7 +317,7 @@
@await Html.PartialAsync("_CookiePolicyConfirmation", new CookieConsentViewModel {UserConsent = cookieBannerCookieValue, Layout = Layout}) - @await Html.PartialAsync("~/Views/Shared/_PageReviewPartial.cshtml", new PageReviewModel { LastReviewedDate = new DateTime(2020, 5, 26), NextReviewDate = new DateTime(2023, 5, 26) }) + @await Html.PartialAsync("~/Views/Shared/_PageReviewPartial.cshtml", new PageReviewModel { LastReviewedDate = new DateTime(2020, 5, 26), NextReviewDate = new DateTime(2026, 8, 16) })
diff --git a/LearningHub.Nhs.WebUI/Views/Policies/PrivacyPolicy.cshtml b/LearningHub.Nhs.WebUI/Views/Policies/PrivacyPolicy.cshtml index 24a877359..924eee723 100644 --- a/LearningHub.Nhs.WebUI/Views/Policies/PrivacyPolicy.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Policies/PrivacyPolicy.cshtml @@ -208,7 +208,7 @@

- @await Html.PartialAsync("~/Views/Shared/_PageReviewPartial.cshtml", new PageReviewModel { LastReviewedDate = new DateTime(2023, 6, 01), NextReviewDate = new DateTime(2026, 6, 01) }) + @await Html.PartialAsync("~/Views/Shared/_PageReviewPartial.cshtml", new PageReviewModel { LastReviewedDate = new DateTime(2023, 6, 01), NextReviewDate = new DateTime(2026, 8, 16) }) diff --git a/LearningHub.Nhs.WebUI/Views/Policies/TermsConditions.cshtml b/LearningHub.Nhs.WebUI/Views/Policies/TermsConditions.cshtml index 75646cc53..f8596604d 100644 --- a/LearningHub.Nhs.WebUI/Views/Policies/TermsConditions.cshtml +++ b/LearningHub.Nhs.WebUI/Views/Policies/TermsConditions.cshtml @@ -1,6 +1,7 @@ @model LearningHub.Nhs.WebUI.Models.Policies.TermsAndConditionsViewModel @{ ViewData["Title"] = "Terms and Conditions"; + var nextDate = new DateTime(2026, 8, 16); } @section styles{ @@ -14,7 +15,7 @@
@Html.Raw(Model.TermsAndConditions) - @await Html.PartialAsync("~/Views/Shared/_PageReviewPartial.cshtml", new PageReviewModel { LastReviewedDate = Model.CreatedDate, NextReviewDate = Model.CreatedDate.AddYears(3) }) + @await Html.PartialAsync("~/Views/Shared/_PageReviewPartial.cshtml", new PageReviewModel { LastReviewedDate = Model.CreatedDate, NextReviewDate = nextDate })
From 9c55d27db9d7078196ee24ede671f810a01d95cf Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Wed, 10 Apr 2024 17:54:38 +0100 Subject: [PATCH 02/15] TD-4016:Remove character limit from catalogue description --- .../LearningHub.Nhs.AdminUI.csproj | 2 +- .../LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml | 8 -------- WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj | 2 +- .../Scripts/Pre-Deploy/Script.PreDeployment.sql | 4 ++++ .../Stored Procedures/Hierarchy/CatalogueCreate.sql | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj index cf7b4a059..a6109a60f 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj +++ b/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj @@ -89,7 +89,7 @@ - + diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml index eb2d3312c..15013bb91 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml +++ b/AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml @@ -138,7 +138,6 @@
- You have 1800 characters remaining
@@ -413,13 +412,6 @@ var editorData = editor.getData(); var data = $("

").html(editorData).text(); var textData = data.replace(/\s\n\n/g, ' ').replace(/\n\n/g, ' ').replace(/\s\n/g, '').replace(/\n/g, ''); - var remaining = 1800 - textData.length; - - if (remaining >= 0) { - $('#with-hint-info').text("You have " + remaining + " characters remaining").removeClass('text-danger'); - } else { - $('#with-hint-info').text("You have " + (-1 * remaining) + " character too many").addClass('text-danger'); - } }); editor.fire('change'); diff --git a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj index b3c1448ac..120f41ef6 100644 --- a/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj +++ b/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj @@ -27,7 +27,7 @@ - + diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql index 52e090048..9cd76bb1c 100644 --- a/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql +++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql @@ -18,3 +18,7 @@ BEGIN RAISERROR (N'TD-2902 Add resource types to Content Server.sql must be run manually before release.', 16, 127) WITH NOWAIT END GO + +--TD-4016-Remove character limit from catalogue description +ALTER TABLE hierarchy.CatalogueNodeVersion ALTER COLUMN Description nvarchar(max); +GO \ No newline at end of file diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueCreate.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueCreate.sql index a7023fce0..d9ab9ecd5 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueCreate.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueCreate.sql @@ -20,7 +20,7 @@ CREATE PROCEDURE [hierarchy].[CatalogueCreate] @CardImageUrl nvarchar(128), @BannerUrl nvarchar(128) null, @Order int, - @Description nvarchar(4000), + @Description nvarchar(max), @UserId int, @Hidden bit, @Keywords nvarchar(max), From 328b55bb799e0a4859be41805bb3c6062e11ada9 Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Thu, 11 Apr 2024 08:51:10 +0100 Subject: [PATCH 03/15] TD-2954: Filter issue in combination of Assessment and Completed (Issue1) fixed --- .../Activity/GetUserLearningActivities.sql | 6 +++--- .../Activity/GetUserLearningActivitiesCount.sql | 6 +++--- 2 files changed, 6 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 1b5931260..4d446df12 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql @@ -246,7 +246,7 @@ FROM ( ) ) OR - ([Res].[ResourceTypeId] IN (6) AND [ResourceActivity].[ActivityStatusId] = 3) + ([Res].[ResourceTypeId] IN (6,11) AND [ResourceActivity].[ActivityStatusId] = 3) --OR --( -- ([Res].[ResourceTypeId] IN (1,5,10,12) AND [ResourceActivity].[ActivityStatusId] = 3) @@ -361,7 +361,7 @@ FROM ( AND ( (SELECT TOP(1) - [AssessmentResourceActivity3].[Score] + ISNULL([AssessmentResourceActivity3].[Score],0) FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity3] WHERE [AssessmentResourceActivity3].[Deleted] = 0 @@ -390,7 +390,7 @@ FROM ( AND ( - (SELECT TOP(1) [AssessmentResourceActivity5].[Score] + (SELECT TOP(1) ISNULL([AssessmentResourceActivity5].[Score],0) FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5] WHERE [AssessmentResourceActivity5].[Deleted] = 0 AND [ResourceActivity].[Id] = [AssessmentResourceActivity5].[ResourceActivityId]) < Cast([AssessResVer].[PassMark] AS DECIMAL(18,2)) diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql index 0c5239ebc..0a40e1142 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql @@ -161,7 +161,7 @@ FROM ( ) ) OR - ([Res].[ResourceTypeId] IN (6) AND [ResourceActivity].[ActivityStatusId] = 3) + ([Res].[ResourceTypeId] IN (6,11) AND [ResourceActivity].[ActivityStatusId] = 3) --OR --( @@ -277,7 +277,7 @@ FROM ( AND ( (SELECT TOP(1) - [AssessmentResourceActivity3].[Score] + ISNULL([AssessmentResourceActivity3].[Score],0) FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity3] WHERE [AssessmentResourceActivity3].[Deleted] = 0 @@ -306,7 +306,7 @@ FROM ( AND ( - (SELECT TOP(1) [AssessmentResourceActivity5].[Score] + (SELECT TOP(1) ISNULL([AssessmentResourceActivity5].[Score],0) FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5] WHERE [AssessmentResourceActivity5].[Deleted] = 0 AND [ResourceActivity].[Id] = [AssessmentResourceActivity5].[ResourceActivityId]) < Cast([AssessResVer].[PassMark] AS DECIMAL(18,2)) From bd7ec8631e25573c5993b28087f9a10d53328db4 Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Thu, 11 Apr 2024 09:09:12 +0100 Subject: [PATCH 04/15] TD-4016: Updated models package in WebUI project --- 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 e1c12a5f8..817199786 100644 --- a/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj +++ b/LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj @@ -108,7 +108,7 @@ - + From 6b455d4658ead552efd9381db2e492dcb67a1248 Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Thu, 11 Apr 2024 12:43:49 +0100 Subject: [PATCH 05/15] TD-2954: Filter issues for assessment resolved --- .../Stored Procedures/Activity/GetUserLearningActivities.sql | 5 +++-- .../Activity/GetUserLearningActivitiesCount.sql | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql index 4d446df12..6c5d32f69 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql @@ -247,6 +247,7 @@ FROM ( ) OR ([Res].[ResourceTypeId] IN (6,11) AND [ResourceActivity].[ActivityStatusId] = 3) + 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) @@ -347,7 +348,7 @@ FROM ( EXISTS (SELECT 1 FROM @tmpActivityStatus WHERE ActivityStatusId = 5) AND ( - [Res].[ResourceTypeId] = 11 + [Res].[ResourceTypeId] = 11 AND [AssessResVer].[AssessmentType]=2 AND EXISTS ( @@ -380,7 +381,7 @@ FROM ( AND ( - [Res].[ResourceTypeId] = 11 + [Res].[ResourceTypeId] = 11 and [AssessResVer].[AssessmentType]=2 AND EXISTS ( diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql index 0a40e1142..cd9334886 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql @@ -162,6 +162,7 @@ FROM ( ) OR ([Res].[ResourceTypeId] IN (6,11) AND [ResourceActivity].[ActivityStatusId] = 3) + OR ([Res].[ResourceTypeId] IN (11) AND [ResourceActivity].[ActivityStatusId] = 3 AND [AssessResVer].[AssessmentType]=1) --OR --( @@ -263,7 +264,7 @@ FROM ( EXISTS (SELECT 1 FROM @tmpActivityStatus WHERE ActivityStatusId = 5) AND ( - [Res].[ResourceTypeId] = 11 + [Res].[ResourceTypeId] = 11 AND [AssessResVer].[AssessmentType]=2 AND EXISTS ( @@ -296,7 +297,7 @@ FROM ( AND ( - [Res].[ResourceTypeId] = 11 + [Res].[ResourceTypeId] = 11 and [AssessResVer].[AssessmentType]=2 AND EXISTS ( From 256f6622bb54d423972291142a599019e8bad02f Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Thu, 11 Apr 2024 12:47:03 +0100 Subject: [PATCH 06/15] Included missing file --- 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 f5e7a41c0..e9ec0d216 100644 --- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj +++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj @@ -512,6 +512,7 @@ + From 990131d26ca56f9db610c56b3f46569f7316d299 Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Thu, 11 Apr 2024 13:00:42 +0100 Subject: [PATCH 07/15] TD-2954:Model package version changed to 3.0.31 --- .../LearningHub.Nhs.Api.Shared.csproj | 2 +- .../LearningHub.Nhs.Api.UnitTests.csproj | 2 +- .../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 +- 13 files changed, 13 insertions(+), 13 deletions(-) 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 11e2caeb6..7f4998158 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 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 f261fb55f..9cbb1fe4e 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 @@ - + 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 7715e78ed..3793e6980 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 @@ - + diff --git a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj index 67f1f4807..073c1995f 100644 --- a/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj +++ b/WebAPI/LearningHub.Nhs.Repository/LearningHub.Nhs.Repository.csproj @@ -9,7 +9,7 @@ - + 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 819cadd09..e40618911 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 @@ - + all 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 869c5508d..58581b46c 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 @@ - + diff --git a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj index 036e55080..1323eff8b 100644 --- a/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj +++ b/WebAPI/LearningHub.Nhs.Services/LearningHub.Nhs.Services.csproj @@ -13,7 +13,7 @@ - + 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 4217f893c..588f60cd9 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 @@ - + all 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 9c8a63320..df3a5bef3 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 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 a1b018efb..27645a969 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 @@ - + all 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 571da87e8..3cb7eb534 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 @@ - + 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 f9b144c09..1d70a4338 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 @@ - + diff --git a/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj b/WebAPI/MigrationTool/LearningHub.Nhs.Migration/LearningHub.Nhs.Migration.csproj index 6d689e680..c9abd00e0 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 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 081fa43c8831f3b0a7b8387c60aaf97d579c5cc7 Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Thu, 11 Apr 2024 15:12:51 +0100 Subject: [PATCH 08/15] Modified the build action to None --- .../LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj index e9ec0d216..bc730fb58 100644 --- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj +++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj @@ -512,7 +512,7 @@ - + From 76f227f1ac50e834a9185f70e4e885b5199c0dee Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Fri, 12 Apr 2024 09:02:00 +0100 Subject: [PATCH 09/15] TD-4016: Deployement issue fix --- .../Scripts/Pre-Deploy/Script.PreDeployment.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql index 9cd76bb1c..fe3d8ece3 100644 --- a/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql +++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql @@ -20,5 +20,5 @@ END GO --TD-4016-Remove character limit from catalogue description -ALTER TABLE hierarchy.CatalogueNodeVersion ALTER COLUMN Description nvarchar(max); +ALTER TABLE hierarchy.CatalogueNodeVersion ALTER COLUMN Description nvarchar(max) NULL; GO \ No newline at end of file From 458ce585eb8e7614088f2f471f41b910d319ce86 Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Fri, 12 Apr 2024 09:44:27 +0100 Subject: [PATCH 10/15] TD-4016:Build fail fix --- .../LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj | 4 ++++ .../Scripts/Post-Deploy/Script.PostDeployment.sql | 3 ++- .../Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql | 3 +++ .../Scripts/Pre-Deploy/Script.PreDeployment.sql | 4 ---- 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj index bc730fb58..ec42b2342 100644 --- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj +++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj @@ -513,6 +513,7 @@ + @@ -583,4 +584,7 @@ + + + \ No newline at end of file diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql index 151c7c2c5..466d99f7b 100644 --- a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql +++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql @@ -81,4 +81,5 @@ UPDATE [resources].[ResourceVersion] SET CertificateEnabled = 0 WHERE VersionSta :r .\Scripts\InitialiseDataForEmailTemplates.sql :r .\Scripts\TD-2929_ActivityStatusUpdates.sql :r .\Scripts\InitialiseDataForEmailTemplates.sql -:r .\Scripts\AttributeData.sql \ No newline at end of file +:r .\Scripts\AttributeData.sql +:r .\Scripts\TD-4016_Alter_CatalogueNodeVersionTable.sql \ No newline at end of file diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql new file mode 100644 index 000000000..8dc04426f --- /dev/null +++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql @@ -0,0 +1,3 @@ +--TD-4016-Remove character limit from catalogue description +ALTER TABLE hierarchy.CatalogueNodeVersion ALTER COLUMN Description nvarchar(max) NULL; +GO \ No newline at end of file diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql index fe3d8ece3..52e090048 100644 --- a/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql +++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Pre-Deploy/Script.PreDeployment.sql @@ -18,7 +18,3 @@ BEGIN RAISERROR (N'TD-2902 Add resource types to Content Server.sql must be run manually before release.', 16, 127) WITH NOWAIT END GO - ---TD-4016-Remove character limit from catalogue description -ALTER TABLE hierarchy.CatalogueNodeVersion ALTER COLUMN Description nvarchar(max) NULL; -GO \ No newline at end of file From 09be671a92cb26bac83b542a33bde200db106f1d Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Fri, 12 Apr 2024 10:03:15 +0100 Subject: [PATCH 11/15] TD-4016:Build issue fix --- .../LearningHub.Nhs.Database.sqlproj | 5 +---- .../Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql | 9 +++++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj index ec42b2342..a9581774b 100644 --- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj +++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj @@ -513,7 +513,7 @@ - + @@ -584,7 +584,4 @@ - - - \ No newline at end of file diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql index 8dc04426f..611682a81 100644 --- a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql +++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql @@ -1,3 +1,8 @@ --TD-4016-Remove character limit from catalogue description -ALTER TABLE hierarchy.CatalogueNodeVersion ALTER COLUMN Description nvarchar(max) NULL; -GO \ No newline at end of file + +IF EXISTS(SELECT 1 FROM sys.columns + WHERE Name = N'Description' + AND Object_ID = Object_ID(N'hierarchy.CatalogueNodeVersion')) +BEGIN + ALTER TABLE hierarchy.CatalogueNodeVersion ALTER COLUMN Description nvarchar(max) null; +END \ No newline at end of file From da0620ecb004fa2a6e5744ffc693dc17f89b3d3a Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Fri, 12 Apr 2024 10:33:23 +0100 Subject: [PATCH 12/15] TD-4016:Build fail fix --- .../Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql index 611682a81..9132ee450 100644 --- a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql +++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql @@ -4,5 +4,5 @@ IF EXISTS(SELECT 1 FROM sys.columns WHERE Name = N'Description' AND Object_ID = Object_ID(N'hierarchy.CatalogueNodeVersion')) BEGIN - ALTER TABLE hierarchy.CatalogueNodeVersion ALTER COLUMN Description nvarchar(max) null; + ALTER TABLE hierarchy.CatalogueNodeVersion ALTER COLUMN Description nvarchar(max) not null; END \ No newline at end of file From 51a237e9912993e1c2c048205b0fbc9e973cb1c7 Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Fri, 12 Apr 2024 20:32:12 +0100 Subject: [PATCH 13/15] TD-2954: Filter fix --- .../Activity/GetUserLearningActivities.sql | 4 ++-- .../Activity/ResourceActivityRepository.cs | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql index 6c5d32f69..5eb46e6cb 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql @@ -362,7 +362,7 @@ FROM ( AND ( (SELECT TOP(1) - ISNULL([AssessmentResourceActivity3].[Score],0) + [AssessmentResourceActivity3].[Score] FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity3] WHERE [AssessmentResourceActivity3].[Deleted] = 0 @@ -391,7 +391,7 @@ FROM ( AND ( - (SELECT TOP(1) ISNULL([AssessmentResourceActivity5].[Score],0) + (SELECT TOP(1) [AssessmentResourceActivity5].[Score] FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5] WHERE [AssessmentResourceActivity5].[Deleted] = 0 AND [ResourceActivity].[Id] = [AssessmentResourceActivity5].[ResourceActivityId]) < Cast([AssessResVer].[PassMark] AS DECIMAL(18,2)) diff --git a/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs index 6a5ab608a..9b70c942b 100644 --- a/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs +++ b/WebAPI/LearningHub.Nhs.Repository/Activity/ResourceActivityRepository.cs @@ -400,11 +400,14 @@ private void BindAssessmentResourceActivityNestedData(List r List assessmentResourceActivityInteractionList = new List(); foreach (var item in c) { - 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); + 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; From 9f497857177a7b5d679d52e64ca9ba219e4610d8 Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Mon, 15 Apr 2024 10:10:51 +0100 Subject: [PATCH 14/15] TD-2954: Missing logic added --- .../Scripts/Post-Deploy/Script.PostDeployment.sql | 2 +- .../Activity/GetUserLearningActivitiesCount.sql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql index 466d99f7b..020d3781d 100644 --- a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql +++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql @@ -82,4 +82,4 @@ UPDATE [resources].[ResourceVersion] SET CertificateEnabled = 0 WHERE VersionSta :r .\Scripts\TD-2929_ActivityStatusUpdates.sql :r .\Scripts\InitialiseDataForEmailTemplates.sql :r .\Scripts\AttributeData.sql -:r .\Scripts\TD-4016_Alter_CatalogueNodeVersionTable.sql \ No newline at end of file +--:r .\Scripts\TD-4016_Alter_CatalogueNodeVersionTable.sql \ 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 cd9334886..329cbcfed 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql @@ -278,7 +278,7 @@ FROM ( AND ( (SELECT TOP(1) - ISNULL([AssessmentResourceActivity3].[Score],0) + [AssessmentResourceActivity3].[Score] FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity3] WHERE [AssessmentResourceActivity3].[Deleted] = 0 @@ -307,7 +307,7 @@ FROM ( AND ( - (SELECT TOP(1) ISNULL([AssessmentResourceActivity5].[Score],0) + (SELECT TOP(1) [AssessmentResourceActivity5].[Score] FROM [activity].[AssessmentResourceActivity] AS [AssessmentResourceActivity5] WHERE [AssessmentResourceActivity5].[Deleted] = 0 AND [ResourceActivity].[Id] = [AssessmentResourceActivity5].[ResourceActivityId]) < Cast([AssessResVer].[PassMark] AS DECIMAL(18,2)) From c7f27c9b2e66e5c1da1b3fe33de782e9de59ea66 Mon Sep 17 00:00:00 2001 From: Sarathlal Sarangadharan Date: Mon, 15 Apr 2024 10:24:39 +0100 Subject: [PATCH 15/15] TD-2954: Deployment fail issue fix --- .../LearningHub.Nhs.Database.sqlproj | 1 - .../Scripts/Post-Deploy/Script.PostDeployment.sql | 3 +-- .../Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql | 8 -------- .../Tables/Hierarchy/CatalogueNodeVersion.sql | 2 +- 4 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql diff --git a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj index a9581774b..bc730fb58 100644 --- a/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj +++ b/WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj @@ -513,7 +513,6 @@ - diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql index 020d3781d..151c7c2c5 100644 --- a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql +++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql @@ -81,5 +81,4 @@ UPDATE [resources].[ResourceVersion] SET CertificateEnabled = 0 WHERE VersionSta :r .\Scripts\InitialiseDataForEmailTemplates.sql :r .\Scripts\TD-2929_ActivityStatusUpdates.sql :r .\Scripts\InitialiseDataForEmailTemplates.sql -:r .\Scripts\AttributeData.sql ---:r .\Scripts\TD-4016_Alter_CatalogueNodeVersionTable.sql \ No newline at end of file +:r .\Scripts\AttributeData.sql \ No newline at end of file diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql deleted file mode 100644 index 9132ee450..000000000 --- a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-4016_Alter_CatalogueNodeVersionTable.sql +++ /dev/null @@ -1,8 +0,0 @@ ---TD-4016-Remove character limit from catalogue description - -IF EXISTS(SELECT 1 FROM sys.columns - WHERE Name = N'Description' - AND Object_ID = Object_ID(N'hierarchy.CatalogueNodeVersion')) -BEGIN - ALTER TABLE hierarchy.CatalogueNodeVersion ALTER COLUMN Description nvarchar(max) not null; -END \ No newline at end of file diff --git a/WebAPI/LearningHub.Nhs.Database/Tables/Hierarchy/CatalogueNodeVersion.sql b/WebAPI/LearningHub.Nhs.Database/Tables/Hierarchy/CatalogueNodeVersion.sql index ea9bc01d7..a9405c505 100644 --- a/WebAPI/LearningHub.Nhs.Database/Tables/Hierarchy/CatalogueNodeVersion.sql +++ b/WebAPI/LearningHub.Nhs.Database/Tables/Hierarchy/CatalogueNodeVersion.sql @@ -7,7 +7,7 @@ [CardImageUrl] NVARCHAR (128) NULL, [BannerUrl] NVARCHAR (128) NULL, [CertificateUrl] NVARCHAR (128) NULL, - [Description] NVARCHAR (4000) NOT NULL, + [Description] NVARCHAR (MAX) NOT NULL, [OwnerName] NVARCHAR (250) NULL, [OwnerEmailAddress] NVARCHAR (250) NULL, [Notes] NVARCHAR (MAX) NULL,