Mobile 2975

src/addon/block/timeline/providers/timeline.ts

@@ -14,6 +14,7 @@
 
 import { Injectable } from '@angular/core';
 import { CoreSitesProvider } from '@providers/sites';
+import { CoreCoursesDashboardProvider } from '@core/courses/providers/dashboard';
 import * as moment from 'moment';
 
 /**
@@ -26,7 +27,7 @@ export class AddonBlockTimelineProvider {
     // Cache key was maintained when moving the functions to this file. It comes from core myoverview.
     protected ROOT_CACHE_KEY = 'myoverview:';
 
-    constructor(private sitesProvider: CoreSitesProvider) { }
+    constructor(private sitesProvider: CoreSitesProvider, private dashboardProvider: CoreCoursesDashboardProvider) { }
 
     /**
      * Get calendar action events for the given course.
@@ -218,6 +219,11 @@ export class AddonBlockTimelineProvider {
      */
     isAvailable(siteId?: string): Promise<boolean> {
         return this.sitesProvider.getSite(siteId).then((site) => {
+            // First check if dashboard is disabled.
+            if (this.dashboardProvider.isDisabledInSite(site)) {
+                return false;
+            }
+
             return site.wsAvailable('core_calendar_get_action_events_by_courses') &&
                 site.wsAvailable('core_calendar_get_action_events_by_timesort');
         });

src/addon/blog/components/entries/addon-blog-entries.html

@@ -29,7 +29,7 @@ <h2>
                 </ion-item>
                 <ion-card-content>
                     <core-format-text [text]="entry.summary" [component]="this.component" [componentId]="entry.id"></core-format-text>
-                    <ion-item>
+                    <ion-item *ngIf="commentsEnabled">
                         <core-comments [component]="this.component" [itemId]="entry.id" area="format_blog" [instanceId]="entry.userid" contextLevel="user"></core-comments>
                     </ion-item>
                     <core-file *ngFor="let file of entry.attachmentfiles" [file]="file" [component]="this.component" [componentId]="entry.id"></core-file>

src/addon/blog/components/entries/entries.ts

@@ -18,6 +18,7 @@ import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreUserProvider } from '@core/user/providers/user';
 import { AddonBlogProvider } from '../../providers/blog';
