From b2eabf14b382f36d3a6cf417bce20965b7494261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Mon, 15 Oct 2018 14:41:40 +0200
Subject: [PATCH] Fix participant-content-view(carousel)
---
src/app/app-routing.module.ts | 8 ++++----
.../content-list/content-list.component.html | 2 +-
.../content-carousel-page.component.ts | 18 ++++++++++++++++--
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index ef545c05d..872d0538c 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -88,14 +88,14 @@ const routes: Routes = [
data: { roles: [UserRole.PARTICIPANT] }
},
{
- path: 'participant/room/:roomId/contents',
- component: ContentCarouselPageComponent,
+ path: 'participant/room/:roomId/feedback-barometer',
+ component: FeedbackBarometerPageComponent,
canActivate: [AuthenticationGuard],
data: { roles: [UserRole.PARTICIPANT] }
},
{
- path: 'participant/room/:roomId/feedback-barometer',
- component: FeedbackBarometerPageComponent,
+ path: 'participant/room/:roomId/:contentGroup',
+ component: ContentCarouselPageComponent,
canActivate: [AuthenticationGuard],
data: { roles: [UserRole.PARTICIPANT] }
},
diff --git a/src/app/components/fragments/content-list/content-list.component.html b/src/app/components/fragments/content-list/content-list.component.html
index 2210a40ad..18308555c 100644
--- a/src/app/components/fragments/content-list/content-list.component.html
+++ b/src/app/components/fragments/content-list/content-list.component.html
@@ -1,7 +1,7 @@
<div fxLayout="column" fxLayoutAlign="center" fxLayoutGap="20px" fxFill>
<div fxLayout="row" fxLayoutAlign="center">
<mat-card>
- <h3>Fragen</h3>
+ <h2>Fragen</h2>
<mat-card-actions>
<button mat-fab color="primary" matTooltip="Fragen präsentieren"
routerLink="/creator/room/{{ room.shortId }}/create-content">
diff --git a/src/app/components/pages/content-carousel-page/content-carousel-page.component.ts b/src/app/components/pages/content-carousel-page/content-carousel-page.component.ts
index 62409b074..3eae72a98 100644
--- a/src/app/components/pages/content-carousel-page/content-carousel-page.component.ts
+++ b/src/app/components/pages/content-carousel-page/content-carousel-page.component.ts
@@ -7,6 +7,18 @@ import { ContentService } from '../../../services/http/content.service';
import { ActivatedRoute } from '@angular/router';
import { Content } from '../../../models/content';
+class ContentGroup {
+ name: string;
+ contentIds: string[];
+ autoSort: boolean;
+
+ constructor(name: string, contentIds: string[], autoSort: boolean) {
+ this.name = name;
+ this.contentIds = contentIds;
+ this.autoSort = autoSort;
+ }
+}
+
@Component({
selector: 'app-content-carousel-page',
templateUrl: './content-carousel-page.component.html',
@@ -16,6 +28,7 @@ export class ContentCarouselPageComponent implements OnInit {
ContentType: typeof ContentType = ContentType;
contents: Content[];
+ contentGroup: ContentGroup;
constructor(private contentService: ContentService,
private route: ActivatedRoute) {
@@ -23,8 +36,9 @@ export class ContentCarouselPageComponent implements OnInit {
ngOnInit() {
this.route.params.subscribe(params => {
- this.contentService.getContents(params['roomId']).subscribe(result => {
- this.contents = result;
+ this.contentGroup = JSON.parse(sessionStorage.getItem('contentGroup'));
+ this.contentService.getContentsByIds(this.contentGroup.contentIds).subscribe( contents => {
+ this.contents = contents;
});
});
}
--
GitLab