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

MOBILE-1927 calendar: Display group name in event

Browse Source
This commit is contained in:
Dani Palou 2019-06-21 08:13:22 +02:00
parent cfaaefc184
commit 5a9a7b1a11
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/addon/calendar/pages/event/event.html
View File

@ -26,6 +26,10 @@
<h2>{{ 'core.course' | translate}}</h2> <h2>{{ 'core.course' | translate}}</h2>
<p><core-format-text [text]="courseName"></core-format-text></p> <p><core-format-text [text]="courseName"></core-format-text></p>
</a> </a>
<a ion-item text-wrap *ngIf="groupName">
<h2>{{ 'core.group' | translate}}</h2>
<p>{{ groupName }}</p>
</a>
<a ion-item text-wrap *ngIf="categoryPath"> <a ion-item text-wrap *ngIf="categoryPath">
<h2>{{ 'core.category' | translate}}</h2> <h2>{{ 'core.category' | translate}}</h2>
<p><core-format-text [text]="categoryPath"></core-format-text></p> <p><core-format-text [text]="categoryPath"></core-format-text></p>

20
src/addon/calendar/pages/event/event.ts
View File

@ -24,6 +24,7 @@ import { CoreSitesProvider } from '@providers/sites';
import { CoreLocalNotificationsProvider } from '@providers/local-notifications'; import { CoreLocalNotificationsProvider } from '@providers/local-notifications';
import { CoreCourseProvider } from '@core/course/providers/course'; import { CoreCourseProvider } from '@core/course/providers/course';
import { CoreTimeUtilsProvider } from '@providers/utils/time'; import { CoreTimeUtilsProvider } from '@providers/utils/time';
import { CoreGroupsProvider } from '@providers/groups';
/** /**
* Page that displays a single calendar event. * Page that displays a single calendar event.
@ -46,6 +47,7 @@ export class AddonCalendarEventPage {
event: any = {}; event: any = {};
title: string; title: string;
courseName: string; courseName: string;
groupName: string;
courseUrl = ''; courseUrl = '';
notificationsEnabled = false; notificationsEnabled = false;
moduleUrl = ''; moduleUrl = '';
@ -58,7 +60,8 @@ export class AddonCalendarEventPage {
private domUtils: CoreDomUtilsProvider, private coursesProvider: CoreCoursesProvider, private domUtils: CoreDomUtilsProvider, private coursesProvider: CoreCoursesProvider,
private calendarHelper: AddonCalendarHelperProvider, private sitesProvider: CoreSitesProvider, private calendarHelper: AddonCalendarHelperProvider, private sitesProvider: CoreSitesProvider,
localNotificationsProvider: CoreLocalNotificationsProvider, private courseProvider: CoreCourseProvider, localNotificationsProvider: CoreLocalNotificationsProvider, private courseProvider: CoreCourseProvider,
private textUtils: CoreTextUtilsProvider, private timeUtils: CoreTimeUtilsProvider) { private textUtils: CoreTextUtilsProvider, private timeUtils: CoreTimeUtilsProvider,
private groupsProvider: CoreGroupsProvider) {
this.eventId = navParams.get('id'); this.eventId = navParams.get('id');
this.notificationsEnabled = localNotificationsProvider.isAvailable(); this.notificationsEnabled = localNotificationsProvider.isAvailable();
@ -165,6 +168,21 @@ export class AddonCalendarEventPage {
})); }));
} }
// If it's a group event, get the name of the group.
const courseId = canGetById && event.course ? event.course.id : event.courseid;
if (courseId && event.groupid) {
promises.push(this.groupsProvider.getUserGroupsInCourse(event.courseid).then((groups) => {
const group = groups.find((group) => {
return group.id == event.groupid;
});
this.groupName = group ? group.name : '';
}).catch(() => {
// Error getting groups, just don't show the group name.
this.groupName = '';
}));
}
if (canGetById && event.iscategoryevent) { if (canGetById && event.iscategoryevent) {
this.categoryPath = event.category.nestedname; this.categoryPath = event.category.nestedname;
} }