+import { CoreCommentsProvider } from '@core/comments/providers/comments';
 
 /**
  * Component that displays the blog entries.
@@ -47,9 +48,11 @@ export class AddonBlogEntriesComponent implements OnInit {
     showMyIssuesToggle = false;
     onlyMyEntries = false;
     component = AddonBlogProvider.COMPONENT;
+    commentsEnabled: boolean;
 
     constructor(protected blogProvider: AddonBlogProvider, protected domUtils: CoreDomUtilsProvider,
-            protected userProvider: CoreUserProvider, sitesProvider: CoreSitesProvider) {
+            protected userProvider: CoreUserProvider, sitesProvider: CoreSitesProvider,
+            protected commentsProvider: CoreCommentsProvider) {
         this.currentUserId = sitesProvider.getCurrentSiteUserId();
     }
 
@@ -81,6 +84,8 @@ export class AddonBlogEntriesComponent implements OnInit {
             this.filter['tagid'] = this.tagId;
         }
 
+        this.commentsEnabled = !this.commentsProvider.areCommentsDisabledInSite();
+
         this.fetchEntries().then(() => {
             this.blogProvider.logView(this.filter).catch(() => {
                 // Ignore errors.

src/addon/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html

@@ -1,4 +1,4 @@
-<a ion-item text-wrap (click)="showComments()" detail-none>
+<a *ngIf="commentsEnabled" ion-item text-wrap (click)="showComments()" detail-none>
     <h2>{{plugin.name}}</h2>
     <core-comments contextLevel="module" [instanceId]="assign.cmid" component="assignsubmission_comments" [itemId]="submission.id" area="submission_comments" [title]="plugin.name"></core-comments>
 </a>

src/addon/mod/assign/submission/comments/component/comments.ts

@@ -27,8 +27,12 @@ import { AddonModAssignSubmissionPluginComponent } from '../../../classes/submis
 export class AddonModAssignSubmissionCommentsComponent extends AddonModAssignSubmissionPluginComponent {
     @ViewChild(CoreCommentsCommentsComponent) commentsComponent: CoreCommentsCommentsComponent;
 
+    commentsEnabled: boolean;
+
     constructor(protected commentsProvider: CoreCommentsProvider) {
         super();
+
+        this.commentsEnabled = !commentsProvider.areCommentsDisabledInSite();
     }
 
     /**

src/addon/mod/data/pages/entry/entry.html

@@ -31,7 +31,7 @@
         <core-rating-rate *ngIf="data && entry && ratingInfo && (!data.approval || entry.approved)" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="data.coursemodule" [itemId]="entry.id" [itemSetId]="0" [courseId]="courseId" [aggregateMethod]="data.assessed" [scaleId]="data.scale" [userId]="entry.userid" (onLoading)="setLoadingRating($event)" (onUpdate)="ratingUpdated()"></core-rating-rate>
         <core-rating-aggregate *ngIf="data && entry && ratingInfo" [ratingInfo]="ratingInfo" contextLevel="module" [instanceId]="data.coursemodule" [itemId]="entry.id" [courseId]="courseId" [aggregateMethod]="data.assessed" [scaleId]="data.scale"></core-rating-aggregate>
 
-        <ion-item *ngIf="data && entry && entry.id > 0">
+        <ion-item *ngIf="data && entry && entry.id > 0 && commentsEnabled">
             <core-comments contextLevel="module" [instanceId]="data.coursemodule" component="mod_data" [itemId]="entry.id" area="database_entry" [displaySpinner]="false" (onLoading)="setLoadingComments($event)"></core-comments>
         </ion-item>
 

src/addon/mod/data/pages/entry/entry.ts

@@ -26,6 +26,7 @@ import { AddonModDataHelperProvider } from '../../providers/helper';
 import { AddonModDataSyncProvider } from '../../providers/sync';
 import { AddonModDataFieldsDelegate } from '../../providers/fields-delegate';
 import { AddonModDataComponentsModule } from '../../components/components.module';
+import { CoreCommentsProvider } from '@core/comments/providers/comments';
 
 /**
  * Page that displays the view entry page.
@@ -68,13 +69,14 @@ export class AddonModDataEntryPage implements OnDestroy {
     jsData;
     ratingInfo: CoreRatingInfo;
     isPullingToRefresh = false; // Whether the last fetching of data was started by a pull-to-refresh action
+    commentsEnabled: boolean;
 
     constructor(params: NavParams, protected utils: CoreUtilsProvider, protected groupsProvider: CoreGroupsProvider,
             protected domUtils: CoreDomUtilsProvider, protected fieldsDelegate: AddonModDataFieldsDelegate,
             protected courseProvider: CoreCourseProvider, protected dataProvider: AddonModDataProvider,
             protected dataHelper: AddonModDataHelperProvider,
             sitesProvider: CoreSitesProvider, protected navCtrl: NavController, protected eventsProvider: CoreEventsProvider,
-            private cdr: ChangeDetectorRef) {
+            private cdr: ChangeDetectorRef, protected commentsProvider: CoreCommentsProvider) {
         this.module = params.get('module') || {};
         this.entryId = params.get('entryId') || null;
         this.courseId = params.get('courseId');
@@ -91,6 +93,7 @@ export class AddonModDataEntryPage implements OnDestroy {
      * View loaded.
      */
     ionViewDidLoad(): void {
+        this.commentsEnabled = !this.commentsProvider.areCommentsDisabledInSite();
         this.fetchEntryData();
 
         // Refresh data if this discussion is synchronized automatically.

src/classes/delegate.ts

@@ -15,6 +15,7 @@
 import { CoreLoggerProvider } from '@providers/logger';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreEventsProvider } from '@providers/events';
