From 57ba1f93635fa03cbccd802044132d59b7200b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Wed, 23 Feb 2022 14:24:24 +0100 Subject: [PATCH] MOBILE-3833 module: Only show uncompleted completion conditions --- .../core-course-module-completion.html | 11 +++++++---- .../module-completion/module-completion.scss | 12 ------------ .../module-completion/module-completion.ts | 1 - .../components/module/core-course-module.html | 2 +- .../features/course/components/module/module.scss | 7 +++++++ .../features/course/components/module/module.ts | 14 ++++++++++++-- 6 files changed, 27 insertions(+), 20 deletions(-) delete mode 100644 src/core/features/course/components/module-completion/module-completion.scss diff --git a/src/core/features/course/components/module-completion/core-course-module-completion.html b/src/core/features/course/components/module-completion/core-course-module-completion.html index d449ff532..969b358d7 100644 --- a/src/core/features/course/components/module-completion/core-course-module-completion.html +++ b/src/core/features/course/components/module-completion/core-course-module-completion.html @@ -5,21 +5,24 @@ - + {{ rule.rulevalue.description }} - + {{ rule.rulevalue.description }} - + {{ rule.rulevalue.description }} @@ -29,7 +32,7 @@ - + {{ rule.rulevalue.description }} diff --git a/src/core/features/course/components/module-completion/module-completion.scss b/src/core/features/course/components/module-completion/module-completion.scss deleted file mode 100644 index 946eac3bd..000000000 --- a/src/core/features/course/components/module-completion/module-completion.scss +++ /dev/null @@ -1,12 +0,0 @@ -:host { - .core-module-automatic-completion-conditions { - ion-badge { - font-weight: normal; - margin-right: 5px; - - &[color="medium"] { - color: black; - } - } - } -} diff --git a/src/core/features/course/components/module-completion/module-completion.ts b/src/core/features/course/components/module-completion/module-completion.ts index 060cdd7dd..5a6d5b986 100644 --- a/src/core/features/course/components/module-completion/module-completion.ts +++ b/src/core/features/course/components/module-completion/module-completion.ts @@ -36,7 +36,6 @@ import { Translate } from '@singletons'; @Component({ selector: 'core-course-module-completion', templateUrl: 'core-course-module-completion.html', - styleUrls: ['module-completion.scss'], }) export class CoreCourseModuleCompletionComponent extends CoreCourseModuleCompletionBaseComponent { diff --git a/src/core/features/course/components/module/core-course-module.html b/src/core/features/course/components/module/core-course-module.html index 579f101e5..86afecafe 100644 --- a/src/core/features/course/components/module/core-course-module.html +++ b/src/core/features/course/components/module/core-course-module.html @@ -71,7 +71,7 @@ - diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss index c4fd942bd..614464d9e 100644 --- a/src/core/features/course/components/module/module.scss +++ b/src/core/features/course/components/module/module.scss @@ -8,6 +8,10 @@ margin-right: var(--horizontal-margin); } + ion-item { + --padding-start: 12px; + } + ion-item.core-module-main-item { --min-height: 52px; @@ -84,4 +88,7 @@ @include margin-horizontal(null, 8px); } + .core-course-module-info ::ng-deep core-course-module-completion .core-module-automatic-completion-conditions .completioninfo.completion_complete { + display: none; + } } diff --git a/src/core/features/course/components/module/module.ts b/src/core/features/course/components/module/module.ts index 478dc0b62..2ea4748e8 100644 --- a/src/core/features/course/components/module/module.ts +++ b/src/core/features/course/components/module/module.ts @@ -20,7 +20,7 @@ import { CoreCourseModuleCompletionData, CoreCourseSection, } from '@features/course/services/course-helper'; -import { CoreCourse } from '@features/course/services/course'; +import { CoreCourse, CoreCourseModuleCompletionStatus, CoreCourseModuleCompletionTracking } from '@features/course/services/course'; import { CoreCourseModuleDelegate, CoreCourseModuleHandlerButton } from '@features/course/services/module-delegate'; import { CoreCourseModulePrefetchDelegate, @@ -55,6 +55,8 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy { showManualCompletion = false; // Whether to show manual completion when completion conditions are disabled. prefetchStatusIcon = ''; // Module prefetch status icon. prefetchStatusText = ''; // Module prefetch status text. + autoCompletionTodo = false; + protected prefetchHandler?: CoreCourseModulePrefetchHandler; protected moduleStatusObserver?: CoreEventObserver; @@ -73,10 +75,18 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy { this.module.handlerData.a11yTitle = this.module.handlerData.a11yTitle ?? this.module.handlerData.title; + const completionStatus = this.showCompletionConditions && this.module.completiondata?.isautomatic && + this.module.completiondata.tracking == CoreCourseModuleCompletionTracking.COMPLETION_TRACKING_AUTOMATIC + ? this.module.completiondata.state + : undefined; + + this.autoCompletionTodo = completionStatus == CoreCourseModuleCompletionStatus.COMPLETION_INCOMPLETE || + completionStatus == CoreCourseModuleCompletionStatus.COMPLETION_COMPLETE_FAIL; + this.hasInfo = !!( this.module.description || (this.showActivityDates && this.module.dates && this.module.dates.length) || - (this.module.completiondata && this.showCompletionConditions && this.module.completiondata.isautomatic) || + (this.autoCompletionTodo) || (this.module.visible === 0 && (!this.section || this.section.visible)) || (this.module.visible !== 0 && this.module.isStealth) || (this.module.availabilityinfo)