EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3930 h5pactivity: Support links to all users attempts

main
Dani Palou 2022-03-08 15:51:42 +01:00
parent 71f65cec07
commit d10fa5db3c
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/addons/mod/h5pactivity/services/handlers/report-link.ts
View File

@ -20,6 +20,7 @@ import { CoreCourse } from '@features/course/services/course';
import { CoreNavigator } from '@services/navigator'; import { CoreNavigator } from '@services/navigator';
import { CoreSites, CoreSitesReadingStrategy } from '@services/sites'; import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
import { CoreDomUtils } from '@services/utils/dom'; import { CoreDomUtils } from '@services/utils/dom';
import { CoreUtils } from '@services/utils/utils';
import { makeSingleton } from '@singletons'; import { makeSingleton } from '@singletons';
import { AddonModH5PActivity } from '../h5pactivity'; import { AddonModH5PActivity } from '../h5pactivity';
import { AddonModH5PActivityModuleHandlerService } from './module'; import { AddonModH5PActivityModuleHandlerService } from './module';
@ -60,7 +61,7 @@ export class AddonModH5PActivityReportLinkHandlerService extends CoreContentLink
} else { } else {
const userId = params.userid ? Number(params.userid) : undefined; const userId = params.userid ? Number(params.userid) : undefined;
this.openUserAttempts(module.id, module.course, siteId, userId); await this.openUserAttempts(module.id, module.course, instanceId, siteId, userId);
} }
} catch (error) { } catch (error) {
CoreDomUtils.showErrorModalDefault(error, 'Error processing link.'); CoreDomUtils.showErrorModalDefault(error, 'Error processing link.');
@ -100,13 +101,35 @@ export class AddonModH5PActivityReportLinkHandlerService extends CoreContentLink
* *
* @param cmId Module ID. * @param cmId Module ID.
* @param courseId Course ID. * @param courseId Course ID.
* @param id Instance ID.
* @param siteId Site ID. * @param siteId Site ID.
* @param userId User ID. If not defined, current user in site. * @param userId User ID. If not defined, current user in site.
* @return Promise resolved when done. * @return Promise resolved when done.
*/ */
protected openUserAttempts(cmId: number, courseId: number, siteId: string, userId?: number): void { protected async openUserAttempts(cmId: number, courseId: number, id: number, siteId: string, userId?: number): Promise<void> {
userId = userId || CoreSites.getCurrentSiteUserId(); let canViewAllAttempts = false;
const path = AddonModH5PActivityModuleHandlerService.PAGE_NAME + `/${courseId}/${cmId}/userattempts/${userId}`;
if (!userId) {
// No user ID specified. Check if current user can view all attempts.
userId = CoreSites.getCurrentSiteUserId();
canViewAllAttempts = await AddonModH5PActivity.canGetUsersAttempts(siteId);
if (canViewAllAttempts) {
const accessInfo = await CoreUtils.ignoreErrors(AddonModH5PActivity.getAccessInformation(id, {
cmId,
siteId,
}));
canViewAllAttempts = !!accessInfo?.canreviewattempts;
}
}
let path: string;
if (canViewAllAttempts) {
path = `${AddonModH5PActivityModuleHandlerService.PAGE_NAME}/${courseId}/${cmId}/users`;
} else {
path = `${AddonModH5PActivityModuleHandlerService.PAGE_NAME}/${courseId}/${cmId}/userattempts/${userId}`;
}
CoreNavigator.navigateToSitePath(path, { CoreNavigator.navigateToSitePath(path, {
siteId, siteId,