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

MOBILE-4009 course: Fix enrolment WS types

main
Noel De Martin 2023-07-11 14:53:59 +02:00
parent e3b8d74b0d
commit 834743f096
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/features/course/pages/course-summary/course-summary.page.ts
View File

@ -144,7 +144,7 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
// Don't allow guest access if it requires a password if not supported. // Don't allow guest access if it requires a password if not supported.
this.guestAccessPasswordRequired = info.passwordrequired; this.guestAccessPasswordRequired = info.passwordrequired;
return info.status === true && (!info.passwordrequired || CoreCourses.isValidateGuestAccessPasswordAvailable()); return info.status && (!info.passwordrequired || CoreCourses.isValidateGuestAccessPasswordAvailable());
} }
/** /**
@ -193,7 +193,7 @@ export class CoreCourseSummaryPage implements OnInit, OnDestroy {
const enrolmentMethods = await CoreCourses.getCourseEnrolmentMethods(this.courseId); const enrolmentMethods = await CoreCourses.getCourseEnrolmentMethods(this.courseId);
enrolmentMethods.forEach((method) => { enrolmentMethods.forEach((method) => {
if (!method.status) { if (!CoreUtils.isTrueOrOne(method.status)) {
return; return;
} }

3
src/core/features/course/services/course-helper.ts
View File

@ -634,8 +634,7 @@ export class CoreCourseHelperProvider {
// Don't allow guest access if it requires a password and it's available. // Don't allow guest access if it requires a password and it's available.
return { return {
guestAccess: info.status === true && guestAccess: info.status && (!info.passwordrequired || CoreCourses.isValidateGuestAccessPasswordAvailable()),
(!info.passwordrequired || CoreCourses.isValidateGuestAccessPasswordAvailable()),
passwordRequired: info.passwordrequired, passwordRequired: info.passwordrequired,
}; };
} catch { } catch {

3
src/core/features/courses/services/courses.ts
View File

@ -1827,7 +1827,6 @@ export type CoreCourseEnrolmentInfo = {
courseid: number; // Id of course. courseid: number; // Id of course.
type: string; // Type of enrolment plugin. type: string; // Type of enrolment plugin.
name: string; // Name of enrolment plugin. name: string; // Name of enrolment plugin.
status: boolean | string; // Available status of enrolment plugin. True if successful, else error message or false.
}; };
/** /**
@ -1835,6 +1834,7 @@ export type CoreCourseEnrolmentInfo = {
*/ */
export type CoreCourseEnrolmentMethod = CoreCourseEnrolmentInfo & { export type CoreCourseEnrolmentMethod = CoreCourseEnrolmentInfo & {
wsfunction?: string; // Webservice function to get more information. wsfunction?: string; // Webservice function to get more information.
status: string; // Status of enrolment plugin. True if successful, else error message or false.
}; };
/** /**
@ -1877,6 +1877,7 @@ export type CoreCourseGetRecentCoursesOptions = CoreSitesCommonWSOptions & {
*/ */
export type CoreCourseEnrolmentGuestMethod = CoreCourseEnrolmentInfo & { export type CoreCourseEnrolmentGuestMethod = CoreCourseEnrolmentInfo & {
passwordrequired: boolean; // Is a password required? passwordrequired: boolean; // Is a password required?
status: boolean; // Is the enrolment enabled?
}; };
/** /**

2
src/core/features/courses/services/handlers/course-link.ts
View File

@ -241,7 +241,7 @@ export class CoreCoursesCourseLinkHandlerService extends CoreContentLinksHandler
let isSelfEnrolEnabled = false; let isSelfEnrolEnabled = false;
let instances = 0; let instances = 0;
methods.forEach((method) => { methods.forEach((method) => {
if (method.type == 'self' && method.status) { if (method.type == 'self' && CoreUtils.isTrueOrOne(method.status)) {
isSelfEnrolEnabled = true; isSelfEnrolEnabled = true;
instances++; instances++;
} }