TechnologyEnhancedLearning
diff --git a/‎.github/workflows/build-and-deploy-production.yml‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/build-and-deploy-production.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflows/build-and-deploy-uat.yml‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/build-and-deploy-uat.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflows/continuous-integration-workflow.yml‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/continuous-integration-workflow.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎DigitalLearningSolutions.Data.Migrations/202503121538_Alter_SendExpiredTBCReminders.cs‎
Lines changed: 19 additions & 0 deletions b/‎DigitalLearningSolutions.Data.Migrations/202503121538_Alter_SendExpiredTBCReminders.cs‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎DigitalLearningSolutions.Data.Migrations/DigitalLearningSolutions.Data.Migrations.csproj‎
Lines changed: 1 addition & 1 deletion b/‎DigitalLearningSolutions.Data.Migrations/DigitalLearningSolutions.Data.Migrations.csproj‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs‎
Lines changed: 44 additions & 0 deletions b/‎DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs‎
Lines changed: 44 additions & 0 deletions
diff --git a/‎DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx‎
Lines changed: 4 additions & 7 deletions b/‎DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx‎
Lines changed: 4 additions & 7 deletions
diff --git a/‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-5412-Alter_SendExpiredTBCReminders_Down.sql‎
15.3 KB b/‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-5412-Alter_SendExpiredTBCReminders_Down.sql‎
15.3 KB
diff --git a/‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-5412-Alter_SendExpiredTBCReminders_Up.sql‎
16.4 KB b/‎DigitalLearningSolutions.Data.Migrations/Scripts/TD-5412-Alter_SendExpiredTBCReminders_Up.sql‎
16.4 KB
diff --git a/‎DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs‎
Lines changed: 35 additions & 14 deletions b/‎DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs‎
Lines changed: 35 additions & 14 deletions
@@ -19,10 +19,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup .NET Core SDK 8.0
+      - name: Setup .NET Core SDK 6.0
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 6.0.x
       - name: Setup node
         uses: actions/setup-node@v4
         with:
 
@@ -22,10 +22,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup .NET Core SDK 8.0
+      - name: Setup .NET Core SDK 6.0
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 6.0.x
       - name: Setup node
         uses: actions/setup-node@v4
         with:
 
@@ -12,10 +12,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup .NET Core SDK 8.0
+      - name: Setup .NET Core SDK 6.0
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 6.0.x
 
       - name: Add TechnologyEnhancedLearning as nuget package source
         run: dotnet nuget add source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --name TechnologyEnhancedLearning --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text
 
@@ -0,0 +1,19 @@
+
+
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202503121538)]
+    public class Alter_SendExpiredTBCReminders : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(Properties.Resources.TD_5412_Alter_SendExpiredTBCReminders_Up);
+        }
+        public override void Down()
+        {
+            Execute.Sql(Properties.Resources.TD_5412_Alter_SendExpiredTBCReminders_Down);
+        }
+    }
+}
@@ -19,7 +19,7 @@
     <PackageReference Include="Dapper" Version="2.1.35" />
     <PackageReference Include="FluentMigrator" Version="6.2.0" />
     <PackageReference Include="FluentMigrator.Extensions.SqlServer" Version="6.2.0" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
   </ItemGroup>
 
   <ItemGroup>
 
@@ -469,13 +469,10 @@
   <data name="TD_4950_Alter_GetAssessmentResultsByDelegate_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Scripts\TD_4950_Alter_GetAssessmentResultsByDelegate_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
-  <data name="TD-4950-dboGetOtherCentresForSelfAssessmentCreateOrAlter" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TD-4950-dboGetOtherCentresForSelfAssessmentCreateOrAlter.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="TD_5412_Alter_SendExpiredTBCReminders_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-5412-Alter_SendExpiredTBCReminders_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
-  <data name="TD_4878_Alter_GetActivitiesForDelegateEnrolment_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Scripts\TD-4878-Alter_GetActivitiesForDelegateEnrolment_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
-  </data>
-  <data name="TD_4878_Alter_GetActivitiesForDelegateEnrolment_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Scripts\TD-4878-Alter_GetActivitiesForDelegateEnrolment_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  <data name="TD_5412_Alter_SendExpiredTBCReminders_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-5412-Alter_SendExpiredTBCReminders_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
 </root>
@@ -62,6 +62,7 @@ public interface IFrameworkDataService
         int GetMaxFrameworkCompetencyID();
 
         int GetMaxFrameworkCompetencyGroupID();
+        int GetFrameworkCompetencyGroupId(int frameworkId, int competencyGroupId);
 
         //  Assessment questions:
         IEnumerable<AssessmentQuestion> GetAllCompetencyQuestions(int adminId);
@@ -198,7 +199,7 @@ int adminId
 
         void UpdateFrameworkConfig(int frameworkId, int adminId, string? frameworkConfig);
 
-        void UpdateFrameworkCompetencyGroup(
+        bool UpdateFrameworkCompetencyGroup(
             int frameworkCompetencyGroupId,
             int competencyGroupId,
             string name,
@@ -973,7 +974,7 @@ FROM FrameworkCompetencies AS fc
             );
         }
 
