Merge pull request #2157 from TechnologyEnhancedLearning/Develop/Fixes/TD-2369_Remove_from_course_for_completed_one_returns_410_error

TD-2369 Fixed 410 error on Remove from course for completed one and changed button text in Remove from activity page

Author: rshrirohit

DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/DelegateProgressControllerTests.cs

@@ -354,31 +354,6 @@ public void Removal_confirmation_page_displays_for_valid_delegate_and_course()
             result.Should().BeViewResult();
         }
 
-        [Test]
-        public void Removal_confirmation_page_returns_not_found_result_for_delegate_with_no_active_progress()
-        {
-            // Given
-            var delegateCourseInfo = new DelegateCourseInfo();
-            var delegateCourseDetails = new DetailedCourseProgress(
-                new Progress(),
-                new List<DetailedSectionProgress>(),
-                delegateCourseInfo
-            );
-            A.CallTo(() => progressService.GetDetailedCourseProgress(ProgressId))
-                .Returns(delegateCourseDetails);
-            A.CallTo(() => courseService.DelegateHasCurrentProgress(ProgressId))
-                .Returns(false);
-
-            // When
-            var result = delegateProgressController.ConfirmRemoveFromCourse(
-                ProgressId,
-                DelegateAccessRoute.ViewDelegate
-            );
-
-            // Then
-            result.Should().BeStatusCodeResult().WithStatusCode(410);
-        }
-
         [Test]
         public void Delegate_removal_for_delegate_with_no_active_progress_returns_not_found_result()
         {

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/DelegateProgressController.cs

@@ -265,7 +265,7 @@ public IActionResult ConfirmRemoveFromCourse(
         )
         {
             var progress = progressService.GetDetailedCourseProgress(progressId);
-            if (!courseService.DelegateHasCurrentProgress(progressId) || progress == null)
+            if (progress == null)
             {
                 return StatusCode((int)HttpStatusCode.Gone);
             }

DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/DelegateProgress/ConfirmRemoveFromCourse.cshtml

@@ -48,7 +48,7 @@
                                 label="I am sure that I wish to remove the progress record for this learner on this activity."
                                 hint-text="This action will remove the activity from the delegate’s Learning Portal Activities list and archive their progress." />
 
-      <button class="nhsuk-button delete-button" role="button" type="submit">Remove enrolment</button>
+      <button class="nhsuk-button delete-button" role="button" type="submit">Remove from activity</button>
     </form>
     @if (Model.AccessedVia.Equals(DelegateAccessRoute.CourseDelegates))
     {