Release 2024.38

DigitalLearningSolutions.Data.Migrations/202409051645_Alter_GetCompletedCoursesForCandidate_CourseActive.cs

@@ -0,0 +1,19 @@
+
+
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202409051645)]
+    public class Alter_GetCompletedCoursesForCandidate_CourseActive : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(Properties.Resources.TD_4634_Alter_GetCompletedCoursesForCandidate_UP);
+        }
+        public override void Down()
+        {
+            Execute.Sql(Properties.Resources.TD_4634_Alter_GetCompletedCoursesForCandidate_DOWN);
+        }
+    }
+}

DigitalLearningSolutions.Data.Migrations/202409110900_AddGroupOptionalCompetenciesToSelfAssessmentStructureTable.cs

@@ -0,0 +1,23 @@
+
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202409110900)]
+    public  class AddGroupOptionalCompetenciesToSelfAssessmentStructureTable : Migration
+    {
+        public override void Up()
+        {
+            Alter.Table("SelfAssessmentStructure")
+                .AddColumn("GroupOptionalCompetencies")
+                .AsCustom("BIT")
+                .NotNullable()
+                .WithDefaultValue(0);
+        }
+
+        public override void Down()
+        {
+            Delete.Column("GroupOptionalCompetencies").FromTable("SelfAssessmentStructure");
+        }
+    }
+}

DigitalLearningSolutions.Data.Migrations/202409300912_AlterConstraintForCandidateAssessmentsAddUtcDate.cs

@@ -0,0 +1,20 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202409300912)]
+    public class AlterConstraintForCandidateAssessmentsAddUtcDate : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(@$"ALTER TABLE [dbo].[CandidateAssessments] DROP CONSTRAINT [DF_CandidateAssessments_StartedDate];
+                           ALTER TABLE [dbo].[CandidateAssessments] ADD CONSTRAINT [DF_CandidateAssessments_StartedDate] DEFAULT (GETUTCDATE()) FOR [StartedDate];");
+        }
+        public override void Down()
+        {
+            Execute.Sql(@$"ALTER TABLE [dbo].[CandidateAssessments] DROP CONSTRAINT [DF_CandidateAssessments_StartedDate];
+                           ALTER TABLE [dbo].[CandidateAssessments] ADD CONSTRAINT [DF_CandidateAssessments_StartedDate] DEFAULT (GETDATE()) FOR [StartedDate];");
+        }
+
+    }
+}

DigitalLearningSolutions.Data.Migrations/AddMinimumOptionalCompetenciesToSelfAssessmentsTable.cs

@@ -0,0 +1,19 @@
+
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202401081132)]
+    public  class AddMinimumOptionalCompetenciesToSelfAssessmentsTable : Migration
+    {
+        public override void Up()
+        {
+            Alter.Table("SelfAssessments").AddColumn("MinimumOptionalCompetencies").AsInt32().NotNullable().WithDefaultValue(0);
+        }
+
+        public override void Down()
+        {
+            Delete.Column("MinimumOptionalCompetencies").FromTable("SelfAssessments");
+        }
+    }
+}

DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx

@@ -442,4 +442,10 @@
   <data name="TD_4436_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Scripts\TD-4436-Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
-</root>
+  <data name="TD_4634_Alter_GetCompletedCoursesForCandidate_DOWN" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD_4634_Alter_GetCompletedCoursesForCandidate_DOWN.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+  <data name="TD_4634_Alter_GetCompletedCoursesForCandidate_UP" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD_4634_Alter_GetCompletedCoursesForCandidate_UP.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+</root>

DigitalLearningSolutions.Data/DataServices/ActivityDataService.cs

@@ -16,7 +16,24 @@ IEnumerable<ActivityLog> GetFilteredActivity(
             int? courseCategoryId,
             int? customisationId
         );
-
+        int GetActivityDetailRowCount(
+            int centreId,
+            DateTime startDate,
+            DateTime? endDate,
+            int? jobGroupId,
+            int? courseCategoryId,
+            int? customisationId
+            );
+        IEnumerable<ActivityLogDetail> GetFilteredActivityDetail(
+            int centreId,
+            DateTime startDate,
+            DateTime? endDate,
+            int? jobGroupId,
+            int? courseCategoryId,
+            int? customisationId,
+            int exportQueryRowLimit,
+            int currentRun
+            );
         DateTime? GetStartOfActivityForCentre(int centreId, int? courseCategoryId = null);
     }
 
@@ -47,10 +64,10 @@ public IEnumerable<ActivityLog> GetFilteredActivity(
                         SUM(CAST(Registered AS Int)) AS Registered,
 						SUM(CAST(Completed AS Int)) AS Completed,
 						SUM(CAST(Evaluated AS Int)) AS Evaluated
-                    FROM tActivityLog AS al
+                    FROM tActivityLog AS al INNER JOIN DelegateAccounts AS da ON al.CandidateID = da.ID AND al.CentreID = da.CentreID
                     WHERE (LogDate >= @startDate
                         AND (@endDate IS NULL OR LogDate <= @endDate)
-                        AND CentreID = @centreId
+                        AND (al.CentreID = @centreId)
                         AND (@jobGroupId IS NULL OR JobGroupID = @jobGroupId)
                         AND (@customisationId IS NULL OR al.CustomisationID = @customisationId)
                         AND (@courseCategoryId IS NULL OR al.CourseCategoryId = @courseCategoryId)
@@ -74,7 +91,103 @@ GROUP BY  Cast(LogDate As Date), LogYear,
                 }
             );
         }
