Merge pull request #263 from TechnologyEnhancedLearning/Develop/Features/TD-2954-My-Learning-Page-Improvements-in-Performance

TD-2954: 1. Filter issue with combination of Completed and eLearning fixed. Filter tag text and checkbox label changed For Completed and In Progress

Author: sarathlal-sarangadharan

LearningHub.Nhs.WebUI/Models/MyLearningViewModel.cs

@@ -184,8 +184,8 @@ public List<CheckboxListItemViewModel> StatusFilterCheckbox()
         {
             var checkboxes = new List<CheckboxListItemViewModel>()
             {
-                new CheckboxListItemViewModel("Complete", "Complete", null),
-                new CheckboxListItemViewModel("Incomplete", "InProgress", null),
+                new CheckboxListItemViewModel("Complete", "Completed", null),
+                new CheckboxListItemViewModel("Incomplete", "In Progress", null),
                 new CheckboxListItemViewModel("Passed", "Passed", null),
                 new CheckboxListItemViewModel("Failed", "Failed", null),
                 new CheckboxListItemViewModel("Downloaded", "Downloaded", null),

LearningHub.Nhs.WebUI/Views/MyLearning/_filterSummary.cshtml

@@ -53,11 +53,11 @@
     }
     @if (Model.Complete)
     {
-        filtersummary = filtersummary + $" <strong class='nhsuk-tag'>Complete</strong>";
+        filtersummary = filtersummary + $" <strong class='nhsuk-tag'>Completed</strong>";
     }
     @if (Model.Incomplete)
     {
-        filtersummary = filtersummary + $" <strong class='nhsuk-tag'>InProgress</strong>";
+        filtersummary = filtersummary + $" <strong class='nhsuk-tag'>In Progress</strong>";
     }
     @if (Model.Passed)
     {

WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivities.sql

@@ -245,7 +245,8 @@ FROM (
 														)	
 												)
 										  )
-
+										  OR
+												([Res].[ResourceTypeId]  IN (6) AND  [ResourceActivity].[ActivityStatusId] = 3)
 										--OR         
 										--(
 										--		([Res].[ResourceTypeId] IN (1,5,10,12) AND  [ResourceActivity].[ActivityStatusId] = 3)

WebAPI/LearningHub.Nhs.Database/Stored Procedures/Activity/GetUserLearningActivitiesCount.sql

@@ -160,6 +160,8 @@ FROM (
 														)	
 												)
 										  )
+										  OR
+												([Res].[ResourceTypeId]  IN (6) AND  [ResourceActivity].[ActivityStatusId] = 3)
 
 										--OR         
 										--(