Merge pull request #266 from TechnologyEnhancedLearning/RC

Rc

Author: binon

LearningHub.Nhs.WebUI/Controllers/Api/ScormController.cs

@@ -260,7 +260,7 @@ private async Task<bool> Commit(SCO scoObject)
 
                 // Persist update.
                 await this.activityService.UpdateScormActivityAsync(scoObject);
-                if (scoObject.LessonStatusId == 3)
+                if (scoObject.LessonStatusId == ScormLessionStatus.ActivityStatusId(ScormLessionStatus.Completed) || scoObject.LessonStatusId == ScormLessionStatus.ActivityStatusId(ScormLessionStatus.Passed))
                 {
                     await this.activityService.CompleteScormActivity(scoObject);
                 }

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)
     {

LearningHub.Nhs.WebUI/Views/Resource/_ResourceItem.cshtml

@@ -161,23 +161,7 @@
                         </div>
                     }
                 }
-                @* Html Resource *@
-                @if (canShowMoreDetails && resourceItem.ResourceTypeEnum == ResourceTypeEnum.Html)
-                {
-                    <div id="resourcePg" class="nhsuk-card nhsuk-bg-light-blue">
-                        <div class="nhsuk-card__content">
-                            <a v-on:click=checkUserCertificateAvailability(@resourceItem.Id) href="@($"{Context.Request.Scheme}://{Context.Request.Host}/resource/html/{resourceItem.Id}/index.html")"
-                               onclick="@($"window.open(this.href, 'scormDebugWindow', 'status=no,location=no,toolbar=no,menubar=no,dependent=no,width={resourceItem.HtmlDetails.PopupWidth},height={resourceItem.HtmlDetails.PopupHeight}'); return false;")">
-                                <button class="nhsuk-button">
-                                    Launch HTML resource
-                                </button>
-                            </a>
-                            <p>This resource will launch in a new window</p>
-                        </div>
-                    </div>
-                }
-
-
+               
                 @if (canShowMoreDetails && resourceItem.ResourceTypeEnum == ResourceTypeEnum.Video || resourceItem.ResourceTypeEnum == ResourceTypeEnum.Audio || resourceItem.ResourceTypeEnum == ResourceTypeEnum.Scorm ||
                resourceItem.ResourceTypeEnum == ResourceTypeEnum.Case || resourceItem.ResourceTypeEnum == ResourceTypeEnum.Assessment)
                 {

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         
 										--(