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

MOBILE-3625 sitehome: Use core-module component when needed

main
Pau Ferrer Ocaña 2021-02-01 13:44:59 +01:00
parent 83a558f3ae
commit 12db2a63f7
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/addons/block/sitemainmenu/components/components.module.ts
View File

@ -18,7 +18,7 @@ import { IonicModule } from '@ionic/angular';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { CoreSharedModule } from '@/core/shared.module'; import { CoreSharedModule } from '@/core/shared.module';
// import { CoreCourseComponentsModule } from '@features/course/components/components.module'; import { CoreCourseComponentsModule } from '@features/course/components/components.module';
import { AddonBlockSiteMainMenuComponent } from './sitemainmenu/sitemainmenu'; import { AddonBlockSiteMainMenuComponent } from './sitemainmenu/sitemainmenu';
@ -32,7 +32,7 @@ import { AddonBlockSiteMainMenuComponent } from './sitemainmenu/sitemainmenu';
IonicModule, IonicModule,
TranslateModule.forChild(), TranslateModule.forChild(),
CoreSharedModule, CoreSharedModule,
// CoreCourseComponentsModule, CoreCourseComponentsModule,
], ],
exports: [ exports: [
AddonBlockSiteMainMenuComponent, AddonBlockSiteMainMenuComponent,

4
src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html
View File

@ -12,7 +12,7 @@
</ion-label> </ion-label>
</ion-item> </ion-item>
<!--<core-course-module *ngFor="let module of mainMenuBlock.modules" [module]="module" [courseId]="siteHomeId" <core-course-module *ngFor="let module of mainMenuBlock.modules" [module]="module" [courseId]="siteHomeId"
[downloadEnabled]="downloadEnabled" [section]="mainMenuBlock"></core-course-module>--> [downloadEnabled]="downloadEnabled" [section]="mainMenuBlock"></core-course-module>
</ng-container> </ng-container>
</core-loading> </core-loading>

2
src/addons/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts
View File

@ -91,7 +91,7 @@ export class AddonBlockSiteMainMenuComponent extends CoreBlockBaseComponent impl
const items = config.frontpageloggedin.split(','); const items = config.frontpageloggedin.split(',');
const hasNewsItem = items.find((item) => parseInt(item, 10) == FrontPageItemNames['NEWS_ITEMS']); const hasNewsItem = items.find((item) => parseInt(item, 10) == FrontPageItemNames['NEWS_ITEMS']);
const result = await CoreCourseHelper.instance.addHandlerDataForModules( const result = CoreCourseHelper.instance.addHandlerDataForModules(
[mainMenuBlock], [mainMenuBlock],
this.siteHomeId, this.siteHomeId,
undefined, undefined,

11
src/core/features/sitehome/pages/index/index.html
View File

@ -20,7 +20,7 @@
<core-loading [hideUntil]="dataLoaded"> <core-loading [hideUntil]="dataLoaded">
<ion-list> <ion-list>
<!-- Site home main contents. --> <!-- Site home main contents. -->
<!-- @todo <ng-container *ngIf="section && section.hasContent"> <ng-container *ngIf="section && section.hasContent">
<ion-item class="ion-text-wrap" *ngIf="section.summary"> <ion-item class="ion-text-wrap" *ngIf="section.summary">
<core-format-text [text]="section.summary" contextLevel="course" [contextInstanceId]="siteHomeId"> <core-format-text [text]="section.summary" contextLevel="course" [contextInstanceId]="siteHomeId">
</core-format-text> </core-format-text>
@ -28,7 +28,7 @@
<core-course-module *ngFor="let module of section.modules" [module]="module" [courseId]="siteHomeId" <core-course-module *ngFor="let module of section.modules" [module]="module" [courseId]="siteHomeId"
[downloadEnabled]="downloadEnabled" [section]="section"></core-course-module> [downloadEnabled]="downloadEnabled" [section]="section"></core-course-module>
</ng-container> --> </ng-container>
<!-- Site home items: news, categories, courses, etc. --> <!-- Site home items: news, categories, courses, etc. -->
<ng-container *ngIf="items.length > 0"> <ng-container *ngIf="items.length > 0">
@ -71,11 +71,8 @@
</ng-template> </ng-template>
<ng-template #news> <ng-template #news>
<ion-item> <core-course-module class="core-sitehome-news" *ngIf="newsForumModule" [module]="newsForumModule" [courseId]="siteHomeId">
<ion-label>News (TODO)</ion-label> </core-course-module>
</ion-item>
<!-- @todo <core-course-module class="core-sitehome-news" *ngIf="newsForumModule" [module]="module" [courseId]="siteHomeId">
</core-course-module> -->
</ng-template> </ng-template>
<ng-template #categories> <ng-template #categories>

2
src/core/features/sitehome/pages/index/index.module.ts
View File

@ -20,6 +20,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { CoreSharedModule } from '@/core/shared.module'; import { CoreSharedModule } from '@/core/shared.module';
import { CoreBlockComponentsModule } from '@/core/features/block/components/components.module'; import { CoreBlockComponentsModule } from '@/core/features/block/components/components.module';
import { CoreCourseComponentsModule } from '@features/course/components/components.module';
import { CoreSiteHomeIndexPage } from '.'; import { CoreSiteHomeIndexPage } from '.';
@ -38,6 +39,7 @@ const routes: Routes = [
TranslateModule.forChild(), TranslateModule.forChild(),
CoreSharedModule, CoreSharedModule,
CoreBlockComponentsModule, CoreBlockComponentsModule,
CoreCourseComponentsModule,
], ],
declarations: [ declarations: [
CoreSiteHomeIndexPage, CoreSiteHomeIndexPage,