TD-4238 Launching few courses from 'Current activities' or from 'Course set up' seeing back link as 'Completed activities'

Author: sherif-olaboye

DigitalLearningSolutions.Data/DataServices/CourseDataService.cs

@@ -137,6 +137,7 @@ int EnrolOnActivitySelfAssessment(int selfAssessmentId, int candidateId, int sup
         public IEnumerable<CourseStatistics> GetDelegateCourseStatisticsAtCentre(string searchString, int centreId, int? categoryId, bool allCentreCourses, bool? hideInLearnerPortal, string isActive, string categoryName, string courseTopic, string hasAdminFields);
 
         public IEnumerable<DelegateAssessmentStatistics> GetDelegateAssessmentStatisticsAtCentre(string searchString, int centreId, string categoryName, string isActive);
+        bool IsCourseCurrent(int candidateId, int customisationId);
     }
 
     public class CourseDataService : ICourseDataService
@@ -1821,6 +1822,22 @@ ELSE CAST(0 AS BIT) END",
             );
         }
 
+        public bool IsCourseCurrent(int candidateId, int customisationId)
+        {
+            return connection.ExecuteScalar<bool>(
+                @"SELECT CASE WHEN EXISTS (
+                            SELECT p.Completed
+                                FROM  Progress AS p INNER JOIN
+                                                Customisations AS cu ON p.CustomisationID = cu.CustomisationID INNER JOIN
+                                                Applications AS a ON cu.ApplicationID = a.ApplicationID
+                                WHERE  (p.CandidateID = @candidateId) AND (p.CustomisationID = @customisationId)
+                                AND ((p.Completed IS NULL)))
+                            THEN CAST(1 AS BIT)
+                            ELSE CAST(0 AS BIT) END",
+                new { candidateId, customisationId }
+            );
+        }
+
         public IEnumerable<Course> GetApplicationsAvailableToCentre(int centreId)
         {
             return connection.Query<Course>(

DigitalLearningSolutions.Web/Controllers/LearningMenuController/LearningMenuController.cs

@@ -599,11 +599,11 @@ private async Task IncreaseAuthenticatedUserExpiry()
 
         private void SetTempData(int candidateId, int customisationId)
         {
-            var isCompleted = courseService.IsCourseCompleted(candidateId, customisationId);
-            if (isCompleted)
-                TempData["LearningActivity"] = "Completed";
+            var isCurrent = courseService.IsCourseCurrent(candidateId, customisationId);
+            if (isCurrent)
+                TempData["LearningActivity"] =  "Current";
             else
-                TempData["LearningActivity"] = "Current";
+                TempData["LearningActivity"] = "Completed";
         }
 
         private bool UniqueIdManipulationDetected(int candidateId, int customisationId)

DigitalLearningSolutions.Web/Services/CourseService.cs

@@ -132,6 +132,7 @@ int diagCompletionThreshold
         void EnrolOnSelfAssessment(int selfAssessmentId, int delegateUserId, int centreId);
         int GetNumberOfActiveCoursesAtCentreFilteredByCategory(int centreId, int? categoryId);
         public IEnumerable<Course> GetApplicationsAvailableToCentre(int centreId);
+        bool IsCourseCurrent(int candidateId, int customisationId);
     }
 
     public class CourseService : ICourseService
@@ -619,5 +620,10 @@ public IEnumerable<Course> GetApplicationsAvailableToCentre(int centreId)
         {
             return courseDataService.GetApplicationsAvailableToCentre(centreId);
         }
+
+        public bool IsCourseCurrent(int candidateId, int customisationId)
+        {
+            return courseDataService.IsCourseCurrent(candidateId,customisationId);
+        }
     }
 }