+import { CoreSite } from '@classes/site';
 
 export interface CoreDelegateHandler {
     /**
@@ -272,10 +273,10 @@ export class CoreDelegate {
      * Check if feature is enabled or disabled in the site, depending on the feature prefix and the handler name.
      *
      * @param  {CoreDelegateHandler} handler Handler to check.
-     * @param  {any}                 site    Site to check.
-     * @return {boolean}                     Whether is enabled or disabled in site.
+     * @param  {CoreSite} site Site to check.
+     * @return {boolean} Whether is enabled or disabled in site.
      */
-    protected isFeatureDisabled(handler: CoreDelegateHandler, site: any): boolean {
+    protected isFeatureDisabled(handler: CoreDelegateHandler, site: CoreSite): boolean {
         return typeof this.featurePrefix != 'undefined' && site.isFeatureDisabled(this.featurePrefix + handler.name);
     }
 

src/core/block/providers/delegate.ts

@@ -18,6 +18,7 @@ import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreDelegate, CoreDelegateHandler } from '@classes/delegate';
 import { CoreBlockDefaultHandler } from './default-block-handler';
+import { CoreSite } from '@classes/site';
 
 /**
  * Interface that all blocks must implement.
@@ -87,6 +88,30 @@ export class CoreBlockDelegate extends CoreDelegate {
         super('CoreBlockDelegate', logger, sitesProvider, eventsProvider);
     }
 
+    /**
+     * Check if blocks are disabled in a certain site.
+     *
+     * @param {CoreSite} [site] Site. If not defined, use current site.
+     * @return {boolean} Whether it's disabled.
+     */
+    areBlocksDisabledInSite(site?: CoreSite): boolean {
+        site = site || this.sitesProvider.getCurrentSite();
+
+        return site.isFeatureDisabled('NoDelegate_SiteBlocks');
+    }
+
+    /**
+     * Check if blocks are disabled in a certain site.
+     *
+     * @param  {string} [siteId] Site Id. If not defined, use current site.
+     * @return {Promise<boolean>}     Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     */
+    areBlocksDisabled(siteId?: string): Promise<boolean> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            return this.areBlocksDisabledInSite(site);
+        });
+    }
+
     /**
      * Get the display data for a certain block.
      *
@@ -121,4 +146,15 @@ export class CoreBlockDelegate extends CoreDelegate {
     isBlockSupported(name: string): boolean {
         return this.hasHandler(name, true);
     }
+
+    /**
+     * Check if feature is enabled or disabled in the site, depending on the feature prefix and the handler name.
+     *
+     * @param  {CoreDelegateHandler} handler Handler to check.
+     * @param  {CoreSite} site Site to check.
+     * @return {boolean} Whether is enabled or disabled in site.
+     */
+    protected isFeatureDisabled(handler: CoreDelegateHandler, site: CoreSite): boolean {
+        return this.areBlocksDisabledInSite(site) || super.isFeatureDisabled(handler, site);
+    }
 }

src/core/comments/components/comments/comments.ts

@@ -12,9 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { Component, EventEmitter, Input, OnChanges, Output, SimpleChange } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, OnDestroy, Output, SimpleChange } from '@angular/core';
 import { NavController } from 'ionic-angular';
 import { CoreCommentsProvider } from '../../providers/comments';
