TechnologyEnhancedLearning
diff --git a/‎DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs‎
Lines changed: 30 additions & 10 deletions b/‎DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs‎
Lines changed: 30 additions & 10 deletions
diff --git a/‎DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs‎
Lines changed: 21 additions & 15 deletions b/‎DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs‎
Lines changed: 21 additions & 15 deletions
diff --git a/‎DigitalLearningSolutions.Web/Helpers/StringHelper.cs‎
Lines changed: 13 additions & 0 deletions b/‎DigitalLearningSolutions.Web/Helpers/StringHelper.cs‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎DigitalLearningSolutions.Web/Models/BulkCompetenciesData.cs‎
Lines changed: 1 addition & 1 deletion b/‎DigitalLearningSolutions.Web/Models/BulkCompetenciesData.cs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎DigitalLearningSolutions.Web/Scripts/trackingSystem/tableaureports.ts‎
Lines changed: 31 additions & 0 deletions b/‎DigitalLearningSolutions.Web/Scripts/trackingSystem/tableaureports.ts‎
Lines changed: 31 additions & 0 deletions
diff --git a/‎DigitalLearningSolutions.Web/Services/FrameworkService.cs‎
Lines changed: 19 additions & 7 deletions b/‎DigitalLearningSolutions.Web/Services/FrameworkService.cs‎
Lines changed: 19 additions & 7 deletions
@@ -130,9 +130,9 @@ bool zeroBased
 
         IEnumerable<FrameworkCompetency> GetAllCompetenciesForAdminId(string name, int adminId);
 
-        int InsertCompetency(string name, string? description, int adminId);
+        int InsertCompetency(string name, string? description, int adminId, bool alwaysShowDescription = false);
 
-        int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false);
+        int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool addDefaultQuestions = true);
 
         int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify, int? centreID);
 
@@ -266,6 +266,7 @@ bool deleteFromExisting
         void DeleteCompetencyAssessmentQuestion(int frameworkCompetencyId, int assessmentQuestionId, int adminId);
 
         void DeleteCompetencyLearningResource(int competencyLearningResourceId, int adminId);
+        void UpdateFrameworkCompetencyFrameworkCompetencyGroup(int? competencyGroupId, int frameworkCompetencyGroupId, int adminId);
     }
 
     public class FrameworkDataService : IFrameworkDataService
@@ -618,7 +619,7 @@ FROM            [FrameworkCompetencyGroups]
             return existingId;
         }
 
-        public int InsertCompetency(string name, string? description, int adminId)
+        public int InsertCompetency(string name, string? description, int adminId, bool alwaysShowDescription = false)
         {
             if ((name.Length == 0) | (adminId < 1))
             {
@@ -630,10 +631,10 @@ public int InsertCompetency(string name, string? description, int adminId)
             description = (description?.Trim() == "" ? null : description);
 
             var existingId = connection.QuerySingle<int>(
-                @"INSERT INTO Competencies ([Name], [Description], UpdatedByAdminID)
+                @"INSERT INTO Competencies ([Name], [Description], UpdatedByAdminID, AlwaysShowDescription)
                     OUTPUT INSERTED.Id
-                    VALUES (@name, @description, @adminId)",
-                new { name, description, adminId }
+                    VALUES (@name, @description, @adminId, @alwaysShowDescription)",
+                new { name, description, adminId, alwaysShowDescription }
             );
 
             return existingId;
@@ -644,7 +645,7 @@ public int InsertFrameworkCompetency(
             int? frameworkCompetencyGroupID,
             int adminId,
             int frameworkId,
-            bool alwaysShowDescription = false
+            bool addDefaultQuestions = true
         )
         {
             if ((competencyId < 1) | (adminId < 1) | (frameworkId < 1))
@@ -706,8 +707,10 @@ FROM            [FrameworkCompetencies]
                     new { competencyId, frameworkCompetencyGroupID }
                 );
             }
-
-            AddDefaultQuestionsToCompetency(competencyId, frameworkId);
+            if(addDefaultQuestions)
+            {
+                AddDefaultQuestionsToCompetency(competencyId, frameworkId);
+            }
             return existingId;
         }
 
