Merge branch 'DEV' into DLS-Release-v1.2.0

Author: kevwhitt-hee

.github/workflows/build-and-deploy-dev.yml

@@ -138,4 +138,4 @@ jobs:
           {
             Remove-Item -LiteralPath 'E:/web/${{env.SitePath}}-PREVIOUS' -Force -Recurse
           }
-          Remove-Item 'E:/web/${{env.SitePath}}/app_offline.htm' -Force
+          Remove-Item 'E:/web/${{env.SitePath}}/app_offline.htm' -Force

DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs

@@ -134,6 +134,7 @@ bool zeroBased
         int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false);
 
         int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify, int? centreID);
+
         int AddCustomFlagToFramework(int frameworkId, string flagName, string flagGroup, string flagTagClass);
         void UpdateFrameworkCustomFlag(int frameworkId, int id, string flagName, string flagGroup, string flagTagClass);
 

DigitalLearningSolutions.Web/Services/FrameworkService.cs

@@ -128,6 +128,7 @@ bool zeroBased
         int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId);
 
         int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify, int? centreID);
+
         int AddCustomFlagToFramework(int frameworkId, string flagName, string flagGroup, string flagTagClass);
         void UpdateFrameworkCustomFlag(int frameworkId, int id, string flagName, string flagGroup, string flagTagClass);