From fa6eb60470994f515c08bf08e829cc8dcc050dd3 Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Wed, 19 Apr 2023 15:02:16 +0200 Subject: [PATCH 1/2] MOBILE-4188 user: Undo sticky participants search --- .../user/pages/participants/participants.page.ts | 1 - .../user/pages/participants/participants.scss | 13 ------------- 2 files changed, 14 deletions(-) delete mode 100644 src/core/features/user/pages/participants/participants.scss diff --git a/src/core/features/user/pages/participants/participants.page.ts b/src/core/features/user/pages/participants/participants.page.ts index d990edf91..47633f894 100644 --- a/src/core/features/user/pages/participants/participants.page.ts +++ b/src/core/features/user/pages/participants/participants.page.ts @@ -31,7 +31,6 @@ import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/ @Component({ selector: 'page-core-user-participants', templateUrl: 'participants.html', - styleUrls: ['participants.scss'], }) export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestroy { diff --git a/src/core/features/user/pages/participants/participants.scss b/src/core/features/user/pages/participants/participants.scss deleted file mode 100644 index 9652a7194..000000000 --- a/src/core/features/user/pages/participants/participants.scss +++ /dev/null @@ -1,13 +0,0 @@ -:host { - - core-split-view { - isolation: isolate; - } - - core-search-box { - position: sticky; - top: 8px; - z-index: 1; - } - -} From c06671a760260c006d092853388900139e6c9712 Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Wed, 19 Apr 2023 15:02:39 +0200 Subject: [PATCH 2/2] MOBILE-4188 grades: Fix search results swiping --- src/core/features/grades/pages/course/course.page.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/core/features/grades/pages/course/course.page.ts b/src/core/features/grades/pages/course/course.page.ts index a26e5a86e..3cf1fcafb 100644 --- a/src/core/features/grades/pages/course/course.page.ts +++ b/src/core/features/grades/pages/course/course.page.ts @@ -81,10 +81,13 @@ export class CoreGradesCoursePage implements AfterViewInit, OnDestroy { CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(CoreGradesCoursesSource, []), ); break; - case 'participants': + case 'participants': { + const search = CoreNavigator.getRouteParam('search'); + this.swipeManager = new CoreGradesCourseParticipantsSwipeManager( - CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(CoreUserParticipantsSource, [this.courseId]), + CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(CoreUserParticipantsSource, [this.courseId, search]), ); + } break; } } catch (error) {