From 105a16c9290537798340025b5f1ddc2b24dfb9e6 Mon Sep 17 00:00:00 2001
From: Hagen <hagen.dressler@mni.thm.de>
Date: Wed, 14 Mar 2018 15:47:52 +0100
Subject: [PATCH] Edit component answer-statistic (get Answers)
---
.../answer-statistics.component.ts | 17 ++++++++++++++---
src/app/in-memory-data.service.ts | 8 ++++----
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/app/answer-statistics/answer-statistics.component.ts b/src/app/answer-statistics/answer-statistics.component.ts
index e916c0fe4..ce5fa1f39 100644
--- a/src/app/answer-statistics/answer-statistics.component.ts
+++ b/src/app/answer-statistics/answer-statistics.component.ts
@@ -3,8 +3,8 @@ import { ActivatedRoute } from '@angular/router';
import { RoomService } from '../room.service';
import { Content } from '../content';
import { ContentService } from '../content.service';
-import { AnswerText } from '../answer-text';
import { ContentAnswerService } from '../content-answer.service';
+import { AnswerText } from '../answer-text';
@Component({
selector: 'app-answer-statistics',
@@ -13,6 +13,7 @@ import { ContentAnswerService } from '../content-answer.service';
})
export class AnswerStatisticsComponent implements OnInit {
@Input() content: Content[];
+ @Input() answers: AnswerText[] = [];
statistics: any = null;
states = [
{ value: '1', viewValue: 'Responded' },
@@ -24,7 +25,7 @@ export class AnswerStatisticsComponent implements OnInit {
private route: ActivatedRoute,
private roomService: RoomService,
private contentService: ContentService,
- private contentAnswer: ContentAnswerService ) { }
+ private contentAnswerService: ContentAnswerService ) { }
ngOnInit(): void {
this.route.params.subscribe(params => {
@@ -33,10 +34,20 @@ export class AnswerStatisticsComponent implements OnInit {
}
getContent(roomId: string): void {
- this.contentService.getContents(roomId).subscribe(content => this.content = content);
+ this.contentService.getContents(roomId).subscribe(content => {
+ this.content = content;
+ this.getAnswers();
+ });
+ }
+
+ getAnswers(): void {
+ for (const question of this.content) {
+ this.contentAnswerService.getAnswerTexts(question.id).subscribe( answer => [].push.apply(this.answers, answer));
+ }
}
showStatistic(value) {
+ console.log(this.answers);
this.statistics = [];
for (const question of this.content) {
this.statistics.push( {
diff --git a/src/app/in-memory-data.service.ts b/src/app/in-memory-data.service.ts
index 855b34a53..ba7b759a3 100644
--- a/src/app/in-memory-data.service.ts
+++ b/src/app/in-memory-data.service.ts
@@ -145,8 +145,8 @@ export class InMemoryDataService implements InMemoryDbService {
creationTimestamp: Date,
},
{
- id: '1',
- revision: '1',
+ id: '2',
+ revision: '2',
contentId: '1',
round: '1',
subject: 'Textaufgabe 1',
@@ -155,8 +155,8 @@ export class InMemoryDataService implements InMemoryDbService {
creationTimestamp: Date,
},
{
- id: '2',
- revision: '2',
+ id: '3',
+ revision: '3',
contentId: '2',
round: '3',
subject: 'Textaufgabe 2',
--
GitLab