Merge pull request #4209 from crazyserver/MOBILE-4616

MOBILE-4616 scorm: Update sco status icons to match LMS

Author: albertgasset

src/addons/mod/scorm/components/index/addon-mod-scorm-index.html

@@ -140,7 +140,7 @@ <h3 class="item-heading">{{'core.grades.grades' | translate}}</h3>
                         <p>{{ currentOrganization.title }}</p>
                         <div *ngFor="let sco of toc" class="core-padding-{{sco.level}} addon-mod_scorm-type-{{sco.scormtype}}">
                             <p *ngIf="sco.isvisible">
-                                <ion-icon *ngIf="sco.icon" [name]="sco.icon.icon" [attr.aria-label]="sco.icon.description" slot="start" />
+                                <ion-icon *ngIf="sco.icon" [name]="sco.icon.icon" [attr.aria-label]="sco.icon.description" />
                                 <button class="as-link" *ngIf="sco.prereq && sco.launch" (click)="open($event, false, sco.id)">
                                     <core-format-text [text]="sco.title" contextLevel="module" [contextInstanceId]="module.id"
                                         [courseId]="courseId" />

src/addons/mod/scorm/components/index/index.scss

@@ -5,15 +5,7 @@
         font-size: var(--text-size);
     }
 
-    .addon-mod_scorm-toc {
-        // Hide all non sco icons using css to maintain padding.
-        ion-icon {
-            opacity: 0;
-            @include margin(5px, 8px, null, null);
-        }
-
-        .addon-mod_scorm-type-sco ion-icon {
-            opacity: 1
-        }
+    .addon-mod_scorm-toc ion-icon {
+        @include margin(4px, 8px, null, null);
     }
 }

src/addons/mod/scorm/components/toc/toc.scss

@@ -0,0 +1,5 @@
+@use "theme/globals" as *;
+
+.addon-mod_scorm-toc ion-icon {
+    @include margin(4px, 8px, null, null);
+}

src/addons/mod/scorm/components/toc/toc.ts

@@ -25,6 +25,7 @@ import { CoreSharedModule } from '@/core/shared.module';
 @Component({
     selector: 'addon-mod-scorm-toc',
     templateUrl: 'toc.html',
+    styleUrl: 'toc.scss',
     standalone: true,
     imports: [
         CoreSharedModule,

src/addons/mod/scorm/services/scorm.ts

@@ -63,20 +63,14 @@ const STATUSES = {
     'n': 'notattempted',
 };
 const STATUS_TO_ICON = {
-    assetc: 'far-file-zipper',
-    asset: 'far-file-zipper',
+    asset: '', // Empty to show an space.
     browsed: 'fas-book',
-    completed: 'far-square-check',
+    completed: 'fas-check',
     failed: 'fas-xmark',
-    incomplete: 'far-pen-to-square',
-    minus: 'fas-minus',
+    incomplete: 'fas-pen-to-square',
     notattempted: 'far-square',
-    passed: 'fas-check',
-    plus: 'fas-plus',
-    popdown: 'far-rectangle-xmark',
-    popup: 'fas-window-restore',
+    passed: 'fas-check-double',
     suspend: 'fas-pause',
-    wait: 'far-clock',
 };
 
 /**
@@ -1022,7 +1016,7 @@ export class AddonModScormProvider {
 
         if (sco.isvisible) {
             if (VALID_STATUSES.indexOf(status) >= 0) {
-                if (sco.scormtype == 'sco') {
+                if (sco.scormtype === 'sco') {
                     imageName = status;
                     descName = status;
                 } else {
@@ -1042,7 +1036,7 @@ export class AddonModScormProvider {
             } else {
                 incomplete = true;
 
-                if (sco.scormtype == 'sco') {
+                if (sco.scormtype === 'sco') {
                     // Status empty or not valid, use 'notattempted'.
                     imageName = 'notattempted';
                 } else {

src/core/features/reportbuilder/services/handlers/reportbuilder.ts

@@ -17,6 +17,7 @@ import {
     CoreUserProfileHandlerType,
     CoreUserProfileHandler,
     CoreUserProfileHandlerData,
+    CoreUserDelegateContext,
 } from '@features/user/services/user-delegate';
 import { CoreNavigator } from '@services/navigator';
 import { makeSingleton } from '@singletons';
@@ -42,6 +43,18 @@ export class CoreReportBuilderHandlerService implements CoreUserProfileHandler {
         return await CoreReportBuilder.isEnabled();
     }
 
+    /**
+     * @inheritdoc
+     */
+    async isEnabledForContext(context: CoreUserDelegateContext): Promise<boolean> {
+        // Custom reports only available in user menu.
+        if (context !== CoreUserDelegateContext.USER_MENU) {
+            return false;
+        }
+
+        return this.isEnabled();
+    }
+
     /**
      * @inheritdoc
      */

src/core/tests/behat/snapshots/it-navigates-properly-in-pages-with-a-split-view-component-navigate-in-grades-tab-on-tablet_15.png

@@ -180,6 +180,8 @@ core-split-view.menu-and-content {
 [aria-current="page"],
 .item.item-current {
     @include safe-area-border-start(var(--selected-item-border-width), solid,  var(--selected-item-color));
+    --padding-start: calc(16px - var(--selected-item-border-width));
+
     > * {
         --ion-safe-area-left: 0px;
     }
@@ -278,7 +280,7 @@ mark, .matchtext {
 // Different levels of padding.
 @for $i from 0 through 15 {
     .core-padding-#{$i} {
-        @include padding(null, null, null, 15px * $i + 16px);
+        @include padding(null, null, null, 16px * $i);
     }
 }