@@ -2108,7 +2111,7 @@ public void SubmitFrameworkReview(int frameworkId, int reviewId, bool signedOff,
                         AU1.Email AS OwnerEmail,
                         FW.FrameworkName
                     FROM FrameworkReviews AS FR
-                    INNER JOIN FrameworkCollaborators AS FC ON FR.FrameworkCollaboratorID = FC.ID  AND FWC.IsDeleted = 0
+                    INNER JOIN FrameworkCollaborators AS FC ON FR.FrameworkCollaboratorID = FC.ID  AND FC.IsDeleted = 0
                     INNER JOIN AdminUsers AS AU ON FC.AdminID = AU.AdminID
                     INNER JOIN Frameworks AS FW ON FR.FrameworkID = FW.ID
                     INNER JOIN AdminUsers AS AU1 ON FW.OwnerAdminID = AU1.AdminID
@@ -2458,5 +2461,22 @@ public int GetFrameworkCompetencyGroupId(int frameworkId, int competencyGroupId)
                                 new { frameworkId, competencyGroupId }
                                 ).Single();
         }
+
+        public void UpdateFrameworkCompetencyFrameworkCompetencyGroup(int? competencyGroupId, int frameworkCompetencyGroupId, int adminId)
+        {
+            var numberOfAffectedRows = connection.Execute(
+                @"UPDATE FrameworkCompetencies
+                    SET FrameworkCompetencyGroupId = @frameworkCompetencyGroupId, UpdatedByAdminID = @adminId
+                    WHERE ID = @competencyGroupId AND FrameworkCompetencyGroupId <> @frameworkCompetencyGroupId",
+                new { frameworkCompetencyGroupId, competencyGroupId, adminId }
+            );
+            if (numberOfAffectedRows < 1)
+            {
+                logger.LogWarning(
+                    "Not updating framework competencies framework competency group id as db update failed. " +
+                    $"frameworkCompetencyGroupId: {frameworkCompetencyGroupId}, competencyGroupId: {competencyGroupId}."
+                );
+            }
+        }
     }
 }
@@ -10,6 +10,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Linq.Expressions;
 
 namespace DigitalLearningSolutions.Web.Controllers.FrameworksController
 {
@@ -180,15 +181,16 @@ public IActionResult AddAssessmentQuestions()
         public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model)
         {
             var data = GetBulkUploadData();
-            data.AddDefaultAssessmentQuestions = model.AddDefaultAssessmentQuestions;
+
             if (model.AddDefaultAssessmentQuestions)
             {
-                data.DefaultQuestionIDs = model.DefaultAssessmentQuestionIDs;
+                data.DefaultQuestionIDs = model.DefaultAssessmentQuestionIDs ?? [];
             }
             else
             {
                 data.DefaultQuestionIDs = [];
             }
+            data.AddDefaultAssessmentQuestions = (data.DefaultQuestionIDs.Count > 0 && model.AddDefaultAssessmentQuestions);
             data.AddCustomAssessmentQuestion = model.AddCustomAssessmentQuestion;
             if (model.AddCustomAssessmentQuestion)
             {
@@ -198,9 +200,8 @@ public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model
             {
                 data.CustomAssessmentQuestionID = null;
             }
-            if (data.CompetenciesToUpdateCount > 0)
+            if (data.CompetenciesToUpdateCount > 0 && (data.DefaultQuestionIDs.Count + (data.CustomAssessmentQuestionID != null ? 1 : 0) > 0))
             {
-                data.AddAssessmentQuestionsOption = 2;
                 setBulkUploadData(data);
                 return RedirectToAction("AddQuestionsToWhichCompetencies", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName });
             }
@@ -260,11 +261,6 @@ public IActionResult ImportSummarySubmit()
             var workbook = new XLWorkbook(filePath);
             var results = importCompetenciesFromFileService.ProcessCompetenciesFromFile(workbook, adminId, data.FrameworkId, data.FrameworkVocubulary, data.ReorderCompetenciesOption, data.AddAssessmentQuestionsOption, data.AddCustomAssessmentQuestion ? (int)data.CustomAssessmentQuestionID : 0, data.AddDefaultAssessmentQuestions ? data.DefaultQuestionIDs : []);
             data.ImportCompetenciesResult = results;
-            //TO DO apply ordering changes if required:
-            if (data.ReorderCompetenciesOption == 2 && data.CompetenciesToReorderCount > 0)
-            {
-
-            }
             setBulkUploadData(data);
             return RedirectToAction("UploadResults", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName });
         }
