From 02376ff881c5448ca8d6c81a1f1c88df9e78231e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Wed, 12 May 2021 16:00:59 +0200 Subject: [PATCH 1/6] MOBILE-3752 quiz: Implement aria table role on attempts table --- .../index/addon-mod-quiz-index.html | 81 +++++++++++-------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html index 9bd1a4621..bc3acebcf 100644 --- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html +++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html @@ -61,51 +61,62 @@ - - {{ 'addon.mod_quiz.summaryofattempts' | translate }} - + {{ 'addon.mod_quiz.summaryofattempts' | translate }} - + - - - - - {{ 'addon.mod_quiz.attemptnumber' | translate }} + + + + + + {{ 'addon.mod_quiz.attemptnumber' | translate }} + {{ 'addon.mod_quiz.attemptnumber' | translate }} - # - {{ 'addon.mod_quiz.attemptstate' | translate }} - + + {{ 'addon.mod_quiz.attemptstate' | translate }} + + {{ 'addon.mod_quiz.marks' | translate }} / {{ quiz.sumGradesFormatted }} - + {{ 'addon.mod_quiz.grade' | translate }} / {{ quiz.gradeFormatted }} - - - - - - {{ 'addon.mod_quiz.preview' | translate }} - - - {{ attempt.attempt }} - - -

{{ sentence }}

- - -

{{ attempt.readableMark }}

- -

{{ attempt.readableGrade }}

 - - - +
+ + + + + + {{ 'addon.mod_quiz.preview' | translate }} + + + {{ attempt.attempt }} + + +

{{ sentence }}

+ + +

{{ attempt.readableMark }}

+ + +

{{ attempt.readableGrade }}

+ + + + +
From 8542e3c279f875da07ae97f45f93180329960e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 13 May 2021 11:48:31 +0200 Subject: [PATCH 2/6] MOBILE-3752 a11y: Add min size to fab buttons. --- src/theme/theme.base.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss index d10a8615f..3f2725a31 100644 --- a/src/theme/theme.base.scss +++ b/src/theme/theme.base.scss @@ -131,7 +131,10 @@ ion-button.button-small ion-icon.faicon[slot] { } // Buttons. -ion-button, button, [role="button"] { +ion-button, +ion-fab-button, +button, +[role="button"] { min-height: var(--a11y-min-target-size); min-width: var(--a11y-min-target-size); } From 9c2a235745c413c06d7b1e8eb901e83a3cd942ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 13 May 2021 11:48:54 +0200 Subject: [PATCH 3/6] MOBILE-3752 a11y: Fix darkmode on some screens --- .../learningplans/services/block-handler.ts | 2 - src/addons/competency/pages/plan/plan.html | 2 +- src/addons/mod/forum/services/forum.ts | 2 - src/addons/mod/quiz/pages/review/review.html | 4 +- .../mod/workshop/workshop-lazy.module.ts | 2 +- .../features/grades/pages/course/course.scss | 54 ++++++++----------- 6 files changed, 27 insertions(+), 39 deletions(-) diff --git a/src/addons/block/learningplans/services/block-handler.ts b/src/addons/block/learningplans/services/block-handler.ts index 774ddad1c..38afe6a04 100644 --- a/src/addons/block/learningplans/services/block-handler.ts +++ b/src/addons/block/learningplans/services/block-handler.ts @@ -34,8 +34,6 @@ export class AddonBlockLearningPlansHandlerService extends CoreBlockBaseHandler * @return Data or promise resolved with the data. */ getDisplayData(): CoreBlockHandlerData { - // @todo - return { title: 'addon.block_learningplans.pluginname', class: 'addon-block-learning-plans', diff --git a/src/addons/competency/pages/plan/plan.html b/src/addons/competency/pages/plan/plan.html index 19e76d108..d95cd3f41 100644 --- a/src/addons/competency/pages/plan/plan.html +++ b/src/addons/competency/pages/plan/plan.html @@ -65,7 +65,7 @@ -

{{ 'addon.competency.learningplancompetencies' | translate }}

