From 58ef09ea746f66037f4769bfc3114e52fb0e6797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= <marszc13@st.amu.edu.pl>
Date: Sun, 1 Dec 2019 16:52:23 +0100
Subject: [PATCH] PUNKT-20 Update czasy w pytaniach

---
 .../tests/test-details/question-view/gaps/gaps.component.html  | 2 +-
 .../tests/test-details/question-view/gaps/gaps.component.ts    | 1 +
 .../multiple-choice/multiple-choice.component.html             | 2 +-
 .../question-view/multiple-choice/multiple-choice.component.ts | 1 +
 .../test-details/question-view/pairs/pairs.component.html      | 2 +-
 .../tests/test-details/question-view/pairs/pairs.component.ts  | 1 +
 .../test-details/question-view/puzzle/puzzle.component.html    | 2 +-
 .../test-details/question-view/puzzle/puzzle.component.ts      | 1 +
 .../question-view/single-choice/single-choice.component.html   | 2 +-
 .../question-view/single-choice/single-choice.component.ts     | 1 +
 .../question-view/true-false/true-false.component.html         | 2 +-
 .../question-view/true-false/true-false.component.ts           | 1 +
 FrontEnd/src/app/tests/test-edit/test-edit.component.html      | 3 +++
 13 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/FrontEnd/src/app/tests/test-details/question-view/gaps/gaps.component.html b/FrontEnd/src/app/tests/test-details/question-view/gaps/gaps.component.html
index e0566a3..7489590 100644
--- a/FrontEnd/src/app/tests/test-details/question-view/gaps/gaps.component.html
+++ b/FrontEnd/src/app/tests/test-details/question-view/gaps/gaps.component.html
@@ -1,6 +1,6 @@
 <form #f="ngForm" (ngSubmit)="nextQuestion(f)" novalidate>
   <div class="alert alert-grey question">
-    {{question.question}} ({{question.points}}pkt.) <span *ngIf="timeLeft > 0">Czas: {{ timeLeft }} </span>
+    {{question.question}} ({{question.points}}pkt.) <br /><span *ngIf="timeLeft > 0">Czas: {{ timeLeft }} sek. </span><span *ngIf="timeLeft === 0">Czas: bez limitu</span>
     <div class="answers">
       <div *ngFor="let item of question.answers">
         <span *ngIf="!item.is_gap">{{item.content}}</span>
diff --git a/FrontEnd/src/app/tests/test-details/question-view/gaps/gaps.component.ts b/FrontEnd/src/app/tests/test-details/question-view/gaps/gaps.component.ts
index 521da7f..5947c47 100644
--- a/FrontEnd/src/app/tests/test-details/question-view/gaps/gaps.component.ts
+++ b/FrontEnd/src/app/tests/test-details/question-view/gaps/gaps.component.ts
@@ -49,6 +49,7 @@ export class GapsComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
+    this.timeLeft = this.question.time;
     if (this.timeLeft > 0) {
       this.startTimer();
     }
diff --git a/FrontEnd/src/app/tests/test-details/question-view/multiple-choice/multiple-choice.component.html b/FrontEnd/src/app/tests/test-details/question-view/multiple-choice/multiple-choice.component.html
index c008de0..11e3a3b 100644
--- a/FrontEnd/src/app/tests/test-details/question-view/multiple-choice/multiple-choice.component.html
+++ b/FrontEnd/src/app/tests/test-details/question-view/multiple-choice/multiple-choice.component.html
@@ -1,6 +1,6 @@
 <form #f="ngForm" (ngSubmit)="nextQuestion(f)" novalidate>
   <div class="alert alert-grey question">
-    {{question.question}} ({{question.points}}pkt.) <span *ngIf="timeLeft > 0">Czas: {{ timeLeft }} </span>
+    {{question.question}} ({{question.points}}pkt.) <br /><span *ngIf="timeLeft > 0">Czas: {{ timeLeft }} sek. </span><span *ngIf="timeLeft === 0">Czas: bez limitu</span>
     <div class="answers">
       <div *ngFor="let item of question.answers">
         <input type="checkbox" [name]="item.id" [value]="item" ngModel />  {{item.content}}
