From 00d02bc50218160fe98c72b95ad21fabeddb91ef Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 15 May 2024 08:54:35 +0200 Subject: [PATCH 1/4] MOBILE-4550 quiz: Always display max number of decimals in grades --- src/addons/mod/quiz/services/quiz.ts | 3 +-- .../quiz/tests/behat/attempts_list.feature | 8 ++++---- ...ubmit-a-quiz--review-a-quiz-attempt_40.png | Bin 35536 -> 38151 bytes 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/addons/mod/quiz/services/quiz.ts b/src/addons/mod/quiz/services/quiz.ts index e360df44c..44a948489 100644 --- a/src/addons/mod/quiz/services/quiz.ts +++ b/src/addons/mod/quiz/services/quiz.ts @@ -30,7 +30,6 @@ import { import { CoreQuestionDelegate } from '@features/question/services/question-delegate'; import { CoreSites, CoreSitesCommonWSOptions, CoreSitesReadingStrategy } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; -import { CoreTextUtils } from '@services/utils/text'; import { CoreTimeUtils } from '@services/utils/time'; import { CoreUtils } from '@services/utils/utils'; import { CoreStatusWithWarningsWSResponse, CoreWSExternalFile, CoreWSExternalWarning } from '@services/ws'; @@ -96,7 +95,7 @@ export class AddonModQuizProvider { return Translate.instant('addon.mod_quiz.notyetgraded'); } - return CoreUtils.formatFloat(CoreTextUtils.roundToDecimals(grade, decimals)); + return CoreUtils.formatFloat(grade.toFixed(decimals ?? 2)); } /** diff --git a/src/addons/mod/quiz/tests/behat/attempts_list.feature b/src/addons/mod/quiz/tests/behat/attempts_list.feature index dea9c5de4..6d8e70a8f 100644 --- a/src/addons/mod/quiz/tests/behat/attempts_list.feature +++ b/src/addons/mod/quiz/tests/behat/attempts_list.feature @@ -33,8 +33,8 @@ Feature: View list of attempts in the app Given I entered the quiz activity "Quiz 1" on course "Course 1" as "student1" in the app Then I should find "In progress" within "Attempt 2" "ion-item" in the app And I should find "Finished" within "Attempt 1" "ion-item" in the app - And I should find "100 / 100" within "Attempt 1" "ion-item" in the app - But I should not find "100" within "Attempt 2" "ion-item" in the app + And I should find "100.00 / 100.00" within "Attempt 1" "ion-item" in the app + But I should not find "100.00" within "Attempt 2" "ion-item" in the app And I should not find "Started" within "Your attempts" "ion-card" in the app And I should not find "Completed" within "Your attempts" "ion-card" in the app And I should not find "Marks" within "Your attempts" "ion-card" in the app @@ -43,7 +43,7 @@ Feature: View list of attempts in the app When I press "Attempt 1" in the app Then I should find "Started" within "Your attempts" "ion-card" in the app And I should find "Completed" in the app - And I should find "1/1" within "Marks" "ion-item" in the app + And I should find "1.00/1.00" within "Marks" "ion-item" in the app And I should be able to press "Review" in the app @lms_from4.2 @@ -51,7 +51,7 @@ Feature: View list of attempts in the app Given the attempt at "Quiz 1" by "student1" was never submitted And I entered the quiz activity "Quiz 1" on course "Course 1" as "student1" in the app Then I should find "Never submitted" within "Attempt 2" "ion-item" in the app - But I should not find "100" within "Attempt 2" "ion-item" in the app + But I should not find "100.00" within "Attempt 2" "ion-item" in the app When I press "Attempt 2" in the app Then I should find "Started" within "Your attempts" "ion-card" in the app diff --git a/src/addons/mod/quiz/tests/behat/snapshots/attempt-a-quiz-in-app-submit-a-quiz--review-a-quiz-attempt_40.png b/src/addons/mod/quiz/tests/behat/snapshots/attempt-a-quiz-in-app-submit-a-quiz--review-a-quiz-attempt_40.png index 679b915178c99c0bc4af324e3a817b9433bfdff6..74d4c6b5702adca87af4a01b57374a27b93e6e46 100644 GIT binary patch delta 22069 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 z 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 From d4defbb5436cc2297b34bc3e62908b9f662906d7 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 15 May 2024 09:49:00 +0200 Subject: [PATCH 2/4] MOBILE-4550 quiz: Fix hiding help icons from review data --- src/addons/mod/quiz/components/attempt-info/attempt-info.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/addons/mod/quiz/components/attempt-info/attempt-info.ts b/src/addons/mod/quiz/components/attempt-info/attempt-info.ts index ebb7be876..25c0498ac 100644 --- a/src/addons/mod/quiz/components/attempt-info/attempt-info.ts +++ b/src/addons/mod/quiz/components/attempt-info/attempt-info.ts @@ -49,7 +49,7 @@ export class AddonModQuizAttemptInfoComponent implements OnChanges { if (changes.additionalData) { this.additionalData?.forEach((data) => { // Remove help links from additional data. - data.content = CoreDomUtils.removeElementFromHtml(data.content, '.helptooltip'); + data.content = CoreDomUtils.removeElementFromHtml(data.content, '.helptooltip, [data-toggle="popover"]'); }); } From 0b9417884fb0cf2501456513748023df711744a1 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 15 May 2024 11:01:18 +0200 Subject: [PATCH 3/4] MOBILE-4550 quiz: Fix alignment of quiz grade --- src/addons/mod/quiz/components/index/index.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/addons/mod/quiz/components/index/index.scss b/src/addons/mod/quiz/components/index/index.scss index 647124ebb..b10c69da8 100644 --- a/src/addons/mod/quiz/components/index/index.scss +++ b/src/addons/mod/quiz/components/index/index.scss @@ -10,6 +10,9 @@ .addon-mod_quiz-grade-result { margin-top: var(--mdl-spacing-2); + ion-label { + @include margin-horizontal(0px, 0px); + } .addon-mod_quiz-grade-overridden-notice { margin-top: var(--mdl-spacing-2); From 633ef7dc9a31c75ffc399cc5dff1cc36ade64ee8 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Wed, 15 May 2024 11:14:08 +0200 Subject: [PATCH 4/4] MOBILE-4550 quiz: Fix feedback color specificity --- src/core/features/question/question.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/features/question/question.scss b/src/core/features/question/question.scss index b4f39d6ad..369bf2ea9 100644 --- a/src/core/features/question/question.scss +++ b/src/core/features/question/question.scss @@ -38,10 +38,10 @@ .specificfeedback, .rightanswer, .im-feedback, .feedback, .generalfeedback { margin: 0 0 .5em; - } - p { - --color: var(--core-question-feedback-color); + p { + --color: var(--core-question-feedback-color); + } } .correctness {