Merge pull request #2798 from TechnologyEnhancedLearning/Develop/Fix/TD-4436-UTCdate-And-LocalDateTime

TD-4436 -Stored proc modified to update Completeby date and supervisor in the group enrolment

Author: rshrirohit

DigitalLearningSolutions.Data.Migrations/202408271130_Alter_GroupCustomisation_StoredProcs.cs

@@ -0,0 +1,20 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202408271130)]
+    public class Alter_GroupCustomisation_StoredProcs : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(Properties.Resources.TD_4436_Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Up);
+            Execute.Sql(Properties.Resources.TD_4436_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Up);
+        }
+        public override void Down()
+        {
+            Execute.Sql(Properties.Resources.TD_4436_Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Down);
+            Execute.Sql(Properties.Resources.TD_4436_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Down);
+        }
+
+    }
+}

DigitalLearningSolutions.Data.Migrations/202408271610_AlterConstraintForProgressAddUtcDate.cs

@@ -0,0 +1,21 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+    using System.Diagnostics.Metrics;
+
+    [Migration(202408271610)]
+    public class AlterConstraintForProgressAddUtcDate : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(@$"ALTER TABLE [dbo].[Progress] DROP CONSTRAINT [DF_Progress_FirstSubmittedTime];
+                           ALTER TABLE [dbo].[Progress] ADD CONSTRAINT [DF_Progress_FirstSubmittedTime] DEFAULT (GETUTCDATE()) FOR [FirstSubmittedTime];");
+        }
+        public override void Down()
+        {
+            Execute.Sql(@$"ALTER TABLE [dbo].[Progress] DROP CONSTRAINT [DF_Progress_FirstSubmittedTime];
+                           ALTER TABLE [dbo].[Progress] ADD CONSTRAINT [DF_Progress_FirstSubmittedTime] DEFAULT (GETDATE()) FOR [FirstSubmittedTime];");
+        }
+
+    }
+}

DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs

@@ -418,4 +418,16 @@
   <data name="TD_4436_Alter_uspCreateProgressRecord_V3_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Scripts\TD-4436-Alter_uspCreateProgressRecord_V3_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
+  <data name="TD_4436_Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-4436-Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+  <data name="TD_4436_Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-4436-Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+  <data name="TD_4436_Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-4436-Alter_uspCreateProgressRecordWithCompleteWithinMonths_Quiet_V2_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+  <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>

DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx

@@ -13,6 +13,7 @@ namespace DigitalLearningSolutions.Web.Tests.Controllers.LearningPortal
     using Microsoft.Extensions.Logging;
     using NUnit.Framework;
     using GDS.MultiPageFormData;
+    using DigitalLearningSolutions.Web.Helpers;
 
     public partial class LearningPortalControllerTests
     {
@@ -69,6 +70,7 @@ public void SetUp()
                     "mock"
                 )
             );
+            DateHelper.userTimeZone = "Europe/London";
             controller = new LearningPortalController(
                 centresService,
                 courseService,

DigitalLearningSolutions.Data.Migrations/Scripts/TD-4436-Alter_GroupCustomisation_Add_V2_UpdateCompleteBy_Supervisor_Down.sql

@@ -16,6 +16,7 @@ public class ApplicationSelectorController : Controller
         [SetSelectedTab(nameof(NavMenuTab.SwitchApplication))]
         public IActionResult Index()
         {
+            DateHelper.userTimeZone = DateHelper.userTimeZone ?? User.GetUserTimeZone(CustomClaimTypes.UserTimeZone);
             var learningPortalAccess = User.GetCustomClaimAsBool(CustomClaimTypes.LearnUserAuthenticated) ?? false;
             var trackingSystemAccess = User.HasCentreAdminPermissions();
             var contentManagementSystemAccess =