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

Merge pull request #3267 from dpalou/MOBILE-3833 

Mobile 3833
main
Noel De Martin 2022-04-22 10:40:32 +02:00 committed by GitHub
parent c644eeb1e1 b0f090061b
commit 5e61135dd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/langindex.json
View File

@ -461,6 +461,7 @@
"addon.mod_bigbluebuttonbn.view_message_session_started_at": "bigbluebuttonbn",
"addon.mod_bigbluebuttonbn.view_message_viewer": "bigbluebuttonbn",
"addon.mod_bigbluebuttonbn.view_message_viewers": "bigbluebuttonbn",
"addon.mod_bigbluebuttonbn.view_nojoin": "bigbluebuttonbn",
"addon.mod_book.errorchapter": "book",
"addon.mod_book.modulenameplural": "book",
"addon.mod_book.navnexttitle": "book",

22
src/addons/mod/bigbluebuttonbn/components/index/index.ts
View File

@ -81,15 +81,23 @@ export class AddonModBBBIndexComponent extends CoreCourseModuleMainActivityCompo
return;
}
this.meetingInfo = await AddonModBBB.getMeetingInfo(this.bbb.id, this.groupId, {
cmId: this.module.id,
});
try {
this.meetingInfo = await AddonModBBB.getMeetingInfo(this.bbb.id, this.groupId, {
cmId: this.module.id,
});
if (this.meetingInfo.statusrunning && this.meetingInfo.userlimit > 0) {
const count = (this.meetingInfo.participantcount || 0) + (this.meetingInfo.moderatorcount || 0);
if (count === this.meetingInfo.userlimit) {
this.meetingInfo.statusmessage = Translate.instant('addon.mod_bigbluebuttonbn.userlimitreached');
if (this.meetingInfo.statusrunning && this.meetingInfo.userlimit > 0) {
const count = (this.meetingInfo.participantcount || 0) + (this.meetingInfo.moderatorcount || 0);
if (count === this.meetingInfo.userlimit) {
this.meetingInfo.statusmessage = Translate.instant('addon.mod_bigbluebuttonbn.userlimitreached');
}
}
} catch (error) {
if (error && error.errorcode === 'restrictedcontextexception') {
error.message = Translate.instant('addon.mod_bigbluebuttonbn.view_nojoin');
}
throw error;
}
}

3
src/addons/mod/bigbluebuttonbn/lang.json
View File

@ -14,5 +14,6 @@
"view_message_moderators": "moderators",
"view_message_session_started_at": "This session started at",
"view_message_viewer": "viewer",
"view_message_viewers": "viewers"
"view_message_viewers": "viewers",
"view_nojoin": "You do not have a role that is allowed to join this session."
}

34
src/core/features/course/components/module-summary/module-summary.ts
View File

@ -174,21 +174,35 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
this.componentId = this.module.id;
this.externalUrl = this.module.url;
this.courseId = this.courseId || this.module.course;
this.modicon = await CoreCourseModuleDelegate.getModuleIconSrc(this.module.modname, this.module.modicon, this.module);
this.moduleNameTranslated = CoreCourse.translateModuleName(this.module.modname || '');
this.blog = await AddonBlog.isPluginEnabled();
await Promise.all([
this.getPackageStatus(),
this.fetchGrades(),
this.fetchCourse(),
]);
try {
await Promise.all([
this.loadModIcon(),
this.getPackageStatus(),
this.fetchGrades(),
this.fetchCourse(),
]);
} catch (error) {
CoreDomUtils.showErrorModal(error);
}
this.loaded = true;
}
/**
* Load the module icon.
*/
protected async loadModIcon(): Promise<void> {
if (!this.module) {
return;
}
this.modicon = await CoreCourseModuleDelegate.getModuleIconSrc(this.module.modname, this.module.modicon, this.module);
}
/**
* Updage package status.
*
@ -235,7 +249,11 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
return;
}
this.grades = await CoreGradesHelper.getModuleGrades(this.courseId, this.moduleId);
try {
this.grades = await CoreGradesHelper.getModuleGrades(this.courseId, this.moduleId);
} catch {
// Cannot get grades, don't display them.
}
}
/**