diff --git a/src/addons/competency/pages/competencies/competencies.html b/src/addons/competency/pages/competencies/competencies.html
index 911270667..72793a1db 100644
--- a/src/addons/competency/pages/competencies/competencies.html
+++ b/src/addons/competency/pages/competencies/competencies.html
@@ -4,7 +4,10 @@
- {{ title }}
+
+
+
+
@@ -19,7 +22,11 @@
[attr.aria-label]="competency.competency.shortname" (click)="competencies.select(competency)"
[attr.aria-current]="competencies.getItemAriaCurrent(competency)" button detail="true">
- {{ competency.competency.shortname }} {{competency.competency.idnumber}}
+
+
+ {{competency.competency.idnumber}}
+
diff --git a/src/addons/competency/pages/competencies/competencies.page.ts b/src/addons/competency/pages/competencies/competencies.page.ts
index e2c01de02..170976e19 100644
--- a/src/addons/competency/pages/competencies/competencies.page.ts
+++ b/src/addons/competency/pages/competencies/competencies.page.ts
@@ -30,6 +30,7 @@ import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/
import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
import { CoreSites } from '@services/sites';
import { CoreTime } from '@singletons/time';
+import { ContextLevel } from '@/core/constants';
/**
* Page that displays the list of competencies of a learning plan.
@@ -48,6 +49,8 @@ export class AddonCompetencyCompetenciesPage implements AfterViewInit, OnDestroy
>;
title = '';
+ contextLevel?: string;
+ contextInstanceId?: number;
protected logView: () => void;
@@ -99,8 +102,12 @@ export class AddonCompetencyCompetenciesPage implements AfterViewInit, OnDestroy
}
this.title = source.plan.plan.name;
+ this.contextLevel = ContextLevel.USER;
+ this.contextInstanceId = source.user?.id || source.plan.plan.userid;
} else {
this.title = Translate.instant('addon.competency.coursecompetencies');
+ this.contextLevel = ContextLevel.COURSE;
+ this.contextInstanceId = source.COURSE_ID;
}
this.logView();
diff --git a/src/addons/competency/pages/competency/competency.html b/src/addons/competency/pages/competency/competency.html
index 21b96147f..37d6cbbcf 100644
--- a/src/addons/competency/pages/competency/competency.html
+++ b/src/addons/competency/pages/competency/competency.html
@@ -5,7 +5,9 @@
- {{ competency.competency.competency.shortname }} {{ competency.competency.competency.idnumber }}
+
+ {{ competency.competency.competency.idnumber }}
@@ -37,18 +39,28 @@
{{ 'addon.competency.path' | translate }}
- {{ competency.competency.comppath.framework.name }}
+
+
- {{ competency.competency.comppath.framework.name }}
+
+
/
- {{ ancestor.name }}
+
+
+
+
/
@@ -63,7 +75,9 @@
diff --git a/src/addons/competency/pages/competencysummary/competencysummary.html b/src/addons/competency/pages/competencysummary/competencysummary.html
index 57d59228e..3c354f39f 100644
--- a/src/addons/competency/pages/competencysummary/competencysummary.html
+++ b/src/addons/competency/pages/competencysummary/competencysummary.html
@@ -5,7 +5,9 @@
- {{ competency.competency.shortname }} {{ competency.competency.idnumber }}
+
+ {{ competency.competency.idnumber }}
@@ -26,11 +28,16 @@
{{ 'addon.competency.path' | translate }}
- {{ competency.comppath.framework.name }}
+
+
+
/
diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
index 3d36e2321..f4afee0b4 100644
--- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
+++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html
@@ -39,7 +39,8 @@
{{ 'addon.competency.competenciesmostoftennotproficientincourse' | translate }}
@@ -67,7 +68,8 @@
[attr.aria-label]="competency.competency.shortname" detail="true" button>
- {{competency.competency.shortname}} {{competency.competency.idnumber}}
+
+ {{competency.competency.idnumber}}
- {{ competency.comppath.framework.name }}
+
+
- {{ competency.comppath.framework.name }}
+
+
/
- {{ ancestor.name }}
+
+
+
+
/
diff --git a/src/addons/competency/pages/plan/plan.html b/src/addons/competency/pages/plan/plan.html
index ec42cb599..5090642c4 100644
--- a/src/addons/competency/pages/plan/plan.html
+++ b/src/addons/competency/pages/plan/plan.html
@@ -4,7 +4,10 @@
- {{plan.plan.name}}
+
+
+
+
@@ -46,7 +49,10 @@
{{ 'addon.competency.template' | translate }}
- {{ plan.plan.template.shortname }}
+
+
+
+
@@ -77,7 +83,11 @@
- {{competency.competency.shortname}} {{competency.competency.idnumber}}
+
+
+ {{competency.competency.idnumber}}
+
diff --git a/src/addons/competency/pages/planlist/planlist.html b/src/addons/competency/pages/planlist/planlist.html
index 214120779..c1959b4a9 100644
--- a/src/addons/competency/pages/planlist/planlist.html
+++ b/src/addons/competency/pages/planlist/planlist.html
@@ -21,7 +21,10 @@
- {{ plan.name }}
+
+
+
+
0">
{{ 'addon.competency.duedate' | translate }}:
{{ plan.duedate * 1000 | coreFormatDate :'strftimedatetimeshort' }}
diff --git a/src/addons/competency/pages/planlist/planlist.ts b/src/addons/competency/pages/planlist/planlist.ts
index 991aa9690..db2030b98 100644
--- a/src/addons/competency/pages/planlist/planlist.ts
+++ b/src/addons/competency/pages/planlist/planlist.ts
@@ -41,14 +41,12 @@ export class AddonCompetencyPlanListPage implements AfterViewInit, OnDestroy {
protected logView: () => void;
constructor() {
- const userId = CoreNavigator.getRouteNumberParam('userId');
+ const userId = CoreNavigator.getRouteNumberParam('userId') ?? CoreSites.getCurrentSiteUserId();
const source = CoreRoutedItemsManagerSourcesTracker.getOrCreateSource(AddonCompetencyPlansSource, [userId]);
this.plans = new CoreListItemsManager(source, AddonCompetencyPlanListPage);
this.logView = CoreTime.once(async () => {
- const userId = source.USER_ID ?? CoreSites.getCurrentSiteId();
-
CoreAnalytics.logEvent({
type: CoreAnalyticsEventType.VIEW_ITEM_LIST,
ws: 'tool_lp_data_for_plans_page',