Merge branch 'release-v1.0.0' into Develop/Fix/TD-4787-NominatedSupervisors-change-role-Assessor

Author: Auldrin-Possa

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/DataServices/ActivityDataService.cs

@@ -143,7 +143,7 @@ int currentRun
                     c.CustomisationName,
                     u.FirstName,
                     u.LastName,
-                    CASE WHEN COALESCE(ucd.Email, u.PrimaryEmail) LIKE '%@%' THEN COALESCE(ucd.Email, u.PrimaryEmail) ELSE '' END AS EmailAddress,
+                    COALESCE(ucd.Email, u.PrimaryEmail) AS EmailAddress,
                     da.CandidateNumber AS DelegateId,
                     da.Answer1,
                     da.Answer2,
@@ -166,7 +166,8 @@ Users AS u INNER JOIN
                                  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
+                                 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))

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs

@@ -456,7 +456,8 @@ public IEnumerable<Competency> GetCandidateAssessmentOptionalCompetencies(int se
                         CG.ID AS CompetencyGroupID,
                         'Capability' AS Vocabulary,
                         SAS.Optional,
-                        COALESCE (CAOC.IncludedInSelfAssessment, 0) AS IncludedInSelfAssessment
+                        COALESCE (CAOC.IncludedInSelfAssessment, 0) AS IncludedInSelfAssessment,
+                        SAS.GroupOptionalCompetencies 
                     FROM Competencies AS C
                     INNER JOIN CandidateAssessments AS CA
                         ON CA.SelfAssessmentID = @selfAssessmentId AND CA.DelegateUserID = @delegateUserId AND CA.RemovedDate IS NULL

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs

@@ -672,8 +672,19 @@ LEFT JOIN UserCentreDetails AS ucd WITH (NOLOCK) ON ucd.UserID = da.UserID AND u
         public void RemoveDelegateSelfAssessment(int candidateAssessmentsId)
         {
             connection.Execute(
-                @"UPDATE CandidateAssessments SET RemovedDate = GETUTCDATE(), RemovalMethodID =2
-                      WHERE ID = @candidateAssessmentsId",
+                @"BEGIN TRY
+                    BEGIN TRANSACTION
+                        UPDATE CandidateAssessments SET RemovedDate = GETUTCDATE(), RemovalMethodID = 2
+                            WHERE ID = @candidateAssessmentsId AND RemovedDate IS NULL
+
+                        UPDATE CandidateAssessmentSupervisors SET Removed = GETUTCDATE()
+                            WHERE CandidateAssessmentID = @candidateAssessmentsId AND Removed IS NULL
+
+                        COMMIT TRANSACTION
+                END TRY
+                BEGIN CATCH
+                    ROLLBACK TRANSACTION
+                END CATCH",
                 new { candidateAssessmentsId }
             );
         }

DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs

@@ -263,16 +263,6 @@ FROM  SupervisorDelegates sd
             }
             else
             {
-                if (supervisorAdminId == null)
-                {
-                    supervisorAdminId = (int?)connection.ExecuteScalar(
-                    @"SELECT AdminID FROM AdminUsers WHERE Email = @supervisorEmail AND Active = 1 AND CentreID = @centreId", new { supervisorEmail, centreId }
-                    );
-                }
-                if (supervisorAdminId != null)
-                {
-                    connection.Execute(@"UPDATE AdminUsers SET Supervisor = 1 WHERE AdminID = @supervisorAdminId AND Supervisor = 0", new { supervisorAdminId });
-                }
                 var numberOfAffectedRows = connection.Execute(
                     @"INSERT INTO SupervisorDelegates (SupervisorAdminID, DelegateEmail, DelegateUserID, SupervisorEmail, AddedByDelegate)
                     VALUES (@supervisorAdminId, @delegateEmail, @delegateUserId, @supervisorEmail, @addedByDelegate)",

DigitalLearningSolutions.Data/Models/SelfAssessments/Competency.cs

@@ -16,6 +16,7 @@ public class Competency
         public string CompetencyGroupDescription { get; set; } = string.Empty;
         public string? Vocabulary { get; set; }
         public bool Optional { get; set; }
+        public bool GroupOptionalCompetencies { get; set; }
         public bool AlwaysShowDescription { get; set; }
         public bool IncludedInSelfAssessment { get; set; }
         public DateTime? Verified { get; set; }

DigitalLearningSolutions.Data/Models/SelfAssessments/CompetencySummary.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DigitalLearningSolutions.Data.Models.SelfAssessments
+{
+    public class CompetencySummary
+    {
+        public int VerifiedCount { get; set; }
+        public int QuestionsCount { get; set; }
+        public bool CanViewCertificate { get; set; }
+    }
+}

DigitalLearningSolutions.Data/Models/TrackingSystem/ActivityLogDetail.cs

@@ -9,7 +9,7 @@ public class ActivityLogDetail
         public string? CustomisationName { get; set; }
         public string? FirstName { get; set; }
         public string? LastName { get; set; }
-        public string? PrimaryEmail { get; set; }
+        public string? EmailAddress { get; set; }
         public string? DelegateId { get; set; }
         public string? Answer1 { get; set; }
         public string? Answer2 { get; set; }

DigitalLearningSolutions.Web.Tests/Controllers/SupervisorController/SupervisorControllerTests.cs

@@ -31,6 +31,7 @@ public class SupervisorControllerTests
         private IEmailService emailService = null!;
         private IClockUtility clockUtility = null!;
         private ICandidateAssessmentDownloadFileService candidateAssessmentDownloadFileService = null!;
+        private IPdfService pdfService = null!;
 
         [SetUp]
         public void Setup()
@@ -53,7 +54,7 @@ public void Setup()
             emailService = A.Fake<IEmailService>();
             clockUtility = A.Fake<IClockUtility>();
             candidateAssessmentDownloadFileService = A.Fake<ICandidateAssessmentDownloadFileService>();
-
+            pdfService = A.Fake<IPdfService>();
             A.CallTo(() => candidateAssessmentDownloadFileService.GetCandidateAssessmentDownloadFileForCentre(A<int>._, A<int>._, A<bool>._))
                 .Returns(new byte[] { });
         }
@@ -81,7 +82,8 @@ public void ExportCandidateAssessment_should_return_file_object_with_file_name_i
                    emailGenerationService,
                    emailService,
                    candidateAssessmentDownloadFileService,
-                   clockUtility
+                   clockUtility,
+                   pdfService
                );
             string expectedFileName = $"{((selfAssessmentName.Length > 30) ? selfAssessmentName.Substring(0, 30) : selfAssessmentName)} - {delegateName} - {clockUtility.UtcNow:yyyy-MM-dd}.xlsx";
 

DigitalLearningSolutions.Web.Tests/Services/ActivityServiceTests.cs

@@ -436,7 +436,7 @@ public void GetActivityDataFileForCentre_returns_expected_excel_data()
 
             var filterData = new ActivityFilterData(
                 DateTime.Parse("2020-9-1"),
-                DateTime.Parse("2021-9-1"),
+                DateTime.Parse("2021-9-30"),
                 null,
                 null,
                 null,