-        public void UpdateFrameworkCompetencyGroup(
+        public bool UpdateFrameworkCompetencyGroup(
             int frameworkCompetencyGroupId,
             int competencyGroupId,
             string name,
@@ -986,7 +987,7 @@ int adminId
                 logger.LogWarning(
                     $"Not updating framework competency group as it failed server side validation. AdminId: {adminId}, frameworkCompetencyGroupId: {frameworkCompetencyGroupId}, competencyGroupId: {competencyGroupId}, name: {name}"
                 );
-                return;
+                return false;
             }
 
             var usedElsewhere = connection.QuerySingle<int>(
@@ -1005,29 +1006,40 @@ int adminId
                             SET CompetencyGroupID = @newCompetencyGroupId, UpdatedByAdminID = @adminId
                             WHERE ID = @frameworkCompetencyGroupId",
                         new { newCompetencyGroupId, adminId, frameworkCompetencyGroupId }
+
                     );
                     if (numberOfAffectedRows < 1)
                     {
                         logger.LogWarning(
                             "Not updating competency group id as db update failed. " +
                             $"newCompetencyGroupId: {newCompetencyGroupId}, admin id: {adminId}, frameworkCompetencyGroupId: {frameworkCompetencyGroupId}"
                         );
+                        return false;
+                    }
+                    else
+                    {
+                        return true;
                     }
                 }
+                else
+                {
+                    return false;
+                }
             }
             else
             {
                 var numberOfAffectedRows = connection.Execute(
                     @"UPDATE CompetencyGroups SET Name = @name, UpdatedByAdminID = @adminId, Description = @description
-                    WHERE ID = @competencyGroupId",
+                    WHERE ID = @competencyGroupId AND (Name <> @name OR Description <> @description)",
                     new { name, adminId, competencyGroupId, description }
                 );
                 if (numberOfAffectedRows < 1)
                 {
-                    logger.LogWarning(
-                        "Not updating competency group name as db update failed. " +
-                        $"Name: {name}, admin id: {adminId}, competencyGroupId: {competencyGroupId}"
-                    );
+                    return false;
+                }
+                else
+                {
+                    return true;
                 }
             }
         }
@@ -2407,20 +2419,20 @@ public IEnumerable<BulkCompetency> GetBulkCompetenciesForFramework(int framework
             else
             {
                 return connection.Query<BulkCompetency>(
-                @"SELECT fc.ID, cg.Name AS CompetencyGroup, cg.Description AS GroupDescription, c.Name AS Competency, c.Description AS CompetencyDescription, c.AlwaysShowDescription, STUFF((
+                @"SELECT fc.ID, ISNULL(cg.Name, '') AS CompetencyGroup, cg.Description AS GroupDescription, c.Name AS Competency, c.Description AS CompetencyDescription, c.AlwaysShowDescription, STUFF((
                         SELECT ', ' + f.FlagName
                         FROM Flags AS f
                         INNER JOIN CompetencyFlags AS cf ON f.ID = cf.FlagID
                         WHERE cf.CompetencyID = c.ID
                         FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS FlagsCsv
                     FROM 
                          Competencies AS c INNER JOIN
-                         FrameworkCompetencies AS fc ON c.ID = fc.CompetencyID INNER JOIN
-                         FrameworkCompetencyGroups AS fcg ON fc.FrameworkCompetencyGroupID = fcg.ID INNER JOIN
+                         FrameworkCompetencies AS fc ON c.ID = fc.CompetencyID LEFT JOIN
+                         FrameworkCompetencyGroups AS fcg ON fc.FrameworkCompetencyGroupID = fcg.ID LEFT JOIN
                          CompetencyGroups AS cg ON fcg.CompetencyGroupID = cg.ID
                     WHERE (fc.FrameworkID = @frameworkId)
                     GROUP BY fc.ID, c.ID, cg.Name, cg.Description, c.Name, c.Description, c.AlwaysShowDescription, fcg.Ordering, fc.Ordering
-                    ORDER BY fcg.Ordering, fc.Ordering",
+                    ORDER BY COALESCE(fcg.Ordering,99999), fc.Ordering",
                                 new { frameworkId }
                             );
             }
@@ -2430,12 +2442,21 @@ public List<int> GetFrameworkCompetencyOrder(int frameworkId, List<int> framewor
         {
             return connection.Query<int>(
                 @"SELECT fc.ID
-                    FROM   FrameworkCompetencies AS fc INNER JOIN
+                    FROM   FrameworkCompetencies AS fc LEFT JOIN
                                  FrameworkCompetencyGroups AS fcg ON fc.FrameworkCompetencyGroupID = fcg.ID
                     WHERE (fc.FrameworkID = @frameworkId) AND (fc.ID IN @frameworkCompetencyIds)
-                    ORDER BY fcg.Ordering, fc.Ordering",
+                    ORDER BY COALESCE(fcg.Ordering,99999), fc.Ordering",
                                 new { frameworkId, frameworkCompetencyIds }
                             ).ToList();
         }
+
+        public int GetFrameworkCompetencyGroupId(int frameworkId, int competencyGroupId)
+        {
+            return connection.Query<int>(
+                @"SELECT MAX(ID) FROM FrameworkCompetencyGroups 
+                 WHERE FrameworkID = @frameworkId AND CompetencyGroupID = @competencyGroupId",
+                                new { frameworkId, competencyGroupId }
+                                ).Single();
+        }
     }
 }