From 66612953042ea0e4492bdfbe0dc6047e6de2887b Mon Sep 17 00:00:00 2001
From: ABSinhaa <abhimanu.sinha@nhs.net>
Date: Mon, 7 Jul 2025 22:38:58 +0100
Subject: [PATCH 1/2] TD_5666_Framework Competency Group Description showing on
 Learning Portal/Supervisor Interface

---
 .../DataServices/FrameworkDataService.cs                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
index b6c03802f5..9e2b4b4aa5 100644
--- a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
+++ b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
@@ -1056,7 +1056,7 @@ int adminId
             {
                 var numberOfAffectedRows = connection.Execute(
                     @"UPDATE CompetencyGroups SET Name = @name, UpdatedByAdminID = @adminId, Description = @description
-                    WHERE ID = @competencyGroupId AND (Name <> @name OR ISNULL(Description, '') <> ISNULL(@description, ''))",
+                    WHERE ID = @competencyGroupId AND (Name <> @name OR Description <> @description)",
                     new { name, adminId, competencyGroupId, description }
                 );
                 if (numberOfAffectedRows < 1)

From b7fc082721c1fa7f6ba21243773f0c3fecc56d0f Mon Sep 17 00:00:00 2001
From: ABSinhaa <abhimanu.sinha@nhs.net>
Date: Thu, 10 Jul 2025 17:20:10 +0100
Subject: [PATCH 2/2] TD_5666 Made code changes after discussion and showed
 thee description on the Frameworks Interface.

---
 .../DataServices/FrameworkDataService.cs                  | 6 +++---
 .../Views/Frameworks/Shared/_CompetencyGroupCard.cshtml   | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
index 9e2b4b4aa5..5d9b5c425a 100644
--- a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
+++ b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs
@@ -863,7 +863,7 @@ public void RemoveCustomFlag(int flagId)
         public IEnumerable<FrameworkCompetencyGroup> GetFrameworkCompetencyGroups(int frameworkId)
         {
             var result = connection.Query<FrameworkCompetencyGroup, FrameworkCompetency, FrameworkCompetencyGroup>(
-                @"SELECT fcg.ID, fcg.CompetencyGroupID, cg.Name, fcg.Ordering, fc.ID, c.ID AS CompetencyID, c.Name, c.Description, fc.Ordering, COUNT(caq.AssessmentQuestionID) AS AssessmentQuestions
+                @"SELECT fcg.ID, fcg.CompetencyGroupID, cg.Name, cg.Description, fcg.Ordering, fc.ID, c.ID AS CompetencyID, c.Name, c.Description, fc.Ordering, COUNT(caq.AssessmentQuestionID) AS AssessmentQuestions
                     ,(SELECT COUNT(*) FROM CompetencyLearningResources clr WHERE clr.CompetencyID = c.ID AND clr.RemovedDate IS NULL) AS CompetencyLearningResourcesCount
                     FROM   FrameworkCompetencyGroups AS fcg INNER JOIN
                       CompetencyGroups AS cg ON fcg.CompetencyGroupID = cg.ID LEFT OUTER JOIN
@@ -871,7 +871,7 @@ FROM   FrameworkCompetencyGroups AS fcg INNER JOIN
                        Competencies AS c ON fc.CompetencyID = c.ID LEFT OUTER JOIN
                       CompetencyAssessmentQuestions AS caq ON c.ID = caq.CompetencyID
                     WHERE (fcg.FrameworkID = @frameworkId)
-                    GROUP BY fcg.ID, fcg.CompetencyGroupID, cg.Name, fcg.Ordering, fc.ID, c.ID, c.Name, c.Description, fc.Ordering
+                    GROUP BY fcg.ID, fcg.CompetencyGroupID, cg.Name, cg.Description, fcg.Ordering, fc.ID, c.ID, c.Name, c.Description, fc.Ordering
                     ORDER BY fcg.Ordering, fc.Ordering",
                 (frameworkCompetencyGroup, frameworkCompetency) =>
                 {
@@ -1056,7 +1056,7 @@ int adminId
             {
                 var numberOfAffectedRows = connection.Execute(
                     @"UPDATE CompetencyGroups SET Name = @name, UpdatedByAdminID = @adminId, Description = @description
-                    WHERE ID = @competencyGroupId AND (Name <> @name OR Description <> @description)",
+                    WHERE ID = @competencyGroupId AND (Name <> @name OR ISNULL(Description, '') <> ISNULL(@description, ''))",
                     new { name, adminId, competencyGroupId, description }
                 );
                 if (numberOfAffectedRows < 1)
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_CompetencyGroupCard.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_CompetencyGroupCard.cshtml
index f8c35d8898..a94b6562ff 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_CompetencyGroupCard.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_CompetencyGroupCard.cshtml
@@ -3,8 +3,12 @@
 <details id="fcgroup-@Model.FrameworkCompetencyGroup.ID" class="nhsuk-details nhsuk-expander  nhsuk-u-margin-bottom-3" @((int)ViewData["GroupCount"] == 1 ? "open" : (ViewContext.RouteData.Values.ContainsKey("frameworkCompetencyGroupId") ? (ViewContext.RouteData.Values["frameworkCompetencyGroupId"].Equals(Model.FrameworkCompetencyGroup.ID.ToString()) ? "open" : "") : ""))>
   <summary class="nhsuk-details__summary">
     <span class="nhsuk-details__summary-text">
-
-      @Model.FrameworkCompetencyGroup.Name (@Model.FrameworkCompetencyGroup.FrameworkCompetencies.Count() @ViewData["VocabPlural"].ToString().ToLower())
+      @Model.FrameworkCompetencyGroup.Name (@Model.FrameworkCompetencyGroup.FrameworkCompetencies.Count() @ViewData["VocabPlural"].ToString().ToLower())      
+    </span>
+    <br />
+    <br />
+    <span class="nhsuk-u-secondary-text-color nhsuk-body">
+      @Html.Raw(@Model.FrameworkCompetencyGroup.Description)
     </span>
     @if (Model.CanModify)
     {