@@ -278,15 +274,25 @@ public IActionResult UploadResults()
             return View("Developer/Import/UploadResults", model);
         }
         [Route("CancelImport")]
-        public IActionResult CancelImport()
+        public IActionResult CancelImport(int? frameworkId)
         {
-            var data = GetBulkUploadData();
-            var frameworkId = data.FrameworkId;
-            if (!string.IsNullOrWhiteSpace(data.CompetenciesFileName))
+            try
             {
-                FileHelper.DeleteFile(webHostEnvironment, data.CompetenciesFileName);
+                var data = GetBulkUploadData();
+                frameworkId = data.FrameworkId;
+                if (!string.IsNullOrWhiteSpace(data.CompetenciesFileName))
+                {
+                    FileHelper.DeleteFile(webHostEnvironment, data.CompetenciesFileName);
+                }
+            }
+            catch
+            {
+
+            }
+            finally
+            {
+                TempData.Clear();
             }
-            TempData.Clear();
             return RedirectToAction("ViewFramework", new { frameworkId, tabname = "Structure" });
         }
         private void setupBulkUploadData(int frameworkId, int adminUserID, string competenciessFileName, string tabName, bool isNotBlank)
 
@@ -1,6 +1,7 @@
 namespace DigitalLearningSolutions.Web.Helpers
 {
     using System;
+    using System.Text.RegularExpressions;
     using DigitalLearningSolutions.Data.Extensions;
     using Microsoft.Extensions.Configuration;
 
@@ -16,5 +17,17 @@ public static string GetLocalRedirectUrl(IConfiguration config, string basicUrl)
             var applicationPath = new Uri(config.GetAppRootPath()).AbsolutePath.TrimEnd('/');
             return applicationPath + basicUrl;
         }
+        public static string StripHtmlTags(string input)
+        {
+            if (string.IsNullOrWhiteSpace(input))
+            {
+                return string.Empty;
+            }
+
+            // Remove HTML tags
+            string result = Regex.Replace(input, "<.*?>", string.Empty).Trim();
+
+            return string.IsNullOrEmpty(result) ? string.Empty : result;
+        }
     }
 }
@@ -32,7 +32,7 @@ public BulkCompetenciesData(DetailFramework framework, int adminUserId, string c
         public bool AddCustomAssessmentQuestion { get; set; } = false;
         public List<int> DefaultQuestionIDs { get; set; } = [];
         public int? CustomAssessmentQuestionID { get; set; }
-        public int AddAssessmentQuestionsOption { get; set; } = 1; //1 = only added, 2 = added and updated, 3 = all uploaded
+        public int AddAssessmentQuestionsOption { get; set; } = 2; //1 = only added, 2 = added and updated, 3 = all uploaded
         public int CompetenciesToProcessCount { get; set; }
         public int CompetenciesToAddCount { get; set; }
         public int CompetenciesToUpdateCount { get; set; }
 
@@ -0,0 +1,31 @@
+async function setTableauParams(): Promise<void> {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const viz = document.getElementById('tableau-viz') as any;
+  const adminIdElement = document.getElementById('hf-adminid') as HTMLInputElement | null;
+  const emailElement = document.getElementById('hf-email') as HTMLInputElement | null;
+
+  if (!viz) {
+    // console.error('Tableau Viz element not found.');
+    return;
+  }
+
+  if (!adminIdElement || !emailElement) {
+    // console.error('Hidden input fields for adminid or email not found.');
+    return;
+  }
+
+  const adminId = adminIdElement.value;
+  const email = emailElement.value;
+
+  // Listen for the `firstinteractive` event from the Web Component
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  viz.addEventListener('firstinteractive', async (event: Event) => {
+    await viz.workbook.changeParameterValueAsync('adminid', adminId);
+    await viz.workbook.changeParameterValueAsync('email', email);
+  });
+}
+
+// Run the function after the page loads
+document.addEventListener('DOMContentLoaded', () => {
+  setTableauParams();
+});
@@ -5,6 +5,7 @@
 using DigitalLearningSolutions.Data.Models.Frameworks.Import;
 using DigitalLearningSolutions.Data.Models.SelfAssessments;
 using System.Collections.Generic;
+using DigitalLearningSolutions.Web.Helpers;
 using AssessmentQuestion = DigitalLearningSolutions.Data.Models.Frameworks.AssessmentQuestion;
 using CompetencyResourceAssessmentQuestionParameter =
     DigitalLearningSolutions.Data.Models.Frameworks.CompetencyResourceAssessmentQuestionParameter;
@@ -120,11 +121,11 @@ bool zeroBased
 
         int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId = null);
 
