diff --git a/src/app/content-answer.service.ts b/src/app/content-answer.service.ts index e414d1d2ac4bcfa1eec16cea94ad9624f84f5eb6..35c6e2419f88bec8fe68bc1a6c03972d071913a3 100644 --- a/src/app/content-answer.service.ts +++ b/src/app/content-answer.service.ts @@ -16,8 +16,9 @@ export class ContentAnswerService extends ErrorHandlingService { super(); } - getAnswerTexts(): Observable<AnswerText[]> { - return this.http.get<AnswerText[]>(this.answerUrl).pipe( + getAnswerTexts(contentId: string): Observable<AnswerText[]> { + const url = `${this.answerUrl}/?contentId=${contentId}`; + return this.http.get<AnswerText[]>(url).pipe( catchError(this.handleError('getAnswerTexts', [])) ); } diff --git a/src/app/content-answers-list/content-answers-list.component.ts b/src/app/content-answers-list/content-answers-list.component.ts index c9524b968505a465e2b0b841cf3f7dfe580a031f..ef2df1a523d50da21a770714a985b066b40072dc 100644 --- a/src/app/content-answers-list/content-answers-list.component.ts +++ b/src/app/content-answers-list/content-answers-list.component.ts @@ -1,6 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { ContentAnswerService } from '../content-answer.service'; import { AnswerText } from '../answer-text'; +import { ActivatedRoute } from '@angular/router'; +import { ContentService } from '../content.service'; @Component({ selector: 'app-content-answers-list', @@ -10,15 +12,27 @@ import { AnswerText } from '../answer-text'; export class ContentAnswersListComponent implements OnInit { textAnswers: AnswerText[]; - constructor(private contentAnswerService: ContentAnswerService) { } + constructor( + private contentService: ContentService, + private contentAnswerService: ContentAnswerService, + private route: ActivatedRoute + ) { } ngOnInit() { - this.getAnswerTexts(); + this.route.params.subscribe(params => { + this.getContent(params['id']); + }); } - getAnswerTexts(): void { - this.contentAnswerService.getAnswerTexts(). - subscribe(textAnswers => { + getContent(id: string): void { + this.contentService.getContent(id).subscribe(params => { + this.getAnswerTexts(params['id']); + }) + } + + getAnswerTexts(id: string): void { + this.contentAnswerService.getAnswerTexts(id) + .subscribe(textAnswers => { this.textAnswers = textAnswers; }); } diff --git a/src/app/in-memory-data.service.ts b/src/app/in-memory-data.service.ts index 49a107eacb6d9164fb6db63960061a076ba4a6d1..85bb2914a07c328290ca00f4e5cd6644a1171e6b 100644 --- a/src/app/in-memory-data.service.ts +++ b/src/app/in-memory-data.service.ts @@ -107,7 +107,7 @@ export class InMemoryDataService implements InMemoryDbService { { id: '1', revision: '1', - contendId: '1', + contentId: '1', round: '1', subject: 'Textaufgabe 1', body: 'gamma, delta', @@ -117,7 +117,7 @@ export class InMemoryDataService implements InMemoryDbService { { id: '1', revision: '1', - contendId: '1', + contentId: '1', round: '1', subject: 'Textaufgabe 1', body: 'epsilon, phi', @@ -127,7 +127,7 @@ export class InMemoryDataService implements InMemoryDbService { { id: '2', revision: '2', - contendId: '2', + contentId: '2', round: '3', subject: 'Textaufgabe 2', body: 'Der Turm ist 20m hoch',