Merge branch '568-additional-default-period-for-time-filter-last-14-days' into 'master'

Add new time period 'last 14 days'

Closes #568

See merge request arsnova/frag.jetzt!508

src/app/components/shared/comment-list/comment-list.component.ts

@@ -29,6 +29,7 @@ export enum Period {
   THREEHOURS = 'time-3h',
   ONEDAY = 'time-1d',
   ONEWEEK = 'time-1w',
+  TWOWEEKS = 'time-2w',
   ALL = 'time-all'
 }
 
@@ -488,6 +489,10 @@ export class CommentListComponent implements OnInit, OnDestroy {
           break;
         case Period.ONEWEEK:
           periodInSeconds = hourInSeconds * 168;
+          break;
+        case Period.TWOWEEKS:
+          periodInSeconds = hourInSeconds * 336;
+          break;
       }
       this.commentsFilteredByTime = this.comments
         .filter(c => new Date(c.timestamp).getTime() >= (currentTime.getTime() - periodInSeconds));

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

@@ -344,6 +344,10 @@ export class QuestionWallComponent implements OnInit, AfterViewInit, OnDestroy {
           break;
         case Period.ONEWEEK:
           periodInSeconds = hourInSeconds * 168;
+          break;
+        case Period.TWOWEEKS:
+          periodInSeconds = hourInSeconds * 336;
+          break;
       }
       this.commentsFilteredByTime = this.comments
         .filter(c => new Date(c.date).getTime() >= (currentTime.getTime() - periodInSeconds));

src/assets/i18n/creator/de.json

@@ -20,6 +20,7 @@
     "a11y-select-time-3h": "Zeige alle Kommentare der letzten 3 Stunden an",
     "a11y-select-time-1d": "Zeige alle Kommentare der letzten 24 Stunden an",
     "a11y-select-time-1w": "Zeige alle kommentare der letzten 7 Tage an",
+    "a11y-select-time-2w": "Zeige alle kommentare der letzten 14 Tage an",
     "a11y-select-time-all": "Zeige alle Kommentare an",
     "add-comment": "Frage oder Mitteilung ans Publikum schreiben …",
     "answered": "Beantwortete Fragen",
@@ -59,6 +60,7 @@
     "select-time-3h": "Letzte 2 Stunden",
     "select-time-1d": "Letzte 24 Stunden",
     "select-time-1w": "Letzte 7 Tage",
+    "select-time-2w": "Letzte 14 Tage",
     "select-time-all": "Unbegrenzt"
   },
   "comment-page": {

src/assets/i18n/creator/en.json

@@ -19,7 +19,8 @@
     "a11y-select-time-1h": "Show all comments of the last hour",
     "a11y-select-time-3h": "Show all comments of the last 3 hours",
     "a11y-select-time-1d": "Show all comments of the last day",
-    "a11y-select-time-1w": "Show all comments of the last week",
+    "a11y-select-time-1w": "Show all comments of the last 7 days",
+    "a11y-select-time-2w": "Show all comments of the last 14 days",
     "a11y-select-time-all": "Show all comments",
     "answered": "Answered questions",
     "add-comment": "Ask a question or write a message to the audience.",
@@ -60,6 +61,7 @@
     "select-time-3h": "Last 2 hours",
     "select-time-1d": "Last 24 hours",
     "select-time-1w": "Last 7 days",
+    "select-time-2w": "Last 14 days",
     "select-time-all": "Unlimited"
   },
   "comment-page": {

src/assets/i18n/participant/de.json

@@ -20,6 +20,7 @@
     "a11y-select-time-3h": "Zeige alle Kommentare der letzten 3 Stunden an",
     "a11y-select-time-1d": "Zeige alle Kommentare der letzten 24 Stunden an",
     "a11y-select-time-1w": "Zeige alle kommentare der letzten 7 Tage an",
+    "a11y-select-time-2w": "Zeige alle kommentare der letzten 14 Tage an",
     "a11y-select-time-all": "Zeige alle Kommentare an",
     "answered": "Beantwortete Fragen",
     "add-comment": "Stell deine Frage!",
@@ -60,6 +61,7 @@
     "select-time-3h": "Letzte 2 Stunden",
     "select-time-1d": "Letzte 24 Stunden",
     "select-time-1w": "Letzte 7 Tage",
+    "select-time-2w": "Letzte 14 Tage",
     "select-time-all": "Unbegrenzt"
   },
   "content": {

src/assets/i18n/participant/en.json

@@ -29,7 +29,8 @@
     "a11y-select-time-1h": "Show all comments of the last hour",
     "a11y-select-time-3h": "Show all comments of the last 3 hours",
     "a11y-select-time-1d": "Show all comments of the last day",
-    "a11y-select-time-1w": "Show all comments of the last week",
+    "a11y-select-time-1w": "Show all comments of the last 7 days",
+    "a11y-select-time-2w": "Show all comments of the last 14 days",
     "a11y-select-time-all": "Show all comments",
     "answered": "Answered questions",
     "add-comment": "Ask a question!",
@@ -70,6 +71,7 @@
     "select-time-3h": "Last 2 hours",
     "select-time-1d": "Last 24 hours",
     "select-time-1w": "Last 7 days",
+    "select-time-2w": "Last 14 days",
     "select-time-all": "Unlimited"
   },
   "content": {