Skip to content

Commit 8f4a262

Browse files
authored
Merge pull request #4606 from alfonso-salces/MOBILE-4921
MOBILE-4921 courses: Add course category id and course id in data attr
2 parents 993578b + 30fa93d commit 8f4a262

File tree

9 files changed

+24
-2
lines changed

9 files changed

+24
-2
lines changed

src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ <h3 class="item-heading">
164164
<ion-grid class="ion-no-padding" [class.core-no-grid]="layout !== 'card'" [class.list-item-limited-width]="layout !== 'card'">
165165
<ion-row class="ion-no-padding">
166166
<ion-col *ngFor="let course of filteredCourses" class="ion-no-padding" size="12" size-sm="6" size-md="6" size-lg="4"
167-
size-xl="3" [attr.data-course-id]="course.id">
167+
size-xl="3" [attr.data-course-id]="course.id" [attr.data-category-id]="course.categoryid">
168168
<core-courses-course-list-item [course]="course" class="core-courseoverview" [showDownload]="downloadCourseEnabled"
169169
[layout]="layout" />
170170
</ion-col>

src/addons/block/timeline/components/events/events.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import { CoreContentLinksHelper } from '@features/contentlinks/services/contentl
3434
],
3535
host: {
3636
'[attr.data-course-id]': 'course()?.id ?? null',
37+
'[attr.data-category-id]': 'course()?.categoryid ?? null',
3738
},
3839
})
3940
export class AddonBlockTimelineEventsComponent implements OnInit {

src/core/features/course/components/course-index/course-index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ export class CoreCourseCourseIndexComponent implements OnInit {
5757
return this.course?.id ?? null;
5858
}
5959

60+
@HostBinding('attr.data-category-id') protected get courseCategoryId(): number | null {
61+
return this.course?.categoryid ?? null;
62+
}
63+
6064
/**
6165
* @inheritdoc
6266
*/

src/core/features/course/pages/contents/contents.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ export default class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRe
9797
return this.course?.id ?? null;
9898
}
9999

100+
@HostBinding('attr.data-category-id') protected get courseCategoryId(): number | null {
101+
return this.course?.categoryid ?? null;
102+
}
103+
100104
/**
101105
* @inheritdoc
102106
*/

src/core/features/course/pages/course-summary/course-summary.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ export default class CoreCourseSummaryPage implements OnInit, OnDestroy {
9191
return this.course?.id ?? null;
9292
}
9393

94+
@HostBinding('attr.data-category-id') protected get courseCategoryId(): number | null {
95+
return this.course?.categoryid ?? null;
96+
}
97+
9498
constructor() {
9599
// Refresh the view when the app is resumed.
96100
this.appResumeSubscription = CorePlatform.resume.subscribe(() => {

src/core/features/course/pages/index/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ export default class CoreCourseIndexPage implements OnInit, OnDestroy {
8080
return this.course?.id ?? null;
8181
}
8282

83+
@HostBinding('attr.data-category-id') protected get courseCategoryId(): number | null {
84+
return this.course?.categoryid ?? null;
85+
}
86+
8387
constructor() {
8488
this.selectTabObserver = CoreEvents.on(CORE_COURSE_SELECT_TAB, (data) => {
8589
const index = data.selectedTab

src/core/features/courses/components/course-list-item/course-list-item.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ import { CoreEnrolInfoIcon } from '@features/enrol/services/enrol-delegate';
6363
],
6464
host: {
6565
'[attr.data-course-id]': 'course.id',
66+
'[attr.data-category-id]': 'course.categoryid',
6667
},
6768
})
6869
export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, OnChanges {

src/core/features/grades/pages/course/course.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ import { CoreSharedModule } from '@/core/shared.module';
4747
imports: [
4848
CoreSharedModule,
4949
],
50+
host: {
51+
'[attr.data-course-id]': 'courseId ?? null',
52+
},
5053
})
5154
export default class CoreGradesCoursePage implements AfterViewInit, OnDestroy {
5255

src/core/features/grades/pages/courses/courses.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ <h1>{{ 'core.grades.grades' | translate }}</h1>
2020
<ion-list>
2121
@for (course of courses.items; track course.courseid) {
2222
<ion-item [attr.aria-label]="course.courseFullName" [attr.aria-current]="courses.getItemAriaCurrent(course)"
23-
class="ion-text-wrap" button [detail]="true" (click)="courses.select(course)">
23+
[attr.data-course-id]="course.courseid" class="ion-text-wrap" button [detail]="true"
24+
(click)="courses.select(course)">
2425
<ion-label>
2526
<p class="item-heading">
2627
<core-format-text [text]="course.courseFullName" [contextInstanceId]="course.courseid"

0 commit comments

Comments
 (0)