-        int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false);
+        int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool addDefaultQuestions = true);
 
         IEnumerable<FrameworkCompetency> GetAllCompetenciesForAdminId(string name, int adminId);
 
-        int InsertCompetency(string name, string? description, int adminId);
+        int InsertCompetency(string name, string? description, int adminId, bool alwaysShowDescription = false);
 
         int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId);
 
@@ -260,6 +261,7 @@ bool deleteFromExisting
         void DeleteCompetencyAssessmentQuestion(int frameworkCompetencyId, int assessmentQuestionId, int adminId);
 
         void DeleteCompetencyLearningResource(int competencyLearningResourceId, int adminId);
+        void UpdateFrameworkCompetencyFrameworkCompetencyGroup(int? competencyGroupId, int frameworkCompetencyGroupId, int adminId);
     }
     public class FrameworkService : IFrameworkService
     {
@@ -516,7 +518,12 @@ public FrameworkDefaultQuestionUsage GetFrameworkDefaultQuestionUsage(int framew
 
         public DetailFramework? GetFrameworkDetailByFrameworkId(int frameworkId, int adminId)
         {
-            return frameworkDataService.GetFrameworkDetailByFrameworkId(frameworkId, adminId);
+            var detailFramework = frameworkDataService.GetFrameworkDetailByFrameworkId(frameworkId, adminId);
+            if (StringHelper.StripHtmlTags(detailFramework.Description) == string.Empty)
+            {
+                detailFramework.Description = string.Empty;
+            }
+            return detailFramework;
         }
 
         public FrameworkReview? GetFrameworkReview(int frameworkId, int adminId, int reviewId)
@@ -594,19 +601,19 @@ public int InsertComment(int frameworkId, int adminId, string comment, int? repl
             return frameworkDataService.InsertComment(frameworkId, adminId, comment, replyToCommentId);
         }
 
-        public int InsertCompetency(string name, string? description, int adminId)
+        public int InsertCompetency(string name, string? description, int adminId, bool alwaysShowDescription = false)
         {
-            return frameworkDataService.InsertCompetency(name, description, adminId);
+            return frameworkDataService.InsertCompetency(name, description, adminId, alwaysShowDescription);
         }
 
         public int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId)
         {
             return frameworkDataService.InsertCompetencyGroup(groupName, groupDescription, adminId, frameworkId);
         }
 
-        public int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false)
+        public int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool addDefaultQuestions = true)
         {
-            return frameworkDataService.InsertFrameworkCompetency(competencyId, frameworkCompetencyGroupID, adminId, frameworkId, alwaysShowDescription);
+            return frameworkDataService.InsertFrameworkCompetency(competencyId, frameworkCompetencyGroupID, adminId, frameworkId, addDefaultQuestions);
         }
 
         public int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId)
@@ -723,5 +730,10 @@ public int GetFrameworkCompetencyGroupId(int frameworkId, int competencyGroupId)
         {
             return frameworkDataService.GetFrameworkCompetencyGroupId(frameworkId, competencyGroupId);
         }
