Merge branch '109-content-types-classes' into 'master'

Resolve "content types (classes)"

Closes #109

See merge request swtp-block-ws17/arsnova-angular-frontend!86

src/app/answer-option.ts

 export class AnswerOption {
-  constructor(label: string, points: string) {
-   this.label = label;
-   this.points = points;
-  }
   label: string;
   points: string;
+
+  constructor(label: string, points: string) {
+    this.label = label;
+    this.points = points;
+  }
 }

src/app/app-routing.module.ts

@@ -58,7 +58,7 @@ const routes: Routes = [
     data: { roles: [UserRole.CREATOR] }
   },
   {
-    path: 'creator/room/:roomId/:id',
+    path: 'creator/room/:roomId/:contentId',
     component: ContentDetailComponent,
     canActivate: [AuthenticationGuard],
     data: { roles: [UserRole.CREATOR] }

src/app/choice-content.ts

 import { AnswerOption } from './answer-option';
-import { Content, Format } from './content';
+import { Content } from './content';
+import { ContentType } from './content-type';
 
 export class ChoiceContent extends Content {
-  constructor(roomId: string, subject: string, body: string, options: AnswerOption[], correctOptionIndexes: number[], multiple: boolean) {
-    super();
-    this.revision = '1';
-    this.roomId = roomId;
-    this.subject = subject;
-    this.body = body;
-    this.round = 1;
-    this.format = Format.CHOICE;
-    this.options = options;
-    this.correctOptionIndexes = correctOptionIndexes;
-    this.multiple = multiple;
-  }
   options: AnswerOption[];
   correctOptionIndexes: number[];
   multiple: boolean;
-}
+
+  constructor(contentId: string,
+              revision: string,
+              roomId: string,
+              subject: string,
+              body: string,
+              round: number,
+              options: AnswerOption[],
+              correctOptionIndexes: number[],
+              multiple: boolean) {
+    super(contentId,
+      revision,
+      roomId,
+      subject,
+      body,
+      round,
+      ContentType.CHOICE,
+      new Map());
+      this.options = options;
+      this.correctOptionIndexes = correctOptionIndexes;
+      this.multiple = multiple;
+    }
+  }

src/app/content-answers-list/content-answers-list.component.ts