+ {{ 'addon.competency.learningplancompetencies' | translate }} diff --git a/src/addons/mod/forum/services/forum.ts b/src/addons/mod/forum/services/forum.ts index c9ee8c548..901f138ba 100644 --- a/src/addons/mod/forum/services/forum.ts +++ b/src/addons/mod/forum/services/forum.ts @@ -49,8 +49,6 @@ declare module '@singletons/events' { /** * Service that provides some features for forums. - * - * @todo Add all content. */ @Injectable({ providedIn: 'root' }) export class AddonModForumProvider { diff --git a/src/addons/mod/quiz/pages/review/review.html b/src/addons/mod/quiz/pages/review/review.html index 6ed4b8fe7..5b602f6fe 100644 --- a/src/addons/mod/quiz/pages/review/review.html +++ b/src/addons/mod/quiz/pages/review/review.html @@ -23,8 +23,8 @@ - {{ 'addon.mod_quiz.reviewofpreview' | translate }} - {{ 'addon.mod_quiz.reviewofattempt' | translate:{$a: attempt.attempt} }} + {{ 'addon.mod_quiz.reviewofpreview' | translate }} + {{ 'addon.mod_quiz.reviewofattempt' | translate:{$a: attempt.attempt} }} diff --git a/src/addons/mod/workshop/workshop-lazy.module.ts b/src/addons/mod/workshop/workshop-lazy.module.ts index 14fec0473..7199432d5 100644 --- a/src/addons/mod/workshop/workshop-lazy.module.ts +++ b/src/addons/mod/workshop/workshop-lazy.module.ts @@ -35,7 +35,7 @@ const routes: Routes = [ canDeactivate: [CanLeaveGuard], }, { - path: ':courseId/:cmId/:submissionId/edit', // @todo + path: ':courseId/:cmId/:submissionId/edit', component: AddonModWorkshopEditSubmissionPage, canDeactivate: [CanLeaveGuard], }, diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss index 308fbe906..601e79771 100644 --- a/src/core/features/grades/pages/course/course.scss +++ b/src/core/features/grades/pages/course/course.scss @@ -1,7 +1,18 @@ @import "~theme/globals"; -// @todo darkmode -// @todo RTL layout +:host { + --header-background: var(--white); + --odd-cell-background: var(--gray-lighter); + --even-cell-background: var(--white); + --icon-color: #999999; +} + +:host-context(body.dark) { + --header-background: var(--black); + --odd-cell-background: var(--gray-darker); + --even-cell-background: var(--black); + --icon-color: #eeeeee; +} :host-context(ion-app.md) { --border-color: var(--ion-item-border-color, var(--ion-border-color, var(--ion-color-step-150, rgba(0, 0, 0, .13)))); @@ -18,16 +29,12 @@ font-size: 16px; color: var(--ion-text-color); - // @include darkmode() { - // color: $core-dark-text-color; - // } - tr { border-bottom: 1px solid var(--border-color); } th, td { - padding: 10px 0 10px 10px; + @include padding(10px, 10px, 10px, null); vertical-align: top; white-space: normal; text-align: start; @@ -36,11 +43,7 @@ thead th { vertical-align: bottom; font-weight: bold; - background-color: var(--white); - - // @include darkmode() { - // background-color: $black; - // } + background-color: var(--header-background); } tbody th { @@ -48,15 +51,15 @@ } #gradeitem { - padding-left: 5px; + @include padding(null, null, null, 5px); } .core-grades-table-gradeitem { - padding-left: 5px; + @include padding(null, null, null, 5px); font-weight: bold; &.column-itemname { - padding-left: 0; + @include padding(null, null, null, 0); } img { @@ -65,17 +68,17 @@ } ion-icon { - color: #999999; + color: var(--icon-color); } span { - margin-left: 5px; + @include margin(null, null, null, 5px); } } .core-grades-table-feedback { - padding-left: 5px; + @include padding(null, null, null, 5px); .no-overflow { overflow: auto; @@ -89,27 +92,16 @@ } .odd { - td, th, th[aria-current="page"] { - background-color: var(--gray-lighter); - - // @include darkmode() { - // background-color: $gray-darker; - // } + background-color: var(--odd-cell-background); } } .even { - td, th, th[aria-current="page"] { - background-color: var(--white); - - // @include darkmode() { - // background-color: $black; - // } + background-color: var(--even-cell-background); } - } .core-grades-grade-clickable { From 79d3c081ff90288cbd7f21cb8ff4d50064d57c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 13 May 2021 12:55:30 +0200 Subject: [PATCH 4/6] MOBILE-3752 lang: Minor fixes on langindex --- scripts/create_langindex.sh | 2 +- scripts/lang_functions.sh | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/scripts/create_langindex.sh b/scripts/create_langindex.sh index c17d77c20..0135089ff 100755 --- a/scripts/create_langindex.sh +++ b/scripts/create_langindex.sh @@ -310,7 +310,7 @@ function array_contains { print_title 'Generating language from code...' -gulp lang +npx gulp lang print_title 'Getting languages' diff --git a/scripts/lang_functions.sh b/scripts/lang_functions.sh index d8bcf38ae..cf6e2368a 100755 --- a/scripts/lang_functions.sh +++ b/scripts/lang_functions.sh @@ -10,8 +10,9 @@ DEFAULT_LASTVERSION='4.0' # Checks if AWS is available and configured. function check_aws { - aws --version &> /dev/null AWS_SERVICE=1 + + aws --version &> /dev/null if [ $? -ne 0 ]; then AWS_SERVICE=0 echo 'AWS not installed. Check https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html for more info.' @@ -19,7 +20,7 @@ function check_aws { fi # In order to login to AWS, use credentials file or AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY vars. - if [ ! -f ~/.aws/credentials ] && [ [ -z $AWS_ACCESS_KEY_ID ] || [ -z $AWS_SECRET_ACCESS_KEY ] ]; then + if [ ! -f ~/.aws/credentials ] && ([ -z "$AWS_ACCESS_KEY_ID" ] || [ -z "$AWS_SECRET_ACCESS_KEY" ]); then AWS_SERVICE=0 lastversion=$DEFAULT_LASTVERSION echo 'AWS Cannot authenticate. Use aws configure or set the proper env vars.' @@ -63,6 +64,13 @@ function get_last_version { lastversion=$DEFAULT_LASTVERSION } +# Create langfolder +function create_langfolder { + if [ ! -d $LANGPACKSFOLDER ]; then + mkdir $LANGPACKSFOLDER + fi +} + # Get all language list from AWS. function get_all_languages_aws { langsfiles=`aws s3 ls s3://$BUCKET/$lastversion/` @@ -87,6 +95,8 @@ function get_language { get_last_version + create_langfolder + echo "Getting $lang language" pushd $LANGPACKSFOLDER > /dev/null @@ -115,7 +125,7 @@ function get_languages { return fi else - mkdir $LANGPACKSFOLDER + create_langfolder fi From 5d20d4faa7ebf36737f656235195c0cf1d172005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 13 May 2021 12:05:43 +0200 Subject: [PATCH 5/6] MOBILE-3752 a11y: Minor accessibility improvements --- src/addons/mod/data/data-forms.scss | 2 -- src/addons/mod/data/data.scss | 2 -- src/core/components/file/file.scss | 31 ------------------- src/core/components/file/file.ts | 1 - .../components/user-avatar/user-avatar.scss | 2 ++ .../block/components/block/block.scss | 5 +-- .../course-blocks/course-blocks.scss | 2 -- .../course/components/format/format.scss | 27 ---------------- .../course-module-description.scss | 17 ---------- .../core-courses-course-list-item.html | 7 +++-- src/core/features/login/pages/site/site.html | 2 +- src/core/features/login/pages/site/site.scss | 8 ----- .../features/mainmenu/pages/home/home.scss | 7 ----- .../search-box/core-search-box.html | 4 +-- src/theme/globals.variables.scss | 4 +-- src/theme/theme.base.scss | 21 ++++++++++--- 16 files changed, 29 insertions(+), 113 deletions(-) delete mode 100644 src/core/components/file/file.scss delete mode 100644 src/core/features/course/components/module-description/course-module-description.scss diff --git a/src/addons/mod/data/data-forms.scss b/src/addons/mod/data/data-forms.scss index 02b7e4ec3..2834bfc25 100644 --- a/src/addons/mod/data/data-forms.scss +++ b/src/addons/mod/data/data-forms.scss @@ -22,8 +22,6 @@ .addon-data-advanced-search { padding: 16px; width: 100%; - // @todo check if needed - // @include safe-area-padding-horizontal(16px !important, 16px !important); } .addon-data-contents form, diff --git a/src/addons/mod/data/data.scss b/src/addons/mod/data/data.scss index 62141a4e3..59fe03bd5 100644 --- a/src/addons/mod/data/data.scss +++ b/src/addons/mod/data/data.scss @@ -17,8 +17,6 @@ $grid-column-paddings: ( white-space: normal; word-break: break-word; padding: 16px; - // @todo check if needed - // @include safe-area-padding-horizontal(16px !important, 16px !important); background-color: var(--ion-item-background); border-width: 1px 0; diff --git a/src/core/components/file/file.scss b/src/core/components/file/file.scss deleted file mode 100644 index 98ce8714a..000000000 --- a/src/core/components/file/file.scss +++ /dev/null @@ -1,31 +0,0 @@ -:host { - // @todo - // .card-md core-file + core-file > .item-md.item-block > .item-inner, - // core-file + core-file > .item-md.item-block > .item-inner { - // border-top: 1px solid $list-md-border-color; - // } - - // .card-ios core-file + core-file > .item-ios.item-block > .item-inner, - // core-file + core-file > .item-ios.item-block > .item-inner { - // border-top: $hairlines-width solid $list-ios-border-color; - // .buttons { - // min-height: 53px; - // min-width: 58px; - // } - // } - - // core-file > .item.item-block > .item-inner { - // border-bottom: 0; - // @include safe-area-padding(null, 0px, null, null); - // .buttons { - // display: flex; - // flex-flow: row; - // align-items: center; - // z-index: 1; - // justify-content: space-around; - // align-content: center; - // min-height: 52px; - // min-width: 53px; - // } - // } -} \ No newline at end of file diff --git a/src/core/components/file/file.ts b/src/core/components/file/file.ts index f595bf994..85874ef89 100644 --- a/src/core/components/file/file.ts +++ b/src/core/components/file/file.ts @@ -34,7 +34,6 @@ import { CoreWSFile } from '@services/ws'; @Component({ selector: 'core-file', templateUrl: 'core-file.html', - styleUrls: ['file.scss'], }) export class CoreFileComponent implements OnInit, OnDestroy { diff --git a/src/core/components/user-avatar/user-avatar.scss b/src/core/components/user-avatar/user-avatar.scss index 0e5964432..e9f3b02df 100644 --- a/src/core/components/user-avatar/user-avatar.scss +++ b/src/core/components/user-avatar/user-avatar.scss @@ -1,5 +1,7 @@ :host { position: relative; + width: var(--core-avatar-size); + height: var(--core-avatar-size); .clickable { cursor: pointer; diff --git a/src/core/features/block/components/block/block.scss b/src/core/features/block/components/block/block.scss index 2d22d09be..6fdef379d 100644 --- a/src/core/features/block/components/block/block.scss +++ b/src/core/features/block/components/block/block.scss @@ -4,9 +4,6 @@ background: var(--background); ion-item-divider { - min-height: 60px; - .core-button-spinner { - margin: 0; - } + min-height: var(--item-divider-min-height); } } diff --git a/src/core/features/block/components/course-blocks/course-blocks.scss b/src/core/features/block/components/course-blocks/course-blocks.scss index 314fa25ff..cba246bb4 100644 --- a/src/core/features/block/components/course-blocks/course-blocks.scss +++ b/src/core/features/block/components/course-blocks/course-blocks.scss @@ -16,7 +16,6 @@ box-shadow: none !important; flex-grow: 1; max-width: 100%; - // @todo @include core-split-area-start(); } div.core-course-blocks-side { @@ -24,7 +23,6 @@ min-width: var(--side-blocks-min-width); box-shadow: var(--side-blocks-box-shadow); z-index: 2; - // @todo @include core-split-area-end(); } .core-course-blocks-content, diff --git a/src/core/features/course/components/format/format.scss b/src/core/features/course/components/format/format.scss index 027504d87..b79f185c3 100644 --- a/src/core/features/course/components/format/format.scss +++ b/src/core/features/course/components/format/format.scss @@ -52,31 +52,4 @@ } } -// @todo -// .item-divider { -// .label { -// margin-top: 0; -// margin-bottom: 0; -// } - -// core-format-text { -// line-height: 44px; -// } - -// ion-badge core-format-text { -// line-height: normal; -// margin-bottom: 9px; -// } - -// &.core-section-download .label{ -// @include margin(null, 0, null, null); -// } -// } - -// div.core-section-download { -// @include padding(null, 0, null, null); -// } - -// - } diff --git a/src/core/features/course/components/module-description/course-module-description.scss b/src/core/features/course/components/module-description/course-module-description.scss deleted file mode 100644 index 7ba1e696e..000000000 --- a/src/core/features/course/components/module-description/course-module-description.scss +++ /dev/null @@ -1,17 +0,0 @@ -// @todo Review commented styles. -// ion-app.app-root { -// .safe-area-page, -// .safe-padding-horizontal { -// core-course-module-description { -// padding-left: 0 !important; -// padding-right: 0 !important; -// .item-ios.item-block { -// @include safe-area-padding-horizontal($item-ios-padding-end / 2, null); - -// .item-inner { -// @include safe-area-padding-horizontal(null, $item-ios-padding-end / 2); -// } -// } -// } -// } -// } diff --git a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html index 29b0c1e82..83aa9653e 100644 --- a/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html +++ b/src/core/features/courses/components/course-list-item/core-courses-course-list-item.html @@ -28,7 +28,10 @@

- + + diff --git a/src/core/features/login/pages/site/site.html b/src/core/features/login/pages/site/site.html index 58e5818a7..4556094d4 100644 --- a/src/core/features/login/pages/site/site.html +++ b/src/core/features/login/pages/site/site.html @@ -93,7 +93,7 @@ (ionCancel)="filterChanged()" [placeholder]="'core.login.findyoursite' | translate"> - + diff --git a/src/core/features/login/pages/site/site.scss b/src/core/features/login/pages/site/site.scss index bcc7e8f43..7d95f4de4 100644 --- a/src/core/features/login/pages/site/site.scss +++ b/src/core/features/login/pages/site/site.scss @@ -2,14 +2,6 @@ margin-bottom: 20px; } -.searchbar-ios { - background: transparent; - - .searchbar-input { - background-color: white; // @todo $searchbar-ios-toolbar-input-background; - } -} - .item { &.core-login-need-help { margin-top: 16px; diff --git a/src/core/features/mainmenu/pages/home/home.scss b/src/core/features/mainmenu/pages/home/home.scss index 4f17ae77c..dfede2f3b 100644 --- a/src/core/features/mainmenu/pages/home/home.scss +++ b/src/core/features/mainmenu/pages/home/home.scss @@ -17,10 +17,3 @@ $core-dashboard-logo: false !default; display: none; } } - -ion-badge.core-course-download-courses-progress { - display: block; - // @include float(start); - // @include margin(12px, 12px, null, 12px); -} - diff --git a/src/core/features/search/components/search-box/core-search-box.html b/src/core/features/search/components/search-box/core-search-box.html index 9d71300f2..eec04febf 100644 --- a/src/core/features/search/components/search-box/core-search-box.html +++ b/src/core/features/search/components/search-box/core-search-box.html @@ -6,11 +6,11 @@ [autocorrect]="autocorrect" [spellcheck]="spellcheck" [core-auto-focus]="autoFocus" [disabled]="disabled" role="searchbox" (ionFocus)="focus($event)"> - - diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss index 23e5aa06d..3e762425d 100644 --- a/src/theme/globals.variables.scss +++ b/src/theme/globals.variables.scss @@ -228,7 +228,7 @@ $core-login-text-color-dark: $white !default; $core-star-color: $brand-color !default; $core-large-avatar-size: 90px !default; -$core-avatar-size: 40px !default; +$core-avatar-size: 44px !default; $core-send-message-input-background: $gray !default; $core-send-message-input-color: $black !default; @@ -252,7 +252,7 @@ $addon-messages-avatar-size: 30px !default; $addon-messages-discussion-badge: $primary !default; $addon-messages-discussion-badge-text: $white !default; -$addon-forum-avatar-size: 28px !default; +$addon-forum-avatar-size: 44px !default; $addon-forum-border-color: $gray !default; $addon-forum-highlight-color: $gray-lighter !default; diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss index 3f2725a31..5381e35fb 100644 --- a/src/theme/theme.base.scss +++ b/src/theme/theme.base.scss @@ -1,4 +1,4 @@ -@import "./globals.mixins.ionic.scss"; +@import "./globals.scss"; // Common styles. .text-left { text-align: left; } @@ -126,7 +126,9 @@ ion-button.button-small ion-icon.faicon[slot] { font-size: 1.5em !important; } -[dir=rtl] ion-icon.icon-flip-rtl { +[dir=rtl] ion-icon.icon-flip-rtl, +[dir=rtl] ion-item::part(detail-icon), +[dir=rtl] ion-icon.item-detail-icon { transform: scaleX(-1); } @@ -206,7 +208,7 @@ ion-toolbar { // Modals. .core-modal-fullscreen .modal-wrapper { position: absolute; - // @todo @include position(0 !important, null, null, 0 !important); + @include position(0 !important, null, null, 0 !important); display: block; width: 100% !important; height: 100% !important; @@ -218,11 +220,10 @@ ion-toolbar { @media only screen and (min-height: 400px) and (min-width: 300px) { .core-modal-lateral { - // @todo @include core-split-area-end(); .modal-wrapper { position: absolute; - @include position(0 !important, 0 !important, 0 !important, auto); + @include position(0 !important, 0 !important, 0 !important, unset !important); display: block; height: 100% !important; width: auto; @@ -425,6 +426,16 @@ ion-select::part(text) { text-decoration: underline; } +core-block ion-item-divider .core-button-spinner { + display: flex; + align-items: center; + @include margin-horizontal(10px); + + ion-badge.core-course-download-courses-progress { + @include margin(null, 12px, null, null); + } +} + // Horizontal scrolling elements .core-horizontal-scroll { display: flex; From 2a1e8a44e80fe39662684a838a2eb17d0cdceb4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 13 May 2021 14:12:42 +0200 Subject: [PATCH 6/6] MOBILE-3752 lint: Remove duplicated spaces --- .../badges/pages/user-badges/user-badges.html | 4 ++-- .../components/myoverview/myoverview.ts | 6 ++--- .../myoverview/services/block-handler.ts | 2 +- .../components/calendar/calendar.scss | 4 ++-- .../addon-calendar-upcoming-events.html | 2 +- src/addons/calendar/pages/day/day.html | 4 ++-- .../pages/edit-event/edit-event.page.ts | 2 +- src/addons/calendar/pages/event/event.html | 2 +- src/addons/calendar/pages/event/event.page.ts | 4 ++-- src/addons/calendar/pages/index/index.html | 2 +- src/addons/calendar/pages/list/list.html | 4 ++-- .../calendar/services/calendar-helper.ts | 2 +- src/addons/calendar/services/calendar-sync.ts | 2 +- src/addons/calendar/services/calendar.ts | 8 +++---- .../pages/competency/competency.html | 8 +++---- .../coursecompetencies.html | 2 +- .../competency/pages/planlist/planlist.html | 2 +- src/addons/messages/messages-common.scss | 2 +- .../messages/pages/contacts-35/contacts.html | 4 ++-- .../messages/pages/contacts/contacts.html | 8 +++---- .../pages/discussion/discussion.page.ts | 2 +- .../pages/discussions-35/discussions.html | 4 ++-- .../pages/discussions-35/discussions.page.ts | 2 +- src/addons/messages/pages/search/search.html | 4 ++-- .../messages/pages/settings/settings.html | 2 +- .../messages/services/database/messages.ts | 2 +- src/addons/messages/services/messages.ts | 18 +++++++-------- .../index/addon-mod-assign-index.html | 2 +- .../components/submission/submission.ts | 4 ++-- .../submission-list/submission-list.html | 2 +- .../submission-list/submission-list.page.ts | 2 +- .../submission-review/submission-review.ts | 2 +- src/addons/mod/assign/services/assign-sync.ts | 2 +- src/addons/mod/assign/services/assign.ts | 4 ++-- .../assign/submission/file/component/file.ts | 2 +- src/addons/mod/book/components/toc/toc.html | 2 +- .../mod/book/services/handlers/index-link.ts | 4 ++-- .../index/addon-mod-chat-index.html | 2 +- src/addons/mod/chat/pages/chat/chat.ts | 2 +- .../session-messages/session-messages.ts | 2 +- src/addons/mod/chat/services/chat-helper.ts | 2 +- .../index/addon-mod-choice-index.html | 2 +- src/addons/mod/choice/services/choice.ts | 4 ++-- .../action/addon-mod-data-action.html | 6 ++--- .../index/addon-mod-data-index.html | 2 +- src/addons/mod/data/components/index/index.ts | 2 +- .../mod/data/components/search/search.html | 2 +- .../mod/data/components/search/search.ts | 2 +- .../mod/data/fields/date/services/handler.ts | 2 +- .../mod/data/fields/file/services/handler.ts | 4 ++-- .../data/fields/latlong/component/latlong.ts | 2 +- .../data/fields/picture/component/picture.ts | 2 +- .../data/fields/picture/services/handler.ts | 2 +- src/addons/mod/data/pages/edit/edit.ts | 2 +- src/addons/mod/data/pages/entry/entry.ts | 2 +- src/addons/mod/data/services/data-helper.ts | 4 ++-- src/addons/mod/data/services/data-sync.ts | 2 +- src/addons/mod/data/services/data.ts | 4 ++-- .../index/addon-mod-feedback-index.html | 2 +- .../mod/feedback/pages/attempt/attempt.html | 2 +- src/addons/mod/feedback/pages/form/form.html | 4 ++-- .../pages/respondents/respondents.html | 2 +- .../mod/feedback/services/feedback-helper.ts | 4 ++-- src/addons/mod/feedback/services/feedback.ts | 2 +- src/addons/mod/forum/components/post/post.ts | 2 +- .../sort-order-selector.html | 2 +- .../forum/pages/discussion/discussion.html | 2 +- .../forum/pages/discussion/discussion.page.ts | 6 ++--- .../new-discussion/new-discussion.page.ts | 2 +- .../mod/forum/services/handlers/module.ts | 2 +- src/addons/mod/imscp/components/toc/toc.html | 2 +- src/addons/mod/imscp/services/imscp.ts | 2 +- .../index/addon-mod-lesson-index.html | 2 +- .../mod/lesson/components/index/index.ts | 2 +- src/addons/mod/lesson/services/lesson.ts | 6 ++--- .../mod/lti/services/handlers/module.ts | 2 +- .../index/addon-mod-quiz-index.html | 2 +- src/addons/mod/quiz/services/quiz-helper.ts | 2 +- src/addons/mod/quiz/services/quiz.ts | 2 +- .../index/addon-mod-scorm-index.html | 2 +- src/addons/mod/scorm/components/toc/toc.html | 2 +- src/addons/mod/scorm/services/scorm.ts | 2 +- .../index/addon-mod-survey-index.html | 2 +- src/addons/mod/wiki/components/map/map.html | 2 +- .../addon-mod-wiki-subwiki-picker.html | 2 +- .../accumulative/services/handler.ts | 4 ++-- .../assessment/comments/services/handler.ts | 2 +- .../assessment/numerrors/services/handler.ts | 6 ++--- .../assessment/rubric/services/handler.ts | 2 +- .../index/addon-mod-workshop-index.html | 2 +- .../mod/workshop/components/phase/phase.html | 2 +- .../edit-submission/edit-submission.html | 2 +- .../pages/edit-submission/edit-submission.ts | 2 +- .../workshop/pages/submission/submission.ts | 2 +- .../mod/workshop/services/workshop-helper.ts | 4 ++-- src/addons/notes/pages/list/list.page.ts | 2 +- src/addons/qtype/ddmarker/classes/ddmarker.ts | 2 +- .../qtype/ddmarker/component/ddmarker.scss | 2 +- .../component/addon-qtype-multichoice.html | 2 +- .../pages/course-storage/course-storage.ts | 2 +- .../storagemanager/storagemanager.module.ts | 2 +- src/core/classes/base-sync.ts | 2 +- src/core/components/animations.ts | 8 +++---- .../infinite-loading/infinite-loading.ts | 2 +- src/core/directives/fab.ts | 4 ++-- src/core/directives/format-text.ts | 4 ++-- .../block/classes/base-block-component.ts | 2 +- .../pre-rendered-block/pre-rendered-block.ts | 2 +- .../comments/pages/viewer/viewer.page.ts | 2 +- .../features/comments/services/comments.ts | 2 +- .../classes/module-index-handler.ts | 6 ++--- .../course/classes/main-activity-component.ts | 2 +- .../course/classes/main-resource-component.ts | 2 +- .../course/components/module/module.scss | 2 +- .../section-selector/section-selector.html | 2 +- .../features/course/pages/index/index.page.ts | 2 +- .../features/course/services/course-helper.ts | 4 ++-- src/core/features/course/services/course.ts | 6 ++--- .../core-courses-course-progress.html | 2 +- src/core/features/courses/services/courses.ts | 8 +++---- .../courses/services/handlers/course-link.ts | 2 +- .../features/emulator/services/geolocation.ts | 2 +- .../grades/pages/courses/courses.page.ts | 2 +- .../features/grades/services/grades-helper.ts | 6 ++--- src/core/features/grades/services/grades.ts | 4 ++-- .../features/h5p/classes/content-validator.ts | 22 +++++++++---------- src/core/features/h5p/classes/core.ts | 2 +- .../site-onboarding/site-onboarding.html | 10 ++++----- src/core/features/login/login.scss | 4 ++-- .../pages/email-signup/email-signup.html | 2 +- src/core/features/login/pages/site/site.ts | 2 +- .../services/pushnotifications.ts | 2 +- .../features/question/services/question.ts | 2 +- .../components/search-box/search-box.ts | 2 +- .../search/services/search-history.service.ts | 16 +++++++------- .../settings/pages/deviceinfo/deviceinfo.ts | 2 +- .../pages/space-usage/space-usage.html | 2 +- .../settings/pages/space-usage/space-usage.ts | 2 +- .../synchronization/synchronization.html | 2 +- .../settings/services/settings-helper.ts | 2 +- .../only-title-block/only-title-block.ts | 2 +- src/core/features/tag/pages/index/index.html | 2 +- src/core/features/tag/tag.module.ts | 2 +- .../pages/participants/participants.page.ts | 2 +- src/core/features/xapi/services/offline.ts | 2 +- src/core/services/app.ts | 4 ++-- src/core/services/filepool.ts | 6 ++--- src/core/services/groups.ts | 2 +- src/core/services/sites.ts | 4 ++-- src/core/services/utils/url.ts | 2 +- src/core/services/ws.ts | 2 +- src/core/singletons/array.ts | 2 +- src/core/singletons/colors.ts | 6 ++--- src/theme/theme.base.scss | 2 +- 154 files changed, 244 insertions(+), 244 deletions(-) diff --git a/src/addons/badges/pages/user-badges/user-badges.html b/src/addons/badges/pages/user-badges/user-badges.html index 51364df1f..f2c91a9d6 100644 --- a/src/addons/badges/pages/user-badges/user-badges.html +++ b/src/addons/badges/pages/user-badges/user-badges.html @@ -12,11 +12,11 @@ - - + diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.ts b/src/addons/block/myoverview/components/myoverview/myoverview.ts index 182120e83..d6a41958a 100644 --- a/src/addons/block/myoverview/components/myoverview/myoverview.ts +++ b/src/addons/block/myoverview/components/myoverview/myoverview.ts @@ -327,8 +327,8 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem /** * Helper function to help with filter values. * - * @param showCondition If true, filter will be shown. - * @param disabledCondition If true, and showCondition is also met, it will be shown as disabled. + * @param showCondition If true, filter will be shown. + * @param disabledCondition If true, and showCondition is also met, it will be shown as disabled. * @return show / disabled / hidden value. */ protected getShowFilterValue(showCondition: boolean, disabledCondition: boolean): string { @@ -507,7 +507,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem courses.forEach((course) => { if (course.hidden) { this.courses.hidden.push(course); - } else { + } else { this.courses.all.push(course); if ((course.enddate && course.enddate < today) || course.completed) { diff --git a/src/addons/block/myoverview/services/block-handler.ts b/src/addons/block/myoverview/services/block-handler.ts index 9d076c38e..a54f4797a 100644 --- a/src/addons/block/myoverview/services/block-handler.ts +++ b/src/addons/block/myoverview/services/block-handler.ts @@ -21,7 +21,7 @@ import { CoreBlockBaseHandler } from '@features/block/classes/base-block-handler import { makeSingleton } from '@singletons'; /** - * Block handler. + * Block handler. */ @Injectable({ providedIn: 'root' }) export class AddonBlockMyOverviewHandlerService extends CoreBlockBaseHandler { diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss index 5e22f595f..0fd053dfa 100644 --- a/src/addons/calendar/components/calendar/calendar.scss +++ b/src/addons/calendar/components/calendar/calendar.scss @@ -3,8 +3,8 @@ .addon-calendar-navigation { padding-top: 5px; - padding-left: 10px; - padding-right: 10px; + padding-left: 10px; + padding-right: 10px; } .addon-calendar-months { diff --git a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html index 36dcccfd0..a4e1a3590 100644 --- a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html +++ b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html @@ -2,7 +2,7 @@ - + diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html index 25aabb33e..8e8c6f3a2 100644 --- a/src/addons/calendar/pages/day/day.html +++ b/src/addons/calendar/pages/day/day.html @@ -12,7 +12,7 @@ - @@ -57,7 +57,7 @@ [message]="'addon.calendar.noevents' | translate"> - + diff --git a/src/addons/calendar/pages/edit-event/edit-event.page.ts b/src/addons/calendar/pages/edit-event/edit-event.page.ts index c33b55f81..3b9fb9db5 100644 --- a/src/addons/calendar/pages/edit-event/edit-event.page.ts +++ b/src/addons/calendar/pages/edit-event/edit-event.page.ts @@ -531,7 +531,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave { try { await AddonCalendarHelper.refreshAfterChangeEvent(result.event, numberOfRepetitions); - } catch { + } catch { // Ignore errors. } } diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html index c4e94afc9..ff3795550 100644 --- a/src/addons/calendar/pages/event/event.html +++ b/src/addons/calendar/pages/event/event.html @@ -145,7 +145,7 @@ -

diff --git a/src/addons/calendar/pages/event/event.page.ts b/src/addons/calendar/pages/event/event.page.ts index 987a9b4b3..789668de7 100644 --- a/src/addons/calendar/pages/event/event.page.ts +++ b/src/addons/calendar/pages/event/event.page.ts @@ -343,8 +343,8 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy { const minute = Math.floor(currentTime / 60) * 60; // Check if the notification time is in the same minute as we are, so the notification is triggered. - if (notificationTime >= minute && notificationTime < minute + 60) { - notificationTime = currentTime + 1; + if (notificationTime >= minute && notificationTime < minute + 60) { + notificationTime = currentTime + 1; } await AddonCalendar.addEventReminder(this.event, notificationTime); diff --git a/src/addons/calendar/pages/index/index.html b/src/addons/calendar/pages/index/index.html index c5687230a..0b41603c6 100644 --- a/src/addons/calendar/pages/index/index.html +++ b/src/addons/calendar/pages/index/index.html @@ -18,7 +18,7 @@ - diff --git a/src/addons/calendar/pages/list/list.html b/src/addons/calendar/pages/list/list.html index fd84c4313..dcf423a82 100644 --- a/src/addons/calendar/pages/list/list.html +++ b/src/addons/calendar/pages/list/list.html @@ -12,7 +12,7 @@ - @@ -37,7 +37,7 @@ [message]="'addon.calendar.noevents' | translate"> - +

{{ event.timestart * 1000 | coreFormatDate: "strftimedayshort" }}

 diff --git a/src/addons/calendar/services/calendar-helper.ts b/src/addons/calendar/services/calendar-helper.ts index ed5b47cff..593637898 100644 --- a/src/addons/calendar/services/calendar-helper.ts +++ b/src/addons/calendar/services/calendar-helper.ts @@ -476,7 +476,7 @@ export class AddonCalendarHelperProvider { const categoryId = filter.categoryId ? Number(filter.categoryId) : undefined; - return events.filter((event) => filter[event.formattedType] && + return events.filter((event) => filter[event.formattedType] && this.shouldDisplayEvent(event, categories, courseId, categoryId)); } diff --git a/src/addons/calendar/services/calendar-sync.ts b/src/addons/calendar/services/calendar-sync.ts index c167865d3..5d6fcad20 100644 --- a/src/addons/calendar/services/calendar-sync.ts +++ b/src/addons/calendar/services/calendar-sync.ts @@ -203,7 +203,7 @@ export class AddonCalendarSyncProvider extends CoreSyncBaseProvider { + async storeEventInLocalDb(event: AddonCalendarGetEventsEvent | AddonCalendarCalendarEvent, siteId?: string): Promise { const site = await CoreSites.getSite(siteId); siteId = site.getId(); try { @@ -1775,7 +1775,7 @@ export const AddonCalendar = makeSingleton(AddonCalendarProvider); /** * Data returned by calendar's events_exporter. - * Data returned by core_calendar_get_action_events_by_course and core_calendar_get_action_events_by_timesort WS. + * Data returned by core_calendar_get_action_events_by_course and core_calendar_get_action_events_by_timesort WS. */ export type AddonCalendarEvents = { events: AddonCalendarEvent[]; // Events. @@ -1912,7 +1912,7 @@ export type AddonCalendarEventBase = { }; /** - * Data returned by calendar's event_exporter. Don't confuse it with AddonCalendarCalendarEvent. + * Data returned by calendar's event_exporter. Don't confuse it with AddonCalendarCalendarEvent. */ export type AddonCalendarEvent = AddonCalendarEventBase & { url: string; // Url. diff --git a/src/addons/competency/pages/competency/competency.html b/src/addons/competency/pages/competency/competency.html index cbd573cdd..84559bc90 100644 --- a/src/addons/competency/pages/competency/competency.html +++ b/src/addons/competency/pages/competency/competency.html @@ -98,7 +98,7 @@ {{ 'core.yes' | translate }} - + {{ 'core.no' | translate }} @@ -112,8 +112,8 @@
-

{{ 'addon.competency.evidence' | translate }}

-

+

{{ 'addon.competency.evidence' | translate }}

+

{{ 'addon.competency.noevidence' | translate }}

@@ -128,7 +128,7 @@

{{ evidence.gradename }}

-

{{ evidence.description }}

+

{{ evidence.description }}

{{ evidence.note }}
 diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html index f19ea733c..03d920cf6 100644 --- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html +++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html @@ -40,7 +40,7 @@ -

+

{{ 'addon.competency.coursecompetencies' | translate }}

diff --git a/src/addons/competency/pages/planlist/planlist.html b/src/addons/competency/pages/planlist/planlist.html index c8cf6c49a..bd25bfd5b 100644 --- a/src/addons/competency/pages/planlist/planlist.html +++ b/src/addons/competency/pages/planlist/planlist.html @@ -15,7 +15,7 @@ - + diff --git a/src/addons/messages/messages-common.scss b/src/addons/messages/messages-common.scss index 3bcd416a8..8f9ea8c4b 100644 --- a/src/addons/messages/messages-common.scss +++ b/src/addons/messages/messages-common.scss @@ -53,7 +53,7 @@ :host-context([dir=rtl]) { .addon-messages-conversation-item, .addon-message-discussion { - h2 ion-icon { + h2 ion-icon { margin-right: 2px; margin-left: 0; } diff --git a/src/addons/messages/pages/contacts-35/contacts.html b/src/addons/messages/pages/contacts-35/contacts.html index 3e2146df3..358567cc7 100644 --- a/src/addons/messages/pages/contacts-35/contacts.html +++ b/src/addons/messages/pages/contacts-35/contacts.html @@ -28,7 +28,7 @@ - +

{{ 'addon.messages.type_' + contactType | translate }}

 @@ -39,7 +39,7 @@ + [attr.aria-current]="contact.id == discussionUserId ? 'page' : 'false'">

{{ contact.fullname }}

 diff --git a/src/addons/messages/pages/contacts/contacts.html b/src/addons/messages/pages/contacts/contacts.html index 381cd613d..5f478925b 100644 --- a/src/addons/messages/pages/contacts/contacts.html +++ b/src/addons/messages/pages/contacts/contacts.html @@ -25,10 +25,10 @@ - + + [attr.aria-current]="contact.id == selectedUserId ? 'page' : 'false'"> @@ -62,10 +62,10 @@ - + + [attr.aria-current]="request.id == selectedUserId ? 'page' : 'false'" detail="true"> diff --git a/src/addons/messages/pages/discussion/discussion.page.ts b/src/addons/messages/pages/discussion/discussion.page.ts index e901b3d72..8bec7da83 100644 --- a/src/addons/messages/pages/discussion/discussion.page.ts +++ b/src/addons/messages/pages/discussion/discussion.page.ts @@ -411,7 +411,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView // Fetch messages. Invalidate the cache before fetching. if (this.groupMessagingEnabled) { await AddonMessages.invalidateConversationMessages(this.conversationId!); - messages = await this.getConversationMessages(this.pagesLoaded); + messages = await this.getConversationMessages(this.pagesLoaded); } else { await AddonMessages.invalidateDiscussionCache(this.userId!); messages = await this.getDiscussionMessages(this.pagesLoaded); diff --git a/src/addons/messages/pages/discussions-35/discussions.html b/src/addons/messages/pages/discussions-35/discussions.html index 7db2d331d..de1cae839 100644 --- a/src/addons/messages/pages/discussions-35/discussions.html +++ b/src/addons/messages/pages/discussions-35/discussions.html @@ -40,7 +40,7 @@ + [attr.aria-current]="result.userid == discussionUserId ? 'page' : 'false'">

{{ result.fullname }}

@@ -52,7 +52,7 @@ + [attr.aria-current]="discussion.message!.user == discussionUserId ? 'page' : 'false'">

{{ discussion.fullname }}

diff --git a/src/addons/messages/pages/discussions-35/discussions.page.ts b/src/addons/messages/pages/discussions-35/discussions.page.ts index b7b9d97d1..ee8c821e7 100644 --- a/src/addons/messages/pages/discussions-35/discussions.page.ts +++ b/src/addons/messages/pages/discussions-35/discussions.page.ts @@ -67,7 +67,7 @@ export class AddonMessagesDiscussions35Page implements OnInit, OnDestroy { protected route: ActivatedRoute, ) { - this.search.loading = Translate.instant('core.searching'); + this.search.loading = Translate.instant('core.searching'); this.loadingMessages = Translate.instant('core.loading'); this.siteId = CoreSites.getCurrentSiteId(); diff --git a/src/addons/messages/pages/search/search.html b/src/addons/messages/pages/search/search.html index fd0e764a2..fc47fd778 100644 --- a/src/addons/messages/pages/search/search.html +++ b/src/addons/messages/pages/search/search.html @@ -14,7 +14,7 @@ + [spellcheck]="false" [autoFocus]="true" [lengthCheck]="1" searchArea="AddonMessagesSearch"> @@ -43,7 +43,7 @@ diff --git a/src/addons/messages/pages/settings/settings.html b/src/addons/messages/pages/settings/settings.html index 403a717ac..9b530c8ed 100644 --- a/src/addons/messages/pages/settings/settings.html +++ b/src/addons/messages/pages/settings/settings.html @@ -83,7 +83,7 @@ - {{ processor.displayname }} + {{ processor.displayname }} - diff --git a/src/addons/mod/assign/components/submission/submission.ts b/src/addons/mod/assign/components/submission/submission.ts index 75e78f0d7..d80430bbe 100644 --- a/src/addons/mod/assign/components/submission/submission.ts +++ b/src/addons/mod/assign/components/submission/submission.ts @@ -601,7 +601,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can disabled: false, }; - this.originalGrades = { + this.originalGrades = { addAttempt: false, applyToAll: false, outcomes: {}, @@ -613,7 +613,7 @@ export class AddonModAssignSubmissionComponent implements OnInit, OnDestroy, Can // If we have data about the grader, get its profile. if (feedback.grade && feedback.grade.grader > 0) { try { - this.grader = await CoreUser.getProfile(feedback.grade.grader, this.courseId); + this.grader = await CoreUser.getProfile(feedback.grade.grader, this.courseId); } catch { // Ignore errors. } diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.html b/src/addons/mod/assign/pages/submission-list/submission-list.html index 0f9c2da42..3161afb6b 100644 --- a/src/addons/mod/assign/pages/submission-list/submission-list.html +++ b/src/addons/mod/assign/pages/submission-list/submission-list.html @@ -4,7 +4,7 @@ - + diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts index 4176ba7a3..5cfd6de5b 100644 --- a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts +++ b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts @@ -54,7 +54,7 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro assign?: AddonModAssignAssign; // Assignment. submissions: AddonModAssignSubmissionListManager; // List of submissions loaded = false; // Whether data has been loaded. - haveAllParticipants = true; // Whether all participants have been loaded. + haveAllParticipants = true; // Whether all participants have been loaded. groupId = 0; // Group ID to show. courseId!: number; // Course ID the assignment belongs to. moduleId!: number; // Module ID the submission belongs to. diff --git a/src/addons/mod/assign/pages/submission-review/submission-review.ts b/src/addons/mod/assign/pages/submission-review/submission-review.ts index f6f5d5dd6..831dea8b8 100644 --- a/src/addons/mod/assign/pages/submission-review/submission-review.ts +++ b/src/addons/mod/assign/pages/submission-review/submission-review.ts @@ -37,7 +37,7 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, CanLeave { title = ''; // Title to display. moduleId!: number; // Module ID the submission belongs to. courseId!: number; // Course ID the assignment belongs to. - submitId!: number; // User that did the submission. + submitId!: number; // User that did the submission. blindId?: number; // Blinded user ID (if it's blinded). loaded = false; // Whether data has been loaded. canSaveGrades = false; // Whether the user can save grades. diff --git a/src/addons/mod/assign/services/assign-sync.ts b/src/addons/mod/assign/services/assign-sync.ts index 60cad1218..1461ce771 100644 --- a/src/addons/mod/assign/services/assign-sync.ts +++ b/src/addons/mod/assign/services/assign-sync.ts @@ -464,7 +464,7 @@ export class AddonModAssignSyncProvider extends CoreCourseActivitySyncBaseProvid // Override offline grade and outcomes based on the gradebook data. grades.forEach((grade: CoreGradesFormattedItem | CoreGradesFormattedRow) => { - if ('gradedategraded' in grade && (grade.gradedategraded || 0) >= offlineData.timemodified) { + if ('gradedategraded' in grade && (grade.gradedategraded || 0) >= offlineData.timemodified) { if (!grade.outcomeid && !grade.scaleid) { if (gradeInfo && gradeInfo.scale) { offlineData.grade = this.getSelectedScaleId(gradeInfo.scale, grade.grade || ''); diff --git a/src/addons/mod/assign/services/assign.ts b/src/addons/mod/assign/services/assign.ts index 501865309..71d04e56a 100644 --- a/src/addons/mod/assign/services/assign.ts +++ b/src/addons/mod/assign/services/assign.ts @@ -90,7 +90,7 @@ export class AddonModAssignProvider { static readonly SUBMITTED_FOR_GRADING_EVENT = 'addon_mod_assign_submitted_for_grading'; static readonly GRADED_EVENT = 'addon_mod_assign_graded'; - protected gradingOfflineEnabled: {[siteId: string]: boolean} = {}; + protected gradingOfflineEnabled: {[siteId: string]: boolean} = {}; /** * Check if the user can submit in offline. This should only be used if submissionStatus.lastattempt.cansubmit cannot @@ -1302,7 +1302,7 @@ export class AddonModAssignProvider { ); return true; - } catch (error) { + } catch (error) { if (error && !CoreUtils.isWebServiceError(error)) { // Couldn't connect to server, store in offline. return storeOffline(); diff --git a/src/addons/mod/assign/submission/file/component/file.ts b/src/addons/mod/assign/submission/file/component/file.ts index 49ca11a07..6e9b73f43 100644 --- a/src/addons/mod/assign/submission/file/component/file.ts +++ b/src/addons/mod/assign/submission/file/component/file.ts @@ -79,7 +79,7 @@ export class AddonModAssignSubmissionFileComponent extends AddonModAssignSubmiss // No offline data, get the online files. this.files = AddonModAssign.getSubmissionPluginAttachments(this.plugin); } - } finally { + } finally { CoreFileSession.setFiles(this.component, this.assign.id, this.files); } } diff --git a/src/addons/mod/book/components/toc/toc.html b/src/addons/mod/book/components/toc/toc.html index d0f84342b..b35e48b95 100644 --- a/src/addons/mod/book/components/toc/toc.html +++ b/src/addons/mod/book/components/toc/toc.html @@ -12,7 +12,7 @@