+
+        public void UpdateFrameworkCompetencyFrameworkCompetencyGroup(int? competencyGroupId, int frameworkCompetencyGroupId, int adminId)
+        {
+            frameworkDataService.UpdateFrameworkCompetencyFrameworkCompetencyGroup(competencyGroupId, frameworkCompetencyGroupId, adminId);
+        }
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`using System.Collections.Generic;`
`11`	`11`	`using System.IO;`
`12`	`12`	`using System.Linq;`
	`13`	`+using System.Linq.Expressions;`
`13`	`14`
`14`	`15`	`namespace DigitalLearningSolutions.Web.Controllers.FrameworksController`
`15`	`16`	`{`
`@@ -180,15 +181,16 @@ public IActionResult AddAssessmentQuestions()`
`180`	`181`	`public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model)`
`181`	`182`	`{`
`182`	`183`	`var data = GetBulkUploadData();`
`183`		`- data.AddDefaultAssessmentQuestions = model.AddDefaultAssessmentQuestions;`
	`184`	`+`
`184`	`185`	`if (model.AddDefaultAssessmentQuestions)`
`185`	`186`	`{`
`186`		`- data.DefaultQuestionIDs = model.DefaultAssessmentQuestionIDs;`
	`187`	`+ data.DefaultQuestionIDs = model.DefaultAssessmentQuestionIDs ?? [];`
`187`	`188`	`}`
`188`	`189`	`else`
`189`	`190`	`{`
`190`	`191`	`data.DefaultQuestionIDs = [];`
`191`	`192`	`}`
	`193`	`+ data.AddDefaultAssessmentQuestions = (data.DefaultQuestionIDs.Count > 0 && model.AddDefaultAssessmentQuestions);`
`192`	`194`	`data.AddCustomAssessmentQuestion = model.AddCustomAssessmentQuestion;`
`193`	`195`	`if (model.AddCustomAssessmentQuestion)`
`194`	`196`	`{`
`@@ -198,9 +200,8 @@ public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model`
`198`	`200`	`{`
`199`	`201`	`data.CustomAssessmentQuestionID = null;`
`200`	`202`	`}`
`201`		`- if (data.CompetenciesToUpdateCount > 0)`
	`203`	`+ if (data.CompetenciesToUpdateCount > 0 && (data.DefaultQuestionIDs.Count + (data.CustomAssessmentQuestionID != null ? 1 : 0) > 0))`
`202`	`204`	`{`
`203`		`- data.AddAssessmentQuestionsOption = 2;`
`204`	`205`	`setBulkUploadData(data);`
`205`	`206`	`return RedirectToAction("AddQuestionsToWhichCompetencies", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName });`
`206`	`207`	`}`
`@@ -260,11 +261,6 @@ public IActionResult ImportSummarySubmit()`
`260`	`261`	`var workbook = new XLWorkbook(filePath);`
`261`	`262`	`var results = importCompetenciesFromFileService.ProcessCompetenciesFromFile(workbook, adminId, data.FrameworkId, data.FrameworkVocubulary, data.ReorderCompetenciesOption, data.AddAssessmentQuestionsOption, data.AddCustomAssessmentQuestion ? (int)data.CustomAssessmentQuestionID : 0, data.AddDefaultAssessmentQuestions ? data.DefaultQuestionIDs : []);`
`262`	`263`	`data.ImportCompetenciesResult = results;`
`263`		`- //TO DO apply ordering changes if required:`
`264`		`- if (data.ReorderCompetenciesOption == 2 && data.CompetenciesToReorderCount > 0)`
`265`		`- {`
`266`		`-`
`267`		`- }`
`268`	`264`	`setBulkUploadData(data);`
`269`	`265`	`return RedirectToAction("UploadResults", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName });`
`270`	`266`	`}`
`@@ -278,15 +274,25 @@ public IActionResult UploadResults()`
`278`	`274`	`return View("Developer/Import/UploadResults", model);`
`279`	`275`	`}`
`280`	`276`	`[Route("CancelImport")]`
`281`		`- public IActionResult CancelImport()`
	`277`	`+ public IActionResult CancelImport(int? frameworkId)`