@@ -20,18 +20,12 @@ export class ContentAnswersListComponent implements OnInit {
 
   ngOnInit() {
     this.route.params.subscribe(params => {
-      this.getContent(params['id']);
+      this.getAnswerTexts(params['contentId']);
     });
   }
 
-  getContent(id: string): void {
-    this.contentService.getContent(id).subscribe(params => {
-      this.getAnswerTexts(params['id']);
-    })
-  }
-
-  getAnswerTexts(id: string): void {
-    this.contentAnswerService.getAnswerTexts(id)
+  getAnswerTexts(contentId: string): void {
+    this.contentAnswerService.getAnswerTexts(contentId)
       .subscribe(textAnswers => {
         this.textAnswers = textAnswers;
       });

src/app/content-creation/content-creation.component.ts

@@ -45,7 +45,7 @@ export class ContentCreationComponent implements OnInit {
     this.contentService.addContent({ subject: subject, body: body, roomId: this.roomId } as Content)
       .subscribe(content => {
         this.notification.show(`Content '${content.subject}' successfully created.`);
-        this.router.navigate([`/creator/room/${content.roomId}/${content.id}`]);
+        this.router.navigate([`/creator/room/${content.roomId}/${content.contentId}`]);
         this.dialogRef.close();
       });
   }

src/app/content-detail/content-detail.component.html

@@ -5,7 +5,7 @@
         <mat-card-title>
           <h3 class="subheading-2">{{content.subject}}</h3>
         </mat-card-title>
-        <mat-card-subtitle>ID: {{ content.id }}
+        <mat-card-subtitle>ID: {{ content.contentId }}
           <br> Round: {{ content.round }}</mat-card-subtitle>
       </mat-card-header>
       <mat-divider></mat-divider>
@@ -21,7 +21,7 @@
       <mat-divider></mat-divider>
       <!-- answes list here -->
       <mat-card-actions>
-        <button mat-button color="primary" matTooltip="Create new content" routerLink="/creator/room/{{content.id}}/content-creation">
+        <button mat-button color="primary" matTooltip="Create new content" routerLink="/creator/room/{{content.contentId}}/content-creation">
           Create answer
         </button>
         <button mat-button color="warn" matTooltip="Delete selected answer">

src/app/content-detail/content-detail.component.ts

@@ -18,12 +18,12 @@ export class ContentDetailComponent implements OnInit {
 
   ngOnInit() {
     this.route.params.subscribe(params => {
-      this.getContent(params['id']);
+      this.getContent(params['contentId']);
     });
   }
 
-  getContent(id: string): void {
-    this.contentService.getContent(id)
-      .subscribe(content => this.content = content);
+  getContent(contentId: string): void {
+    this.contentService.getContent(contentId)
+      .subscribe(content => this.content = content[0]);
   }
 }

src/app/content-list/content-list.component.html

 <mat-list>
   <mat-list-item *ngFor="let content of contents">
-    <button mat-button routerLink="{{content.id}}">
-      Content {{content.id}}: {{content.subject}}
+    <button mat-button routerLink="{{content.contentId}}">
+      Content {{content.contentId}}: {{content.subject}}
     </button>
   </mat-list-item>
 </mat-list>

src/app/content-list/content-list.component.ts

@@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core';
 import { ContentService } from '../content.service';
 import { Content } from '../content';
 import { ActivatedRoute } from '@angular/router';
-import { RoomService } from '../room.service';
 
 @Component({
   selector: 'app-content-list',
@@ -12,29 +11,20 @@ import { RoomService } from '../room.service';
 export class ContentListComponent implements OnInit {
   contents: Content[];
 
-  constructor(
-    private contentService: ContentService,
-    private route: ActivatedRoute,
-    private roomService: RoomService,
-  ) { }
+  constructor(private contentService: ContentService,
+              private route: ActivatedRoute) {
+  }
 
   ngOnInit() {
     this.route.params.subscribe(params => {
-      this.getRoom(params['roomId']);
+      this.getContents(params['roomId']);
     });
   }
 
-  getRoom(id: string): void {
-    this.roomService.getRoom(id).subscribe(
-      params => {
-        this.getContents(params['id']);
-      });
-  }
-
   getContents(roomId: string): void {
     this.contentService.getContents(roomId)
-    .subscribe(contents => {
-      this.contents = contents;
-    });
+      .subscribe(contents => {
+        this.contents = contents;
+      });
   }
 }

src/app/content-type.ts

+export enum ContentType {
+  CHOICE,
+  BINARY,
+  SCALE,
+  NUMBER,
+  TEXT,
+  GRID
+}

src/app/content.service.ts

@@ -29,10 +29,10 @@ export class ContentService extends ErrorHandlingService {
     );
   }
 
-  getContent(id: string): Observable<Content> {
-    const url = `${this.contentUrl}/${id}`;
+  getContent(contentId: string): Observable<Content> {
+    const url = `${this.contentUrl}/?contentId=${contentId}`;
     return this.http.get<Content>(url).pipe(
-      catchError(this.handleError<Content>(`getContent id=${id}`))
+      catchError(this.handleError<Content>(`getContent id=${contentId}`))
     );
   }
 }

src/app/content.ts

-export enum Format {
-  CHOICE,
-  BINARY,
-  SCALE,
-  NUMBER,
-  TEXT,
-  GRID
-}
+import { ContentType } from './content-type';
 
 export class Content {
-  id: string;
+  contentId: string;
   revision: string;
   roomId: string;
   subject: string;
   body: string;
   round: number;
-  format: Format;
+  format: ContentType;
   formatAttributes: Map<string, string>;
+
+  constructor(contentId: string,
+              revision: string,
+              roomId: string,
+              subject: string,
+              body: string,
+              round: number,
+              format: ContentType,
+              formatAttributes: Map<string, string>) {
+    this.contentId = contentId;
+    this.revision = revision;
+    this.roomId = roomId;
+    this.subject = subject;
+    this.body = body;
+    this.round = round;
+    this.format = format;
+    this.formatAttributes = formatAttributes;
+  }
 }

src/app/in-memory-data.service.ts

 import { InMemoryDbService } from 'angular-in-memory-web-api';
-import { Format } from './content';
+import { ContentType } from './content-type';
 
 export class InMemoryDataService implements InMemoryDbService {
   /**
@@ -87,22 +87,22 @@ export class InMemoryDataService implements InMemoryDbService {
 
     const contents = [
       {
-        id: '1',
+        contentId: '1',
         revision: '1',
         roomId: '1',
-        subject: 'Textaufgabe 1',
-        body: 'testcontent alpha beta',
+        subject: 'Text Content 1',
+        body: 'This is a body of a text content.',
         round: 1,
-        format: Format.TEXT
+        format: ContentType.TEXT
       },
       {
-        id: '2',
+        contentId: '2',
         revision: '2',
         roomId: '3',
-        subject: 'Textaufgabe 2',
-        body: 'Ein Mann kauft 20 Melonen. Eine Melone wiegt jeweils 5kg. Berechnen Sie das Gesamtgewicht.',
-        round: 5,
-        format: Format.TEXT
+        subject: 'Text Content 2',
+        body: 'This is yet another body of a text content.',
+        round: 2,
+        format: ContentType.TEXT
       }
     ];
 

src/app/text-content.ts

-import { Content, Format } from './content';
+import { Content } from './content';
+import { ContentType } from './content-type';
 
 export class TextContent extends Content {
 
-  constructor(roomId: string, subject: string, body: string) {
-    super();
-    this.revision = '1';
-    this.roomId = roomId;
-    this.subject = subject;
-    this.body = body;
-    this.round = 1;
-    this.format = Format.TEXT;
-    this.formatAttributes.clear(); // API: formatAttributes = Map.empty();
+  constructor(contentId: string,
+              revision: string,
+              roomId: string,
+              subject: string,
+              body: string,
+              round: number) {
+    super(contentId,
+      revision,
+      roomId,
+      subject,
+      body,
+      round,
+      ContentType.TEXT,
+      new Map());
   }
 }