Merge branch 'tag-cloud-administration' of git.thm.de:arsnova/topic-cloud into...

Merge branch 'tag-cloud-administration' of git.thm.de:arsnova/topic-cloud into tag-cloud-administration

src/app/components/shared/topic-cloud-dialog/topic-cloud-dialog.component.html

 <mat-dialog-content>
 
   <mat-accordion>
+<<<<<<< HEAD
+
+    <mat-expansion-panel hideToggle *ngFor="let keyword of keywords">
+      <mat-expansion-panel-header>
+        <mat-panel-title>
+          {{keyword.titel}}
+        </mat-panel-title>
+
+        <!--<mat-panel-description>
+          This is a summary of the content
+        </mat-panel-description> -->
+
+      </mat-expansion-panel-header>
+
+      <div *ngFor="let question of keyword.questions">
+        <p>{{question}}</p>
+      </div>
+
+      <button mat-icon-button style="align-self:flex-end;" 
+              (click)="deleteKeyWord(keyword.keywordID)">
+        <mat-icon>delete</mat-icon>
+      </button>
+
+      <button mat-icon-button style="align-self:flex-end;"
+              (click)="editKeyWord(keyword.keywordID)">
+        <mat-icon>edit</mat-icon>
+      </button>
+    </mat-expansion-panel>
+=======
       <mat-expansion-panel
                           (opened)="panelOpenState = true"
                           (closed)="panelOpenState = false"
@@ -23,6 +52,8 @@
         </button>
         <!-- TODO: add automatic translation -->
       </mat-expansion-panel>
+>>>>>>> 3025e5d96c7ffef24a770c04bef8ebe9efc5fcc0
   </mat-accordion>
+  
 
 </mat-dialog-content>

src/app/components/shared/topic-cloud-dialog/topic-cloud-dialog.component.ts

@@ -7,6 +7,27 @@ import { Component, OnInit } from '@angular/core';
 })
 export class TopicCloudDialogComponent implements OnInit {
 
+<<<<<<< HEAD
+  public panelOpenState: boolean;
+  
+  keywords = [
+    {
+      keywordID: '0',
+      titel: 'Frage',
+      questions: ['what is your question', 'where are u from']
+    },
+    {
+      keywordID: '1',
+      titel: 'Klausur',
+      questions: ['hast du gelernt', 'ein test']
+    },
+    {
+      keywordID: '2',
+      titel: 'Hobby',
+      questions: ['was ist dein Hobby', 'was ist dein Plan']
+    }
+  ]
+
   public panelOpenState = false;
   public array = [
     {
@@ -46,4 +67,11 @@ export class TopicCloudDialogComponent implements OnInit {
   ngOnInit(): void {
   }
 
+  editKeyWord(id: number): void{
+      console.log("keyword with ID "+id+" has been edited");
+  }
+
+  deleteKeyWord(id: number): void{
+      console.log("keyword with ID "+id+" has been deleted");
+  }
 }