diff --git a/src/addons/block/myoverview/components/myoverview/myoverview.scss b/src/addons/block/myoverview/components/myoverview/myoverview.scss index 37df6ca93..9592ab859 100644 --- a/src/addons/block/myoverview/components/myoverview/myoverview.scss +++ b/src/addons/block/myoverview/components/myoverview/myoverview.scss @@ -28,7 +28,7 @@ --a11y-min-target-size: 40px; } - ion-searchbar { + ion-searchbar { padding: 0; --height: 40px; } diff --git a/src/addons/block/timeline/components/events/addon-block-timeline-events.html b/src/addons/block/timeline/components/events/addon-block-timeline-events.html index 8e31ce4ba..5203463f9 100644 --- a/src/addons/block/timeline/components/events/addon-block-timeline-events.html +++ b/src/addons/block/timeline/components/events/addon-block-timeline-events.html @@ -19,7 +19,7 @@ - + {{event.timesort * 1000 | coreFormatDate:"strftimetime24" }} diff --git a/src/addons/messages/tests/behat/navigation.feature b/src/addons/messages/tests/behat/navigation.feature index 46abda2d9..633d564f2 100644 --- a/src/addons/messages/tests/behat/navigation.feature +++ b/src/addons/messages/tests/behat/navigation.feature @@ -14,7 +14,6 @@ Feature: Test messages navigation in the app | teacher | C1 | editingteacher | | student | C1 | student | - @ionic7_failure Scenario: Avoid recursive links to profile Given I entered the app as "teacher" When I press "Messages" in the app diff --git a/src/addons/messages/tests/behat/snapshots/test-basic-usage-of-messages-in-app-view-recent-conversations-and-contacts_22.png b/src/addons/messages/tests/behat/snapshots/test-basic-usage-of-messages-in-app-view-recent-conversations-and-contacts_22.png index 319346cc0..293953e2f 100644 Binary files a/src/addons/messages/tests/behat/snapshots/test-basic-usage-of-messages-in-app-view-recent-conversations-and-contacts_22.png and b/src/addons/messages/tests/behat/snapshots/test-basic-usage-of-messages-in-app-view-recent-conversations-and-contacts_22.png differ diff --git a/src/addons/messages/tests/behat/snapshots/test-basic-usage-of-messages-in-app-view-recent-conversations-and-contacts_30.png b/src/addons/messages/tests/behat/snapshots/test-basic-usage-of-messages-in-app-view-recent-conversations-and-contacts_30.png index e072a7c57..bf3305d8b 100644 Binary files a/src/addons/messages/tests/behat/snapshots/test-basic-usage-of-messages-in-app-view-recent-conversations-and-contacts_30.png and b/src/addons/messages/tests/behat/snapshots/test-basic-usage-of-messages-in-app-view-recent-conversations-and-contacts_30.png differ diff --git a/src/addons/mod/assign/tests/behat/basic_usage.feature b/src/addons/mod/assign/tests/behat/basic_usage.feature index 499765af9..bb031cbd7 100755 --- a/src/addons/mod/assign/tests/behat/basic_usage.feature +++ b/src/addons/mod/assign/tests/behat/basic_usage.feature @@ -58,7 +58,6 @@ Feature: Test basic usage of assignment activity in app Then I should find "Online text submissions" in the app And I should find "Submission test edited" in the app - @ionic7_failure Scenario: Edit/Add submission (online text) & Add new attempt from previous submission & Submit for grading # Submit first attempt as a student Given I entered the assign activity "assignment1" on course "Course 1" as "student1" in the app diff --git a/src/addons/mod/assign/tests/behat/snapshots/test-basic-usage-of-assignment-activity-in-app-editadd-submission-online-text--add-new-attempt-from-previous-submission--submit-for-grading_8.png b/src/addons/mod/assign/tests/behat/snapshots/test-basic-usage-of-assignment-activity-in-app-editadd-submission-online-text--add-new-attempt-from-previous-submission--submit-for-grading_8.png index c5c9d3eca..29044218a 100644 Binary files a/src/addons/mod/assign/tests/behat/snapshots/test-basic-usage-of-assignment-activity-in-app-editadd-submission-online-text--add-new-attempt-from-previous-submission--submit-for-grading_8.png and b/src/addons/mod/assign/tests/behat/snapshots/test-basic-usage-of-assignment-activity-in-app-editadd-submission-online-text--add-new-attempt-from-previous-submission--submit-for-grading_8.png differ diff --git a/src/addons/mod/data/tests/behat/entries.feature b/src/addons/mod/data/tests/behat/entries.feature index 2b7d90c5f..f252cdd40 100644 --- a/src/addons/mod/data/tests/behat/entries.feature +++ b/src/addons/mod/data/tests/behat/entries.feature @@ -26,7 +26,6 @@ Feature: Users can manage entries in database activities | data1 | text | URL | URL link | | data1 | text | Description | Link description | - @ionic7_failure Scenario: Create entry Given I entered the data activity "Web links" on course "Course 1" as "student1" in the app Then I should find "No entries yet" in the app @@ -38,7 +37,6 @@ Feature: Users can manage entries in database activities Then I should find "https://moodle.org/" in the app And I should find "Moodle community site" in the app - @ionic7_failure Scenario: Browse entry Given I entered the data activity "Web links" on course "Course 1" as "student1" in the app @@ -72,7 +70,6 @@ Feature: Users can manage entries in database activities And I should find "Moodle community site" in the app And I should find "Moodle Cloud" in the app - @ionic7_failure Scenario: Students can not edit or delete other user's entries from list and single view in the app Given I entered the data activity "Web links" on course "Course 1" as "student1" in the app And I press "Add entries" in the app @@ -88,7 +85,6 @@ Feature: Users can manage entries in database activities And "Edit" "link" should not exist And "Delete" "link" should not exist - @ionic7_failure Scenario: Delete entry (student) & Update entry (student) Given I entered the data activity "Web links" on course "Course 1" as "student1" in the app And I press "Add entries" in the app @@ -148,7 +144,6 @@ Feature: Users can manage entries in database activities And I should not find "Moodle Cloud" in the app And I should find "No entries yet" in the app - @ionic7_failure Scenario: Delete entry (teacher) & Update entry (teacher) Given I entered the data activity "Web links" on course "Course 1" as "student1" in the app And I press "Add entries" in the app @@ -212,7 +207,6 @@ Feature: Users can manage entries in database activities And I press "Delete" in the app And I should not find "Moodle Cloud" in the app - @ionic7_failure Scenario: Handle number 0 correctly when creating entries Given the following "activities" exist: | activity | name | intro | course | idnumber | diff --git a/src/addons/mod/data/tests/behat/sync.feature b/src/addons/mod/data/tests/behat/sync.feature index 1ff9d51c9..a9aee09c5 100644 --- a/src/addons/mod/data/tests/behat/sync.feature +++ b/src/addons/mod/data/tests/behat/sync.feature @@ -26,7 +26,6 @@ Feature: Users can store entries in database activities when offline and sync wh | data1 | text | URL | URL link | | data1 | text | Description | Link description | - @ionic7_failure Scenario: Create entry (offline) Given I entered the data activity "Web links" on course "Course 1" as "student1" in the app And I switch network connection to offline @@ -46,7 +45,6 @@ Feature: Users can store entries in database activities when offline and sync wh And I should find "Moodle community site" in the app And I should not find "This Database has offline data to be synchronised" in the app - @ionic7_failure Scenario: Update entry (offline) & Delete entry (offline) Given I entered the data activity "Web links" on course "Course 1" as "student1" in the app And I should find "No entries yet" in the app @@ -97,7 +95,6 @@ Feature: Users can store entries in database activities when offline and sync wh And I should not find "Moodle Cloud" in the app And I should not find "This Database has offline data to be synchronised" in the app - @ionic7_failure Scenario: Students can undo deleting entries to a database in the app while offline Given I entered the data activity "Web links" on course "Course 1" as "student1" in the app And I should find "No entries yet" in the app diff --git a/src/addons/mod/forum/tests/behat/basic_usage.feature b/src/addons/mod/forum/tests/behat/basic_usage.feature index ca1e95fca..0a463b880 100755 --- a/src/addons/mod/forum/tests/behat/basic_usage.feature +++ b/src/addons/mod/forum/tests/behat/basic_usage.feature @@ -50,7 +50,6 @@ Feature: Test basic usage of forum activity in app Then I should find "My happy subject" in the app And I should find "An awesome message" inside the split-view content in the app - @ionic7_failure Scenario: Reply a post Given I entered the forum activity "Test forum name" on course "Course 1" as "student1" in the app When I replace "/.*/" within ".addon-mod-forum-discussion-author p" with "[Publication date]" @@ -179,7 +178,6 @@ Feature: Test basic usage of forum activity in app And I press "Save changes" in the app Then I should find "Auto-test message edited" in the app - @ionic7_failure Scenario: Delete a forum post (only online) Given I entered the forum activity "Test forum name" on course "Course 1" as "student1" in the app When I press "Add discussion topic" in the app diff --git a/src/addons/mod/forum/tests/behat/snapshots/test-basic-usage-of-forum-activity-in-app-reply-a-post_14.png b/src/addons/mod/forum/tests/behat/snapshots/test-basic-usage-of-forum-activity-in-app-reply-a-post_14.png index e498fdc6f..75f0af1c4 100644 Binary files a/src/addons/mod/forum/tests/behat/snapshots/test-basic-usage-of-forum-activity-in-app-reply-a-post_14.png and b/src/addons/mod/forum/tests/behat/snapshots/test-basic-usage-of-forum-activity-in-app-reply-a-post_14.png differ diff --git a/src/addons/mod/forum/tests/behat/snapshots/test-basic-usage-of-forum-activity-in-app-reply-a-post_9.png b/src/addons/mod/forum/tests/behat/snapshots/test-basic-usage-of-forum-activity-in-app-reply-a-post_9.png index 5ed3c24af..87aa8ca9c 100644 Binary files a/src/addons/mod/forum/tests/behat/snapshots/test-basic-usage-of-forum-activity-in-app-reply-a-post_9.png and b/src/addons/mod/forum/tests/behat/snapshots/test-basic-usage-of-forum-activity-in-app-reply-a-post_9.png differ diff --git a/src/addons/mod/quiz/tests/behat/basic_usage.feature b/src/addons/mod/quiz/tests/behat/basic_usage.feature index 7680efe7a..d98846609 100755 --- a/src/addons/mod/quiz/tests/behat/basic_usage.feature +++ b/src/addons/mod/quiz/tests/behat/basic_usage.feature @@ -191,7 +191,6 @@ Feature: Attempt a quiz in app Then I should find "The correct answer is: Berlin" in the app And I should find "Mark 1.00 out of 1.00" in the app - @ionic7_failure Scenario: Submit a quiz & Review a quiz attempt Given I entered the quiz activity "Quiz 1" on course "Course 1" as "student1" in the app When I press "Attempt quiz now" 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_26.png b/src/addons/mod/quiz/tests/behat/snapshots/attempt-a-quiz-in-app-submit-a-quiz--review-a-quiz-attempt_26.png index ed8787ff3..8221786c3 100644 Binary files a/src/addons/mod/quiz/tests/behat/snapshots/attempt-a-quiz-in-app-submit-a-quiz--review-a-quiz-attempt_26.png and b/src/addons/mod/quiz/tests/behat/snapshots/attempt-a-quiz-in-app-submit-a-quiz--review-a-quiz-attempt_26.png differ diff --git a/src/addons/mod/quiz/tests/behat/snapshots/attempt-a-quiz-in-app-submit-a-quiz--review-a-quiz-attempt_36.png b/src/addons/mod/quiz/tests/behat/snapshots/attempt-a-quiz-in-app-submit-a-quiz--review-a-quiz-attempt_36.png index 31ca59293..b4dc52877 100644 Binary files a/src/addons/mod/quiz/tests/behat/snapshots/attempt-a-quiz-in-app-submit-a-quiz--review-a-quiz-attempt_36.png and b/src/addons/mod/quiz/tests/behat/snapshots/attempt-a-quiz-in-app-submit-a-quiz--review-a-quiz-attempt_36.png differ diff --git a/src/addons/notifications/tests/behat/notifications.feature b/src/addons/notifications/tests/behat/notifications.feature index a7ac5528d..6ad776d57 100644 --- a/src/addons/notifications/tests/behat/notifications.feature +++ b/src/addons/notifications/tests/behat/notifications.feature @@ -40,8 +40,7 @@ Feature: Notifications | Test 30 | student2 | student1 | 1649766629 | null | Scenario: Mobile navigation - Given I enter the app - And I log in as "student1" + Given I entered the app as "student1" And I press "Notifications" in the app Then I should find "Test 30" in the app But I should not find "Test 10" in the app @@ -81,9 +80,8 @@ Feature: Notifications @ionic7_failure Scenario: Tablet navigation - Given I enter the app + Given I entered the app as "student1" And I change viewport size to "1200x640" in the app - And I log in as "student1" And I press "Notifications" in the app Then I should find "Test 30" in the app But I should not find "Test 10" in the app diff --git a/src/addons/qtype/match/component/addon-qtype-match.html b/src/addons/qtype/match/component/addon-qtype-match.html index cec385a0b..53fb6478d 100644 --- a/src/addons/qtype/match/component/addon-qtype-match.html +++ b/src/addons/qtype/match/component/addon-qtype-match.html @@ -10,20 +10,20 @@ -
+
+ +
{{option.label}} - - diff --git a/src/addons/qtype/match/component/match.scss b/src/addons/qtype/match/component/match.scss index da749c46f..a938ad1dd 100644 --- a/src/addons/qtype/match/component/match.scss +++ b/src/addons/qtype/match/component/match.scss @@ -10,4 +10,16 @@ .addon-qtype-match-incorrect { color: var(--danger); } + + ion-select::part(label) { + flex-grow: 1; + } + + div.flew-row { + width: 100%; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + } } diff --git a/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html b/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html index c5daf7e3d..bd1b653ad 100644 --- a/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html +++ b/src/addons/qtype/multichoice/component/addon-qtype-multichoice.html @@ -18,21 +18,22 @@ -
- +
+
+ +
+ + - - - @@ -43,20 +44,21 @@ -
- +
+
+ +
+ + - - - diff --git a/src/addons/qtype/multichoice/component/multichoice.scss b/src/addons/qtype/multichoice/component/multichoice.scss index 3cdbe2c85..fea23fd97 100644 --- a/src/addons/qtype/multichoice/component/multichoice.scss +++ b/src/addons/qtype/multichoice/component/multichoice.scss @@ -6,15 +6,24 @@ padding: 0 .7em; } - .answer { - line-height: 2em; - } - .d-flex { display: flex !important; } - .answer .answernumber { - min-width: 1.5em; + .answer { + line-height: 2em; + + .answernumber { + min-width: 1.5em; + } + + ion-checkbox::part(label), + ion-radio::part(label) { + width: 100%; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + } } } diff --git a/src/core/components/send-message-form/send-message-form.scss b/src/core/components/send-message-form/send-message-form.scss index 89f1fac85..0d36c6c6f 100644 --- a/src/core/components/send-message-form/send-message-form.scss +++ b/src/core/components/send-message-form/send-message-form.scss @@ -1,4 +1,8 @@ +@use "theme/globals" as *; + :host { + display: contents; + --textarea-background: var(--core-input-background); --textarea-color: var(--core-input-text); --textarea-border-width: var(--core-input-border-width); @@ -6,7 +10,6 @@ --textarea-radius: var(--radius-xl); form { - position: relative; display: flex; align-items: center; width: 100%; @@ -27,10 +30,15 @@ min-height: var(--a11y-min-target-size); line-height: 20px; padding: 10px; - margin: 4px 8px; + @include margin(4px, 0px, 4px, 8px); resize: vertical; } + ion-button { + --padding-start: 16px; + --padding-end: 16px; + } + .core-send-message-input::placeholder { color: var(--ion-placeholder-color); } diff --git a/src/core/features/comments/tests/behat/basic_usage.feature b/src/core/features/comments/tests/behat/basic_usage.feature index e80df0483..40b6ef738 100644 --- a/src/core/features/comments/tests/behat/basic_usage.feature +++ b/src/core/features/comments/tests/behat/basic_usage.feature @@ -26,7 +26,6 @@ Feature: Test basic usage of comments in app | database | type | name | description | | data1 | text | Test field name | Test field description | - @ionic7_failure Scenario: Add comments & Delete comments (database) # Create database entry and comment as a teacher Given I entered the data activity "Data" on course "Course 1" as "teacher1" in the app @@ -65,7 +64,6 @@ Feature: Test basic usage of comments in app When I press the back button in the app Then I should find "Comments (1)" in the app - @ionic7_failure Scenario: Add comments offline & Delete comments offline & Sync comments (database) Given I entered the data activity "Data" on course "Course 1" as "teacher1" in the app And I press "Add entries" in the app @@ -152,7 +150,6 @@ Feature: Test basic usage of comments in app When I press the back button in the app And I should find "Comments (1)" in the app - @ionic7_failure Scenario: Add comments offline & Delete comments offline & Sync comments (glossary) Given I entered the glossary activity "Test glossary" on course "Course 1" as "teacher1" in the app And I press "Add a new entry" in the app @@ -231,7 +228,6 @@ Feature: Test basic usage of comments in app When I press the back button in the app Then I should find "Comments (0)" in the app - @ionic7_failure Scenario: Add comments offline & Delete comments offline & Sync comments (blogs) # Create blog as a teacher Given the following "core_blog > entries" exist: diff --git a/src/core/features/compile/components/compile-html/compile-html.ts b/src/core/features/compile/components/compile-html/compile-html.ts index 4ac7ea86b..4b9a51ab1 100644 --- a/src/core/features/compile/components/compile-html/compile-html.ts +++ b/src/core/features/compile/components/compile-html/compile-html.ts @@ -114,42 +114,41 @@ export class CoreCompileHtmlComponent implements OnChanges, OnDestroy, DoCheck { * @inheritdoc */ async ngOnChanges(changes: Record): Promise { - if (!this.container) { + // Only compile if text/javascript has changed or the forceCompile flag has been set to true. + if (this.text === undefined || + !(changes.text || changes.javascript || (changes.forceCompile && CoreUtils.isTrueOrOne(this.forceCompile)))) { return; } - // Only compile if text/javascript has changed or the forceCompile flag has been set to true. - if (this.text !== undefined && (changes.text || changes.javascript || - (changes.forceCompile && CoreUtils.isTrueOrOne(this.forceCompile)))) { + // Create a new component and a new module. + this.creatingComponent = true; + this.compiling.emit(true); - // Create a new component and a new module. - this.creatingComponent = true; - this.compiling.emit(true); + try { + const componentClass = await this.getComponentClass(); - try { - const componentClass = await this.getComponentClass(); + // Destroy previous components. + this.componentRef?.destroy(); - // Destroy previous components. - this.componentRef?.destroy(); - - // Create the component. + // Create the component. + if (this.container) { this.componentRef = await CoreCompile.createAndCompileComponent( this.text, componentClass, this.container, this.extraImports, ); - this.componentRef && this.created.emit(this.componentRef.instance); - - this.loaded = true; - } catch (error) { - CoreDomUtils.showErrorModal(error); - - this.loaded = true; - } finally { - this.creatingComponent = false; - this.compiling.emit(false); } + this.componentRef && this.created.emit(this.componentRef.instance); + + this.loaded = true; + } catch (error) { + CoreDomUtils.showErrorModal(error); + + this.loaded = true; + } finally { + this.creatingComponent = false; + this.compiling.emit(false); } } diff --git a/src/core/features/course/tests/behat/basic_usage.feature b/src/core/features/course/tests/behat/basic_usage.feature index 39f86de7b..c1e9904cd 100755 --- a/src/core/features/course/tests/behat/basic_usage.feature +++ b/src/core/features/course/tests/behat/basic_usage.feature @@ -80,7 +80,6 @@ Feature: Test basic usage of one course in app And I click on "Move right" "link" in the "assignment" activity And I log out - @ionic7_failure Scenario: View course contents When I entered the course "Course 1" as "student1" in the app Then the header should be "Course 1" in the app diff --git a/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_46.png b/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_46.png index 12ebfcb86..317db3b95 100644 Binary files a/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_46.png and b/src/core/features/course/tests/behat/snapshots/test-basic-usage-of-one-course-in-app-view-course-contents_46.png differ diff --git a/src/core/features/login/login.scss b/src/core/features/login/login.scss index 1afb8ffed..7eb22647d 100644 --- a/src/core/features/login/login.scss +++ b/src/core/features/login/login.scss @@ -66,10 +66,6 @@ } .core-login-methods { - form .item.item-input { - margin-bottom: 16px; - } - form .item, form .item ion-label { --background: var(--core-login-input-background); diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html index a4a899d0e..0503fb2fc 100644 --- a/src/core/features/login/pages/credentials/credentials.html +++ b/src/core/features/login/pages/credentials/credentials.html @@ -41,7 +41,7 @@