+import { CoreEventsProvider } from '@providers/events';
+import { CoreSitesProvider } from '@providers/sites';
 
 /**
  * Component that displays the count of comments.
@@ -23,7 +25,7 @@ import { CoreCommentsProvider } from '../../providers/comments';
     selector: 'core-comments',
     templateUrl: 'core-comments.html',
 })
-export class CoreCommentsCommentsComponent implements OnChanges {
+export class CoreCommentsCommentsComponent implements OnChanges, OnDestroy {
     @Input() contextLevel: string;
     @Input() instanceId: number;
     @Input() component: string;
@@ -36,9 +38,26 @@ export class CoreCommentsCommentsComponent implements OnChanges {
 
     commentsLoaded = false;
     commentsCount: number;
+    disabled = false;
 
-    constructor(private navCtrl: NavController, private commentsProvider: CoreCommentsProvider) {
+    protected updateSiteObserver;
+
+    constructor(private navCtrl: NavController, private commentsProvider: CoreCommentsProvider,
+            sitesProvider: CoreSitesProvider, eventsProvider: CoreEventsProvider) {
         this.onLoading = new EventEmitter<boolean>();
+
+        this.disabled = this.commentsProvider.areCommentsDisabledInSite();
+
+        // Update visibility if current site info is updated.
+        this.updateSiteObserver = eventsProvider.on(CoreEventsProvider.SITE_UPDATED, () => {
+            const wasDisabled = this.disabled;
+
+            this.disabled = this.commentsProvider.areCommentsDisabledInSite();
+
+            if (wasDisabled && !this.disabled) {
+                this.fetchData();
+            }
+        }, sitesProvider.getCurrentSiteId());
     }
 
     /**
@@ -59,6 +78,10 @@ export class CoreCommentsCommentsComponent implements OnChanges {
     }
 
     protected fetchData(): void {
+        if (this.disabled) {
+            return;
+        }
+
         this.commentsLoaded = false;
         this.onLoading.emit(true);
 
@@ -77,7 +100,7 @@ export class CoreCommentsCommentsComponent implements OnChanges {
      * Opens the comments page.
      */
     openComments(): void {
-        if (this.commentsCount > 0) {
+        if (!this.disabled && this.commentsCount > 0) {
             // Open a new state with the interpolated contents.
             this.navCtrl.push('CoreCommentsViewerPage', {
                 contextLevel: this.contextLevel,
@@ -90,4 +113,11 @@ export class CoreCommentsCommentsComponent implements OnChanges {
             });
         }
     }
+
+    /**
+     * Component destroyed.
+     */
+    ngOnDestroy(): void {
+        this.updateSiteObserver && this.updateSiteObserver.off();
+    }
 }

src/core/comments/components/comments/core-comments.html

@@ -1,4 +1,4 @@
-<core-loading [hideUntil]="commentsLoaded || !displaySpinner">
+<core-loading *ngIf="!disabled" [hideUntil]="commentsLoaded || !displaySpinner">
     <div (click)="openComments()" *ngIf="commentsCount >= 0">
         {{ 'core.commentscount' | translate : {'$a': commentsCount} }}
     </div>

src/core/comments/providers/comments.ts

@@ -14,6 +14,7 @@
 
 import { Injectable } from '@angular/core';
 import { CoreSitesProvider } from '@providers/sites';
+import { CoreSite } from '@classes/site';
 
 /**
  * Service that provides some features regarding comments.
@@ -25,6 +26,30 @@ export class CoreCommentsProvider {
 
     constructor(private sitesProvider: CoreSitesProvider) {}
 
+    /**
+     * Check if Calendar is disabled in a certain site.
+     *
+     * @param {CoreSite} [site] Site. If not defined, use current site.
+     * @return {boolean} Whether it's disabled.
+     */
+    areCommentsDisabledInSite(site?: CoreSite): boolean {
+        site = site || this.sitesProvider.getCurrentSite();
+
+        return site.isFeatureDisabled('NoDelegate_CoreComments');
+    }
+
+    /**
+     * Check if comments are disabled in a certain site.
+     *
+     * @param  {string} [siteId] Site Id. If not defined, use current site.
+     * @return {Promise<boolean>} Promise resolved with true if disabled, rejected or resolved with false otherwise.
+     */
+    areCommentsDisabled(siteId?: string): Promise<boolean> {
+        return this.sitesProvider.getSite(siteId).then((site) => {
+            return this.areCommentsDisabledInSite(site);
+        });
+    }
+
     /**
      * Get cache key for get comments data WS calls.
      *

src/core/courses/components/components.module.ts

@@ -19,15 +19,17 @@ import { TranslateModule } from '@ngx-translate/core';
 import { CoreComponentsModule } from '@components/components.module';
 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';
+import { CoreCoursesCourseProgressComponent } from './course-progress/course-progress';
+import { CoreCoursesCourseListItemComponent } from './course-list-item/course-list-item';
+import { CoreCoursesCourseOptionsMenuComponent } from './course-options-menu/course-options-menu';
+import { CoreCoursesMyCoursesComponent } from './my-courses/my-courses';
 
 @NgModule({
     declarations: [
         CoreCoursesCourseProgressComponent,
         CoreCoursesCourseListItemComponent,
-        CoreCoursesCourseOptionsMenuComponent
+        CoreCoursesCourseOptionsMenuComponent,
+        CoreCoursesMyCoursesComponent
     ],
     imports: [
         CommonModule,
@@ -42,7 +44,8 @@ import { CoreCoursesCourseOptionsMenuComponent } from '../components/course-opti
     exports: [
         CoreCoursesCourseProgressComponent,
         CoreCoursesCourseListItemComponent,
-        CoreCoursesCourseOptionsMenuComponent
+        CoreCoursesCourseOptionsMenuComponent,
+        CoreCoursesMyCoursesComponent
     ],
     entryComponents: [
         CoreCoursesCourseOptionsMenuComponent

src/core/courses/components/my-courses/my-courses.html

@@ -0,0 +1,14 @@
+<core-loading [hideUntil]="coursesLoaded">
+    <ion-searchbar #searchbar *ngIf="showFilter" [(ngModel)]="filter" (ionInput)="filterChanged($event)" (ionCancel)="filterChanged()" [placeholder]="'core.courses.filtermycourses' | translate">
+    </ion-searchbar>
+    <ion-grid no-padding>
+        <ion-row no-padding>
+            <ion-col *ngFor="let course of filteredCourses" no-padding col-12 col-sm-6 col-md-6 col-lg-4 col-xl-4 align-self-stretch>
+                <core-courses-course-progress [course]="course" class="core-courseoverview" showAll="true"></core-courses-course-progress>
+            </ion-col>
+        </ion-row>
+    </ion-grid>
+    <core-empty-box *ngIf="!courses || !courses.length" icon="ionic" [message]="'core.courses.nocourses' | translate">
+        <p *ngIf="searchEnabled">{{ 'core.courses.searchcoursesadvice' | translate }}</p>
+    </core-empty-box>
+</core-loading>