MOBILE-4081 completion: Add link handler to block completion status

main
Pau Ferrer Ocaña 2022-11-25 23:06:44 +01:00
parent fed0239c72
commit ebc0344c60
5 changed files with 95 additions and 1 deletions

View File

@ -14,11 +14,13 @@
import { APP_INITIALIZER, NgModule, Type } from '@angular/core'; import { APP_INITIALIZER, NgModule, Type } from '@angular/core';
import { Routes } from '@angular/router'; import { Routes } from '@angular/router';
import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
import { CoreCourseIndexRoutingModule } from '@features/course/pages/index/index-routing.module'; import { CoreCourseIndexRoutingModule } from '@features/course/pages/index/index-routing.module';
import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate'; import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate';
import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-routing.module'; import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-routing.module';
import { CoreUserDelegate } from '@features/user/services/user-delegate'; import { CoreUserDelegate } from '@features/user/services/user-delegate';
import { AddonCourseCompletionProvider } from './services/coursecompletion'; import { AddonCourseCompletionProvider } from './services/coursecompletion';
import { AddonCourseCompletionStatusLinkHandler } from './services/handlers/completionstatus-link';
import { AddonCourseCompletionCourseOptionHandler } from './services/handlers/course-option'; import { AddonCourseCompletionCourseOptionHandler } from './services/handlers/course-option';
import { AddonCourseCompletionUserHandler } from './services/handlers/user'; import { AddonCourseCompletionUserHandler } from './services/handlers/user';
@ -45,6 +47,7 @@ const routes: Routes = [
useValue: () => { useValue: () => {
CoreUserDelegate.registerHandler(AddonCourseCompletionUserHandler.instance); CoreUserDelegate.registerHandler(AddonCourseCompletionUserHandler.instance);
CoreCourseOptionsDelegate.registerHandler(AddonCourseCompletionCourseOptionHandler.instance); CoreCourseOptionsDelegate.registerHandler(AddonCourseCompletionCourseOptionHandler.instance);
CoreContentLinksDelegate.registerHandler(AddonCourseCompletionStatusLinkHandler.instance);
}, },
}, },
], ],

View File

@ -13,6 +13,13 @@
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content> <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
</ion-refresher> </ion-refresher>
<core-loading [hideUntil]="completionLoaded"> <core-loading [hideUntil]="completionLoaded">
<ion-item class="ion-text-wrap" *ngIf="user">
<core-user-avatar [user]="user" [courseId]="courseId" slot="start" [linkProfile]="false"></core-user-avatar>
<ion-label>
<h2>{{user!.fullname}}</h2>
</ion-label>
</ion-item>
<ion-card *ngIf="completion && tracked"> <ion-card *ngIf="completion && tracked">
<ion-item class="ion-text-wrap"> <ion-item class="ion-text-wrap">
<ion-label> <ion-label>

View File

@ -17,6 +17,7 @@ import {
AddonCourseCompletionCourseCompletionStatus, AddonCourseCompletionCourseCompletionStatus,
} from '@addons/coursecompletion/services/coursecompletion'; } from '@addons/coursecompletion/services/coursecompletion';
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { CoreUser, CoreUserProfile } from '@features/user/services/user';
import { IonRefresher } from '@ionic/angular'; import { IonRefresher } from '@ionic/angular';
import { CoreNavigator } from '@services/navigator'; import { CoreNavigator } from '@services/navigator';
import { CoreSites } from '@services/sites'; import { CoreSites } from '@services/sites';
@ -39,6 +40,7 @@ export class AddonCourseCompletionReportPage implements OnInit {
showSelfComplete = false; showSelfComplete = false;
tracked = true; // Whether completion is tracked. tracked = true; // Whether completion is tracked.
statusText?: string; statusText?: string;
user?: CoreUserProfile;
/** /**
* @inheritdoc * @inheritdoc
@ -67,6 +69,8 @@ export class AddonCourseCompletionReportPage implements OnInit {
*/ */
protected async fetchCompletion(): Promise<void> { protected async fetchCompletion(): Promise<void> {
try { try {
this.user = await CoreUser.getProfile(this.userId, this.courseId, true);
this.completion = await AddonCourseCompletion.getCompletion(this.courseId, this.userId); this.completion = await AddonCourseCompletion.getCompletion(this.courseId, this.userId);
this.statusText = AddonCourseCompletion.getCompletedStatusText(this.completion); this.statusText = AddonCourseCompletion.getCompletedStatusText(this.completion);

View File

@ -224,7 +224,7 @@ export class AddonCourseCompletionProvider {
// Check if user wants to view his own completion. // Check if user wants to view his own completion.
try { try {
if (!userId || userId == currentUserId) { if (!userId || userId === currentUserId) {
// Viewing own completion. Get the course to check if it has completion criteria. // Viewing own completion. Get the course to check if it has completion criteria.
const course = await CoreCourses.getUserCourse(courseId, true); const course = await CoreCourses.getUserCourse(courseId, true);

View File

@ -0,0 +1,80 @@
// (C) Copyright 2015 Moodle Pty Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
import { Injectable } from '@angular/core';
import { CoreContentLinksHandlerBase } from '@features/contentlinks/classes/base-handler';
import { CoreContentLinksAction } from '@features/contentlinks/services/contentlinks-delegate';
import { CoreNavigator } from '@services/navigator';
import { CoreSites } from '@services/sites';
import { makeSingleton } from '@singletons';
import { AddonCourseCompletion } from '../coursecompletion';
/**
* Handler to treat links to user course completion status.
*/
@Injectable({ providedIn: 'root' })
export class AddonCourseCompletionStatusLinkHandlerService extends CoreContentLinksHandlerBase {
name = 'AddonCourseCompletionStatusLinkHandler';
pattern = /\/blocks\/completionstatus\/details\.php.*([?&](course|user)=\d+)/;
/**
* @inheritdoc
*/
getActions(
siteIds: string[],
url: string,
params: Record<string, string>,
): CoreContentLinksAction[] | Promise<CoreContentLinksAction[]> {
return [{
action: async (siteId): Promise<void> => {
let userId = params.user ? parseInt(params.user, 10) : undefined;
const courseId = parseInt(params.course, 10);
if (!userId) {
const site = await CoreSites.getSite(siteId);
userId = site.getUserId();
}
const pageParams = {
courseId,
userId,
};
CoreNavigator.navigateToSitePath(
'/coursecompletion',
{ params: pageParams, siteId },
);
},
}];
}
/**
* @inheritdoc
*/
async isEnabled(siteId: string, url: string, params: Record<string, string>): Promise<boolean> {
let userId = params.user ? parseInt(params.user, 10) : undefined;
const courseId = parseInt(params.course, 10);
if (!userId) {
const site = await CoreSites.getSite(siteId);
userId = site.getUserId();
}
return AddonCourseCompletion.isPluginViewEnabledForUser(courseId, userId, siteId);
}
}
export const AddonCourseCompletionStatusLinkHandler = makeSingleton(AddonCourseCompletionStatusLinkHandlerService);