Merge branch '587-change-filter-options-to-favorites-and-bookmark-in-questionwall' into 'master'

Resolve "Change filter options to favorites and bookmark in questionwall"

Closes #587

See merge request arsnova/frag.jetzt!512

src/app/components/shared/questionwall/question-wall/question-wall.component.html

@@ -22,13 +22,10 @@
               <mat-icon class="star">grade</mat-icon>
               <span>{{'question-wall.filter-favorite' | translate}}</span>
             </button>
-            <button mat-menu-item (click)="filterApproved()" aria-labelledby="filter-lbl-approved">
-              <mat-icon>done</mat-icon>
-              <span>{{'question-wall.filter-approved' | translate}}</span>
-            </button>
-            <button mat-menu-item (click)="filterDisapproved()" aria-labelledby="filter-lbl-disapproved">
-              <mat-icon>clear</mat-icon>
-              <span>{{'question-wall.filter-disapproved' | translate}}</span>
+            
+            <button mat-menu-item (click)="filterBookmark()" aria-labelledby="filter-lbl-bookmark">
+              <mat-icon>bookmark</mat-icon>
+              <span>{{'question-wall.filter-bookmark' | translate}}</span>
             </button>
           </mat-menu>
           <mat-menu #filterTagMenu>

src/app/components/shared/questionwall/question-wall/question-wall.component.ts

@@ -281,14 +281,9 @@ export class QuestionWallComponent implements OnInit, AfterViewInit, OnDestroy {
       x => x.comment.userNumber === user);
   }
 
-  filterApproved() {
-    this.filter('done', false, 'question-wall.filter-approved', '',
-        x => x.comment.correct === CorrectWrong.CORRECT);
-  }
-
-  filterDisapproved() {
-    this.filter('block', false, 'question-wall.filter-disapproved', '',
-        x => x.comment.correct === CorrectWrong.WRONG);
+  filterBookmark() {
+    this.filter('bookmark', false, 'question-wall.filter-bookmark', '',
+        x => x.comment.bookmark);
   }
 
   filterTag(tag: string) {

src/assets/i18n/creator/de.json

@@ -37,7 +37,7 @@
     "filter-comments": "Fragen filtern",
     "filter-correct": "Bejahte Fragen",
     "filter-favorite": "Ausgezeichnete Fragen",
-    "filter-bookmark": "Lesezeichen",
+    "filter-bookmark": "Markierte Fragen",
     "filter-owner": "Meine Fragen",
     "filter-read": "Besprochene Fragen",
     "filter-reset": "Zurücksetzen",

src/assets/i18n/participant/de.json

@@ -163,7 +163,7 @@
     "sort-old": "Älteste",
     "filter-user": "User",
     "filter-favorite": "Favoriten",
-    "filter-bookmark": "Merken",
+    "filter-bookmark": "Lesezeichen",
     "filter-approved": "Bejaht",
     "filter-disapproved": "Verneint",
     "filter-remove": "Filter entfernen",

src/assets/i18n/participant/en.json

@@ -171,7 +171,7 @@
     "sort-old": "Oldest",
     "filter-user": "User",
     "filter-favorite": "Favorites",
-    "filter-bookmarked": "Bookmarked",
+    "filter-bookmark": "Bookmarked",
     "filter-approved": "Affirmed",
     "filter-disapproved": "Negated",
     "filter-remove": "Remove Filter",