-
+        public int GetActivityDetailRowCount(
+            int centreId,
+            DateTime startDate,
+            DateTime? endDate,
+            int? jobGroupId,
+            int? courseCategoryId,
+            int? customisationId
+            )
+        {
+            return connection.QuerySingleOrDefault<int>(
+                @"SELECT COUNT(1) FROM
+                                 tActivityLog AS al INNER JOIN DelegateAccounts AS da ON al.CandidateID = da.ID AND al.CentreID = da.CentreID
+                        WHERE(al.LogDate >= @startDate) AND(@endDate IS NULL OR
+                                 al.LogDate <= @endDate) AND(al.CentreID = @centreId) AND (@jobGroupId IS NULL OR
+                                 al.JobGroupID = @jobGroupId) AND(@customisationId IS NULL OR
+                                 al.CustomisationID = @customisationId) AND(@courseCategoryId IS NULL OR
+                                 al.CourseCategoryID = @courseCategoryId) AND(al.Registered = 1 OR
+                                 al.Completed = 1 OR
+                                 al.Evaluated = 1) AND EXISTS
+                                 (SELECT ApplicationID
+                                     FROM    Applications AS ap
+                                     WHERE (ApplicationID = al.ApplicationID) AND
+                                     (DefaultContentTypeID<> 4))",
+                new
+                {
+                    centreId,
+                    startDate,
+                    endDate,
+                    jobGroupId,
+                    customisationId,
+                    courseCategoryId
+                }
+            );
+        }
+        public IEnumerable<ActivityLogDetail> GetFilteredActivityDetail(
+            int centreId,
+            DateTime startDate,
+            DateTime? endDate,
+            int? jobGroupId,
+            int? courseCategoryId,
+            int? customisationId,
+            int exportQueryRowLimit,
+            int currentRun
+            )
+        {
+            return connection.Query<ActivityLogDetail>(
+                @"SELECT al.LogID,
+                    al.LogDate,
+                    a.ApplicationName AS CourseName,
+                    c.CustomisationName,
+                    u.FirstName,
+                    u.LastName,
+                    COALESCE(ucd.Email, u.PrimaryEmail) AS EmailAddress,
+                    da.CandidateNumber AS DelegateId,
+                    da.Answer1,
+                    da.Answer2,
+                    da.Answer3,
+                    da.Answer4,
+                    da.Answer5,
+                    da.Answer6,
+                    al.Registered AS Enrolled,
+                    al.Completed,
+                    al.Evaluated
+                    FROM   Applications AS a INNER JOIN
+                                 tActivityLog AS al ON a.ApplicationID = al.ApplicationID INNER JOIN
+                                 Users AS u INNER JOIN
+                                 DelegateAccounts AS da ON u.ID = da.UserID ON al.CandidateID = da.ID AND al.CentreID = da.CentreID INNER JOIN
+                                 Customisations AS c ON al.CustomisationID = c.CustomisationID LEFT OUTER JOIN
+                                 UserCentreDetails AS ucd ON u.ID = ucd.UserID AND c.CentreID = al.CentreID
+                    WHERE (al.LogDate >= @startDate) AND (@endDate IS NULL OR
+                                 al.LogDate <= @endDate) AND (al.CentreID = @centreId) AND (@jobGroupId IS NULL OR
+                                 al.JobGroupID = @jobGroupId) AND (@customisationId IS NULL OR
+                                 al.CustomisationID = @customisationId) AND (@courseCategoryId IS NULL OR
+                                 al.CourseCategoryID = @courseCategoryId) AND (al.Registered = 1 OR
+                                 al.Completed = 1 OR
+                                 al.Evaluated = 1) AND
+                          (u.PrimaryEmail like '%_@_%' OR ucd.Email IS NOT NULL) AND EXISTS
+                                     (SELECT ApplicationID
+                                    FROM    Applications AS ap
+                                    WHERE (ApplicationID = al.ApplicationID) AND (DefaultContentTypeID <> 4))
+                    ORDER BY al.LogDate DESC
+                            OFFSET @exportQueryRowLimit * (@currentRun - 1) ROWS
+                            FETCH NEXT @exportQueryRowLimit ROWS ONLY"
+                ,
+                new
+                {
+                    centreId,
+                    startDate,
+                    endDate,
+                    jobGroupId,
+                    customisationId,
+                    courseCategoryId,
+                    exportQueryRowLimit,
+                    currentRun
+                }
+            );
+        }
         public DateTime? GetStartOfActivityForCentre(int centreId, int? courseCategoryId = null)
         {
             return connection.QuerySingleOrDefault<DateTime?>(