diff --git a/src/addon/block/myoverview/components/myoverview/myoverview.ts b/src/addon/block/myoverview/components/myoverview/myoverview.ts index 690c590a8..7e1668566 100644 --- a/src/addon/block/myoverview/components/myoverview/myoverview.ts +++ b/src/addon/block/myoverview/components/myoverview/myoverview.ts @@ -66,6 +66,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem protected prefetchIconsInitialized = false; protected isDestroyed; protected updateSiteObserver; + protected coursesObserver; protected courseIds = []; protected fetchContentDefaultError = 'Error getting my overview data.'; @@ -96,6 +97,10 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem } }); + this.coursesObserver = this.eventsProvider.on(CoreCoursesProvider.EVENT_MY_COURSES_UPDATED, () => { + this.refreshContent(); + }, this.sitesProvider.getCurrentSiteId()); + this.currentSite = this.sitesProvider.getCurrentSite(); const promises = []; @@ -326,6 +331,7 @@ export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implem */ ngOnDestroy(): void { this.isDestroyed = true; + this.coursesObserver && this.coursesObserver.off(); this.updateSiteObserver && this.updateSiteObserver.off(); } } diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json index 78a3ff5f5..1b99a5363 100644 --- a/src/assets/lang/en.json +++ b/src/assets/lang/en.json @@ -1188,6 +1188,7 @@ "core.courses.errorselfenrol": "An error occurred while self enrolling.", "core.courses.filtermycourses": "Filter my courses", "core.courses.frontpage": "Front page", + "core.courses.hidecourse": "Hide from view", "core.courses.mycourses": "My courses", "core.courses.mymoodle": "Dashboard", "core.courses.nocourses": "No course information to show.", @@ -1203,6 +1204,7 @@ "core.courses.searchcoursesadvice": "You can use the search courses button to find courses to access as a guest or enrol yourself in courses that allow it.", "core.courses.selfenrolment": "Self enrolment", "core.courses.sendpaymentbutton": "Send payment via PayPal", + "core.courses.show": "Show this course", "core.courses.totalcoursesearchresults": "Total courses: {{$a}}", "core.currentdevice": "Current device", "core.datastoredoffline": "Data stored in the device because it couldn't be sent. It will be sent automatically later.", diff --git a/src/core/courses/components/components.module.ts b/src/core/courses/components/components.module.ts index 14ce35cbc..45b2671cb 100644 --- a/src/core/courses/components/components.module.ts +++ b/src/core/courses/components/components.module.ts @@ -21,11 +21,13 @@ import { CoreDirectivesModule } from '@directives/directives.module'; import { CorePipesModule } from '@pipes/pipes.module'; import { CoreCoursesCourseProgressComponent } from '../components/course-progress/course-progress'; import { CoreCoursesCourseListItemComponent } from '../components/course-list-item/course-list-item'; +import { CoreCoursesCourseOptionsMenuComponent } from '../components/course-options-menu/course-options-menu'; @NgModule({ declarations: [ CoreCoursesCourseProgressComponent, - CoreCoursesCourseListItemComponent + CoreCoursesCourseListItemComponent, + CoreCoursesCourseOptionsMenuComponent ], imports: [ CommonModule, @@ -39,7 +41,11 @@ import { CoreCoursesCourseListItemComponent } from '../components/course-list-it ], exports: [ CoreCoursesCourseProgressComponent, - CoreCoursesCourseListItemComponent + CoreCoursesCourseListItemComponent, + CoreCoursesCourseOptionsMenuComponent + ], + entryComponents: [ + CoreCoursesCourseOptionsMenuComponent ] }) export class CoreCoursesComponentsModule {} diff --git a/src/core/courses/components/course-options-menu/core-courses-course-options-menu.html b/src/core/courses/components/course-options-menu/core-courses-course-options-menu.html new file mode 100644 index 000000000..ffe8a19dd --- /dev/null +++ b/src/core/courses/components/course-options-menu/core-courses-course-options-menu.html @@ -0,0 +1,13 @@ + + +

{{ prefetch.title | translate }}

+ + + +

{{ 'core.courses.hidecourse' | translate }}

+ + + +

{{ 'core.courses.show' | translate }}

+ + diff --git a/src/core/courses/components/course-options-menu/course-options-menu.ts b/src/core/courses/components/course-options-menu/course-options-menu.ts new file mode 100644 index 000000000..a63dbedf5 --- /dev/null +++ b/src/core/courses/components/course-options-menu/course-options-menu.ts @@ -0,0 +1,51 @@ +// (C) Copyright 2015 Martin Dougiamas +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { Component, OnInit } from '@angular/core'; +import { NavParams, ViewController } from 'ionic-angular'; +import { CoreCoursesProvider } from '../../providers/courses'; + +/** + * This component is meant to display a popover with the course options. + */ +@Component({ + selector: 'core-courses-course-options-menu', + templateUrl: 'core-courses-course-options-menu.html' +}) +export class CoreCoursesCourseOptionsMenuComponent implements OnInit { + course: any; // The course. + prefetch: any; // The prefecth info. + + downloadCourseEnabled: boolean; + + constructor(navParams: NavParams, private viewCtrl: ViewController, private coursesProvider: CoreCoursesProvider) { + this.course = navParams.get('course') || {}; + this.prefetch = navParams.get('prefetch') || {}; + } + + /** + * Component being initialized. + */ + ngOnInit(): void { + this.downloadCourseEnabled = !this.coursesProvider.isDownloadCourseDisabledInSite(); + } + + /** + * Do an action over the course. + * @param {string} action Action name to take. + */ + action(action: string): void { + this.viewCtrl.dismiss(action); + } +} diff --git a/src/core/courses/components/course-progress/core-courses-course-progress.html b/src/core/courses/components/course-progress/core-courses-course-progress.html index df001f2b0..55339fdfa 100644 --- a/src/core/courses/components/course-progress/core-courses-course-progress.html +++ b/src/core/courses/components/course-progress/core-courses-course-progress.html @@ -3,10 +3,10 @@ - +

-