`282`	`278`	`{`
`283`		`- var data = GetBulkUploadData();`
`284`		`- var frameworkId = data.FrameworkId;`
`285`		`- if (!string.IsNullOrWhiteSpace(data.CompetenciesFileName))`
	`279`	`+ try`
`286`	`280`	`{`
`287`		`- FileHelper.DeleteFile(webHostEnvironment, data.CompetenciesFileName);`
	`281`	`+ var data = GetBulkUploadData();`
	`282`	`+ frameworkId = data.FrameworkId;`
	`283`	`+ if (!string.IsNullOrWhiteSpace(data.CompetenciesFileName))`
	`284`	`+ {`
	`285`	`+ FileHelper.DeleteFile(webHostEnvironment, data.CompetenciesFileName);`
	`286`	`+ }`
	`287`	`+ }`
	`288`	`+ catch`
	`289`	`+ {`
	`290`	`+`
	`291`	`+ }`
	`292`	`+ finally`
	`293`	`+ {`
	`294`	`+ TempData.Clear();`
`288`	`295`	`}`
`289`		`- TempData.Clear();`
`290`	`296`	`return RedirectToAction("ViewFramework", new { frameworkId, tabname = "Structure" });`
`291`	`297`	`}`
`292`	`298`	`private void setupBulkUploadData(int frameworkId, int adminUserID, string competenciessFileName, string tabName, bool isNotBlank)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`namespace DigitalLearningSolutions.Web.Helpers`
`2`	`2`	`{`
`3`	`3`	`using System;`
	`4`	`+ using System.Text.RegularExpressions;`
`4`	`5`	`using DigitalLearningSolutions.Data.Extensions;`
`5`	`6`	`using Microsoft.Extensions.Configuration;`
`6`	`7`
`@@ -16,5 +17,17 @@ public static string GetLocalRedirectUrl(IConfiguration config, string basicUrl)`
`16`	`17`	`var applicationPath = new Uri(config.GetAppRootPath()).AbsolutePath.TrimEnd('/');`
`17`	`18`	`return applicationPath + basicUrl;`
`18`	`19`	`}`
	`20`	`+ public static string StripHtmlTags(string input)`
	`21`	`+ {`
	`22`	`+ if (string.IsNullOrWhiteSpace(input))`
	`23`	`+ {`
	`24`	`+ return string.Empty;`
	`25`	`+ }`
	`26`	`+`
	`27`	`+ // Remove HTML tags`
	`28`	`+ string result = Regex.Replace(input, "<.*?>", string.Empty).Trim();`
	`29`	`+`
	`30`	`+ return string.IsNullOrEmpty(result) ? string.Empty : result;`
	`31`	`+ }`
`19`	`32`	`}`
`20`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using DigitalLearningSolutions.Data.Models.Frameworks.Import;`
`6`	`6`	`using DigitalLearningSolutions.Data.Models.SelfAssessments;`
`7`	`7`	`using System.Collections.Generic;`
	`8`	`+using DigitalLearningSolutions.Web.Helpers;`
`8`	`9`	`using AssessmentQuestion = DigitalLearningSolutions.Data.Models.Frameworks.AssessmentQuestion;`
`9`	`10`	`using CompetencyResourceAssessmentQuestionParameter =`
`10`	`11`	`DigitalLearningSolutions.Data.Models.Frameworks.CompetencyResourceAssessmentQuestionParameter;`
`@@ -120,11 +121,11 @@ bool zeroBased`
`120`	`121`
`121`	`122`	`int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId = null);`
`122`	`123`
`123`		`- int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false);`
	`124`	`+ int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool addDefaultQuestions = true);`
`124`	`125`
`125`	`126`	`IEnumerable<FrameworkCompetency> GetAllCompetenciesForAdminId(string name, int adminId);`
`126`	`127`
`127`		`- int InsertCompetency(string name, string? description, int adminId);`
	`128`	`+ int InsertCompetency(string name, string? description, int adminId, bool alwaysShowDescription = false);`
`128`	`129`
`129`	`130`	`int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId);`
`130`	`131`
`@@ -260,6 +261,7 @@ bool deleteFromExisting`
`260`	`261`	`void DeleteCompetencyAssessmentQuestion(int frameworkCompetencyId, int assessmentQuestionId, int adminId);`
`261`	`262`
`262`	`263`	`void DeleteCompetencyLearningResource(int competencyLearningResourceId, int adminId);`
	`264`	`+ void UpdateFrameworkCompetencyFrameworkCompetencyGroup(int? competencyGroupId, int frameworkCompetencyGroupId, int adminId);`
`263`	`265`	`}`
`264`	`266`	`public class FrameworkService : IFrameworkService`
`265`	`267`	`{`
`@@ -516,7 +518,12 @@ public FrameworkDefaultQuestionUsage GetFrameworkDefaultQuestionUsage(int framew`
`516`	`518`
`517`	`519`	`public DetailFramework? GetFrameworkDetailByFrameworkId(int frameworkId, int adminId)`
`518`	`520`	`{`
`519`		`- return frameworkDataService.GetFrameworkDetailByFrameworkId(frameworkId, adminId);`
	`521`	`+ var detailFramework = frameworkDataService.GetFrameworkDetailByFrameworkId(frameworkId, adminId);`
	`522`	`+ if (StringHelper.StripHtmlTags(detailFramework.Description) == string.Empty)`
	`523`	`+ {`
	`524`	`+ detailFramework.Description = string.Empty;`
	`525`	`+ }`
	`526`	`+ return detailFramework;`
`520`	`527`	`}`
`521`	`528`
`522`	`529`	`public FrameworkReview? GetFrameworkReview(int frameworkId, int adminId, int reviewId)`
`@@ -594,19 +601,19 @@ public int InsertComment(int frameworkId, int adminId, string comment, int? repl`
`594`	`601`	`return frameworkDataService.InsertComment(frameworkId, adminId, comment, replyToCommentId);`
`595`	`602`	`}`
`596`	`603`
`597`		`- public int InsertCompetency(string name, string? description, int adminId)`
	`604`	`+ public int InsertCompetency(string name, string? description, int adminId, bool alwaysShowDescription = false)`
`598`	`605`	`{`
`599`		`- return frameworkDataService.InsertCompetency(name, description, adminId);`
	`606`	`+ return frameworkDataService.InsertCompetency(name, description, adminId, alwaysShowDescription);`
`600`	`607`	`}`
`601`	`608`
`602`	`609`	`public int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId)`
`603`	`610`	`{`
`604`	`611`	`return frameworkDataService.InsertCompetencyGroup(groupName, groupDescription, adminId, frameworkId);`
`605`	`612`	`}`
`606`	`613`
`607`		`- public int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false)`
	`614`	`+ public int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool addDefaultQuestions = true)`
`608`	`615`	`{`
`609`		`- return frameworkDataService.InsertFrameworkCompetency(competencyId, frameworkCompetencyGroupID, adminId, frameworkId, alwaysShowDescription);`
	`616`	`+ return frameworkDataService.InsertFrameworkCompetency(competencyId, frameworkCompetencyGroupID, adminId, frameworkId, addDefaultQuestions);`
`610`	`617`	`}`
`611`	`618`
`612`	`619`	`public int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId)`
`@@ -723,5 +730,10 @@ public int GetFrameworkCompetencyGroupId(int frameworkId, int competencyGroupId)`
`723`	`730`	`{`
`724`	`731`	`return frameworkDataService.GetFrameworkCompetencyGroupId(frameworkId, competencyGroupId);`
`725`	`732`	`}`
	`733`	`+`
	`734`	`+ public void UpdateFrameworkCompetencyFrameworkCompetencyGroup(int? competencyGroupId, int frameworkCompetencyGroupId, int adminId)`
	`735`	`+ {`
	`736`	`+ frameworkDataService.UpdateFrameworkCompetencyFrameworkCompetencyGroup(competencyGroupId, frameworkCompetencyGroupId, adminId);`
	`737`	`+ }`
`726`	`738`	`}`
`727`	`739`	`}`