Merge pull request #4698 from crazyserver/MOBILE-4987

MOBILE-4987 completion: Show completion teachers manual rules in details

Author: dpalou

src/addons/mod/page/tests/behat/page_activity_completion.feature

@@ -74,8 +74,10 @@ Feature: View activity completion information in the Page resource
       | intro      | A lesson learned in life |
       | completion | 1                        |
     When I entered the course "Course 1" as "teacher1" in the app
+    And I press "Completion" within "Music history" "ion-card" in the app
     Then I should find "Mark as done" in the app
-    When I press "Music history" in the app
+    When I close the popup in the app
+    And I press "Music history" in the app
     Then the header should be "Music history" in the app
     And I should find "Mark as done" in the app
     But I should not be able to press "Mark as done" in the app
@@ -110,6 +112,7 @@ Feature: View activity completion information in the Page resource
       | completion | 1                        |
     When I entered the course "Course 2" as "teacher1" in the app
     Then I should not find "Mark as done" in the app
+    Then I should not find "Completion" in the app
     When I press "Music history" in the app
     Then the header should be "Music history" in the app
     And I should find "Mark as done" in the app

src/core/features/course/components/module-completion-details/module-completion-details.html

@@ -1,4 +1,4 @@
-@if (completionDetails.length > 0) {
+@if (completionDetails.length > 0 || (isManual && !isTrackedUser)) {
     <!-- Completion criterias. -->
     <div class="ion-padding">
         <!-- Dialog header. -->

src/core/features/course/components/module-completion/core-course-module-completion.html

@@ -41,19 +41,20 @@
                 </ion-button>
             }
         }
+    <!-- Show a generic completion menu button for non-tracked users when either
+        the activity uses automatic completion or the user is currently viewing
+        the activity in the course context. -->
+    } @else if (completion.isautomatic || inCourse) {
+        <ion-button fill="outline" class="chip ion-text-nowrap" (click)="completionClicked($event)">
+            {{ 'core.course.completionmenuitem' | translate }}
+            <div class="select-icon" role="presentation" aria-hidden="true">
+                <div class="select-icon-inner"></div>
+            </div>
+        </ion-button>
     } @else {
-        @if (completion.isautomatic) {
-            <ion-button fill="outline" class="chip ion-text-nowrap" (click)="completionClicked($event)">
-                {{ 'core.course.completionmenuitem' | translate }}
-                <div class="select-icon" role="presentation" aria-hidden="true">
-                    <div class="select-icon-inner"></div>
-                </div>
-            </ion-button>
-        } @else {
-            <ion-button fill="outline" [ariaLabel]="accessibleDescription" disabled
-                class="completioninfo completion_incomplete chip ion-text-nowrap">
-                {{ 'core.course.completion_manual:markdone' | translate }}
-            </ion-button>
-        }
+        <ion-button fill="outline" [ariaLabel]="accessibleDescription" disabled
+            class="completioninfo completion_incomplete chip ion-text-nowrap">
+            {{ 'core.course.completion_manual:markdone' | translate }}
+        </ion-button>
     }
 }

src/core/features/course/components/module-completion/module-completion.ts

@@ -47,6 +47,7 @@ export class CoreCourseModuleCompletionComponent
 
     @Input({ transform: toBoolean }) showCompletionConditions = false; // Whether to show activity completion conditions.
     @Input({ transform: toBoolean }) showManualCompletion = false; // Whether to show manual completion.
+    @Input({ transform: toBoolean }) inCourse = false; // Whether the component is displayed in a course.
 
     completed = false;
     accessibleDescription: string | null = null;

src/core/features/course/components/module/core-course-module.html

@@ -65,7 +65,7 @@
                                 @if (hasCompletion && !showLegacyCompletion) {
                                     <core-course-module-completion [completion]="module.completiondata" [moduleName]="module.name"
                                         [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions"
-                                        [showManualCompletion]="showManualCompletion"
+                                        [showManualCompletion]="showManualCompletion" [inCourse]="true"
                                         (completionChanged)="completionChanged.emit($event)" />
                                 }
 
@@ -92,7 +92,7 @@
 
                     <!-- Activity completion. -->
                     @if (hasCompletion && !showLegacyCompletion) {
-                        <core-course-module-completion class="activity-extra" [completion]="module.completiondata"
+                        <core-course-module-completion class="activity-extra" [completion]="module.completiondata" [inCourse]="true"
                             [moduleName]="module.name" [moduleId]="module.id" [showCompletionConditions]="showCompletionConditions"
                             [showManualCompletion]="showManualCompletion" (completionChanged)="completionChanged.emit($event)" />
                     }