CIT/Vmeda.Online
3
0
Fork 1
forked from EVOgeek/Vmeda.Online
Code Pull Requests Activity

Merge pull request #1891 from crazyserver/MOBILE-2945

Browse Source 
MOBILE-2945 course: Display course custom fields in preview page
This commit is contained in:
Juan Leyva 2019-05-07 19:59:35 +02:00 committed by GitHub
commit 7790807906
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/courses/pages/course-preview/course-preview.html
View File

@ -32,6 +32,16 @@
</a> </a>
<ion-item-divider></ion-item-divider> <ion-item-divider></ion-item-divider>
</ng-container> </ng-container>
<ion-item text-wrap *ngIf="course.customfields" detail-none>
<ng-container *ngFor="let field of course.customfields">
<div *ngIf="field.value" class="core-customfield core-customfield_{{field.type}} core-customfield_{{field.shortname}}">
<span class="core-customfieldname"><core-format-text [text]="field.name"></core-format-text></span><span class="core-customfieldseparator">: </span>
<span class="core-customfieldvalue"><core-format-text [text]="field.value" maxHeight="120"></core-format-text></span>
</div>
</ng-container>
</ion-item>
<core-file *ngFor="let file of course.overviewfiles" [file]="file" [component]="component" [componentId]="course.id"></core-file> <core-file *ngFor="let file of course.overviewfiles" [file]="file" [component]="component" [componentId]="course.id"></core-file>
<div *ngIf="!isEnrolled" detail-none> <div *ngIf="!isEnrolled" detail-none>
<ion-item text-wrap *ngFor="let instance of selfEnrolInstances"> <ion-item text-wrap *ngFor="let instance of selfEnrolInstances">

4
src/core/courses/pages/course-preview/course-preview.scss
View File

@ -15,4 +15,8 @@ ion-app.app-root page-core-courses-course-preview {
width: 100%; width: 100%;
} }
} }
.core-customfieldvalue core-format-text {
display: inline;
}
} }

15
src/core/courses/pages/course-preview/course-preview.ts
View File

@ -233,6 +233,18 @@ export class CoreCoursesCoursePreviewPage implements OnDestroy {
this.canAccessCourse = false; this.canAccessCourse = false;
}); });
}); });
}).finally(() => {
if (!this.sitesProvider.getCurrentSite().isVersionGreaterEqualThan('3.7')) {
return this.coursesProvider.isGetCoursesByFieldAvailableInSite().then((available) => {
if (available) {
return this.coursesProvider.getCourseByField('id', this.course.id).then((course) => {
this.course.customfields = course.customfields;
});
}
}).catch(() => {
// Ignore errors.
});
}
}).finally(() => { }).finally(() => {
this.dataLoaded = true; this.dataLoaded = true;
}); });
@ -386,6 +398,9 @@ export class CoreCoursesCoursePreviewPage implements OnDestroy {
promises.push(this.coursesProvider.invalidateCourse(this.course.id)); promises.push(this.coursesProvider.invalidateCourse(this.course.id));
promises.push(this.coursesProvider.invalidateCourseEnrolmentMethods(this.course.id)); promises.push(this.coursesProvider.invalidateCourseEnrolmentMethods(this.course.id));
promises.push(this.courseOptionsDelegate.clearAndInvalidateCoursesOptions(this.course.id)); promises.push(this.courseOptionsDelegate.clearAndInvalidateCoursesOptions(this.course.id));
if (this.sitesProvider.getCurrentSite().isVersionGreaterEqualThan('3.7')) {
promises.push(this.coursesProvider.invalidateCoursesByField('id', this.course.id));
}
if (this.guestInstanceId) { if (this.guestInstanceId) {
promises.push(this.coursesProvider.invalidateCourseGuestEnrolmentInfo(this.guestInstanceId)); promises.push(this.coursesProvider.invalidateCourseGuestEnrolmentInfo(this.guestInstanceId));
} }