Merge pull request #2796 from TechnologyEnhancedLearning/Develop/Fix/TD-4634-Inactive-Unpublished-courses

TD-4634-Modified stored proc to return active and published status of courses.

Author: rshrirohit

DigitalLearningSolutions.Data.Migrations/202408231210_Alter_GetCompletedCoursesForCandidate_CourseActive.cs

@@ -0,0 +1,17 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202408231210)]
+    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/Properties/Resources.Designer.cs

@@ -418,4 +418,10 @@
   <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_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.Migrations/Properties/Resources.resx

@@ -12,6 +12,7 @@ public abstract class BaseLearningItem : BaseSearchableItem
         public bool IsSelfAssessment { get; set; }
         public bool SelfRegister { get; set; }
         public bool IncludesSignposting { get; set; }
+        public bool Active { get; set; }
         public int? CurrentVersion { get; set; }
         public override string SearchableName
         {

DigitalLearningSolutions.Data.Migrations/Scripts/TD-4634-Alter_GetCompletedCoursesForCandidate_DOWN.sql

@@ -8,5 +8,6 @@ public class CompletedLearningItem : StartedLearningItem
         public DateTime? Evaluated { get; set; }
         public DateTime? ArchivedDate { get; set; }
         public DateTime? RemovedDate { get; set; }
+        public bool Published { get; set; }
     }
 }

DigitalLearningSolutions.Data.Migrations/Scripts/TD-4634-Alter_GetCompletedCoursesForCandidate_UP.sql

@@ -14,6 +14,7 @@ protected BaseLearningItemViewModel(BaseLearningItem course)
             IsSelfAssessment = course.IsSelfAssessment;
             SelfRegister = course.SelfRegister;
             IncludesSignposting = course.IncludesSignposting;
+            Active = course.Active;
         }
 
         public string Name { get; set; }
@@ -24,5 +25,6 @@ protected BaseLearningItemViewModel(BaseLearningItem course)
         public bool IsSelfAssessment { get; }
         public bool SelfRegister { get; }
         public bool IncludesSignposting { get; }
+        public bool Active { get; }
     }
 }

DigitalLearningSolutions.Data/Models/BaseLearningItem.cs

@@ -11,11 +11,13 @@ public CompletedLearningItemViewModel(CompletedLearningItem item) : base(item)
             EvaluatedDate = item.Evaluated;
             ArchivedDate = item.ArchivedDate;
             RemovedDate = item.RemovedDate;
+            Published = item.Published;
         }
 
         public DateTime CompletedDate { get; }
         public DateTime? EvaluatedDate { get; }
         public DateTime? ArchivedDate { get; }
         public DateTime? RemovedDate { get; }
+        public bool Published { get; }
     }
 }

DigitalLearningSolutions.Data/Models/CompletedLearningItem.cs

@@ -31,7 +31,7 @@
     </details>
 
     <div class="flex-row">
-        @if (Model.ArchivedDate == null && Model.RemovedDate == null)
+        @if (Model.ArchivedDate == null && Model.RemovedDate == null && Model.Active && Model.Published)
         {
             <a class="nhsuk-button nhsuk-u-margin-bottom-2 nhsuk-u-margin-right-2"
                aria-describedby="@Model.Id-name"