diff --git a/FrontEnd/src/app/tests/test-details/question-view/multiple-choice/multiple-choice.component.ts b/FrontEnd/src/app/tests/test-details/question-view/multiple-choice/multiple-choice.component.ts
index 9c89d3b..4aa31f0 100644
--- a/FrontEnd/src/app/tests/test-details/question-view/multiple-choice/multiple-choice.component.ts
+++ b/FrontEnd/src/app/tests/test-details/question-view/multiple-choice/multiple-choice.component.ts
@@ -46,6 +46,7 @@ export class MultipleChoiceComponent implements OnInit, OnDestroy{
   }
 
   ngOnInit() {
+    this.timeLeft = this.question.time;
     if (this.timeLeft > 0) {
       this.startTimer();
     }
diff --git a/FrontEnd/src/app/tests/test-details/question-view/pairs/pairs.component.html b/FrontEnd/src/app/tests/test-details/question-view/pairs/pairs.component.html
index ad35815..4e4a31a 100644
--- a/FrontEnd/src/app/tests/test-details/question-view/pairs/pairs.component.html
+++ b/FrontEnd/src/app/tests/test-details/question-view/pairs/pairs.component.html
@@ -1,5 +1,5 @@
 <div>
-  {{question.question}} ({{question.points}}pkt.) <span *ngIf="timeLeft > 0">Czas: {{ timeLeft }} </span>
+  {{question.question}} ({{question.points}}pkt.) <br /><span *ngIf="timeLeft > 0">Czas: {{ timeLeft }} sek. </span><span *ngIf="timeLeft === 0">Czas: bez limitu</span>
   <h3>Dostępne lewe strony:</h3>
   <div class="puzzles-container">
     <div class='puzzle' *ngFor="let item of leftSides; let i = index" (click)="leftSideClick(item,i)" [ngClass]="{'active': (selectedLeftSide.leftSideText === item && selectedLeftSide.indexOfLeftSide === i && selectedLeftSide.from === 'leftSides'), 'empty': (item === undefined || item === '')}">
diff --git a/FrontEnd/src/app/tests/test-details/question-view/pairs/pairs.component.ts b/FrontEnd/src/app/tests/test-details/question-view/pairs/pairs.component.ts
index 166f93f..232a03e 100644
--- a/FrontEnd/src/app/tests/test-details/question-view/pairs/pairs.component.ts
+++ b/FrontEnd/src/app/tests/test-details/question-view/pairs/pairs.component.ts
@@ -92,6 +92,7 @@ export class PairsComponent implements OnInit, OnChanges, OnDestroy {
   }
 
   ngOnInit() {
+    this.timeLeft = this.question.time;
     this.prepareLists();
     if (this.timeLeft > 0) {
       this.startTimer();
diff --git a/FrontEnd/src/app/tests/test-details/question-view/puzzle/puzzle.component.html b/FrontEnd/src/app/tests/test-details/question-view/puzzle/puzzle.component.html
index 1c243c6..18a2695 100644
--- a/FrontEnd/src/app/tests/test-details/question-view/puzzle/puzzle.component.html
+++ b/FrontEnd/src/app/tests/test-details/question-view/puzzle/puzzle.component.html
@@ -1,5 +1,5 @@
 <div>
-   {{question.question}} ({{question.points}}pkt.) <span *ngIf="timeLeft > 0">Czas: {{ timeLeft }} </span>
+   {{question.question}} ({{question.points}}pkt.) <br /><span *ngIf="timeLeft > 0">Czas: {{ timeLeft }} sek. </span><span *ngIf="timeLeft === 0">Czas: bez limitu</span>
   <h3>Dostępne elementy rozsypanki:</h3>
   <div class="puzzles-container">
     <div class='puzzle' *ngFor="let item of puzzles; let i = index" (click)="puzzleClick(item,i)" [ngClass]="{'active': (selectedPuzzle.puzzleText === item && selectedPuzzle.indexOfPuzzle === i && selectedPuzzle.from === 'puzzles'), 'empty': (item === undefined || item === '')}">
diff --git a/FrontEnd/src/app/tests/test-details/question-view/puzzle/puzzle.component.ts b/FrontEnd/src/app/tests/test-details/question-view/puzzle/puzzle.component.ts
index 612e049..0958812 100644
--- a/FrontEnd/src/app/tests/test-details/question-view/puzzle/puzzle.component.ts
+++ b/FrontEnd/src/app/tests/test-details/question-view/puzzle/puzzle.component.ts
@@ -79,6 +79,7 @@ export class PuzzleComponent implements OnInit, OnChanges, OnDestroy {
   }
 
   ngOnInit() {
+    this.timeLeft = this.question.time;
     this.prepareLists();
     if (this.timeLeft > 0) {
       this.startTimer();
diff --git a/FrontEnd/src/app/tests/test-details/question-view/single-choice/single-choice.component.html b/FrontEnd/src/app/tests/test-details/question-view/single-choice/single-choice.component.html
index 426dbc1..ec4810b 100644
--- a/FrontEnd/src/app/tests/test-details/question-view/single-choice/single-choice.component.html
+++ b/FrontEnd/src/app/tests/test-details/question-view/single-choice/single-choice.component.html
@@ -1,6 +1,6 @@
 <form #f="ngForm" (ngSubmit)="nextQuestion(f)" novalidate>
   <div class="alert alert-grey question">
-    {{question.question}} ({{question.points}}pkt.) <span *ngIf="timeLeft > 0">Czas: {{ timeLeft }} </span>
+    {{question.question}} ({{question.points}}pkt.) <br /><span *ngIf="timeLeft > 0">Czas: {{ timeLeft }} sek. </span><span *ngIf="timeLeft === 0">Czas: bez limitu</span>
     <div class="answers">
       <div *ngFor="let item of question.answers">
         <input type="radio" name="answer" [value]="item.content" ngModel> {{item.content}}
diff --git a/FrontEnd/src/app/tests/test-details/question-view/single-choice/single-choice.component.ts b/FrontEnd/src/app/tests/test-details/question-view/single-choice/single-choice.component.ts
index 779281c..7af0b8f 100644
--- a/FrontEnd/src/app/tests/test-details/question-view/single-choice/single-choice.component.ts
+++ b/FrontEnd/src/app/tests/test-details/question-view/single-choice/single-choice.component.ts
@@ -47,6 +47,7 @@ export class SingleChoiceComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
+    this.timeLeft = this.question.time;
     if (this.timeLeft > 0) {
       this.startTimer();
     }
diff --git a/FrontEnd/src/app/tests/test-details/question-view/true-false/true-false.component.html b/FrontEnd/src/app/tests/test-details/question-view/true-false/true-false.component.html
index 3424e83..154392f 100644
--- a/FrontEnd/src/app/tests/test-details/question-view/true-false/true-false.component.html
+++ b/FrontEnd/src/app/tests/test-details/question-view/true-false/true-false.component.html
@@ -1,5 +1,5 @@
 <div class="alert alert-grey question">
-  {{question.question}} ({{question.points}}pkt.) <span *ngIf="timeLeft > 0">Czas: {{ timeLeft }} </span>
+  {{question.question}} ({{question.points}}pkt.) <br /><span *ngIf="timeLeft > 0">Czas: {{ timeLeft }} sek. </span><span *ngIf="timeLeft === 0">Czas: bez limitu</span>
 
   <div class="btn-group btn-group-toggle" data-toggle="buttons">
     <label class="btn btn-study-cave mr-2" (click)="chooseAnswer('Prawda')">
diff --git a/FrontEnd/src/app/tests/test-details/question-view/true-false/true-false.component.ts b/FrontEnd/src/app/tests/test-details/question-view/true-false/true-false.component.ts
index 0ce69cf..80e54d2 100644
--- a/FrontEnd/src/app/tests/test-details/question-view/true-false/true-false.component.ts
+++ b/FrontEnd/src/app/tests/test-details/question-view/true-false/true-false.component.ts
@@ -50,6 +50,7 @@ export class TrueFalseComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
+    this.timeLeft = this.question.time;
     if (this.timeLeft > 0) {
       this.startTimer();
     }
diff --git a/FrontEnd/src/app/tests/test-edit/test-edit.component.html b/FrontEnd/src/app/tests/test-edit/test-edit.component.html
index bdec0c2..6a52aa1 100644
--- a/FrontEnd/src/app/tests/test-edit/test-edit.component.html
+++ b/FrontEnd/src/app/tests/test-edit/test-edit.component.html
@@ -50,6 +50,7 @@
               <th>Lp.</th>
               <th>Typ</th>
               <th class="mobile">Punkty</th>
+              <th class="mobile">Czas na odpowiedź</th>
               <th class="mobile">Pytanie</th>
               <th>Usuń</th>
               <th class="mobile">Przenieś</th>
@@ -72,6 +73,8 @@
                   *ngIf='question.content.type == "pairs"'>Łączenie w pary</td>
               <td (click)='showComponents(question.content.type, question.nr)'
                   class="mobile">{{ question.content.points }}</td>
+              <td (click)='showComponents(question.content.type, question.nr)'
+                class="mobile">{{ question.content.time }}</td>
               <td (click)='showComponents(question.content.type, question.nr)'
                   class="mobile">{{ question.shortcut }}</td>
               <td><button class="btn btn-study-cave" (click)="delete(question.nr)"><i class="fas fa-trash-alt"></i> Usuń</button></td>