From eeef8c49f6c61187f6ee4b2cbd20a458b4bb5dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= <marszc13@st.amu.edu.pl>
Date: Thu, 23 Jan 2020 21:17:16 +0100
Subject: [PATCH] Fix

---
 FrontEnd/src/app/footer/footer.component.html    |  2 +-
 .../true-false/true-false.component.html         |  4 ++--
 .../true-false/true-false.component.ts           | 11 ++++++++++-
 .../test-details/test-details.component.html     | 16 +++++++++-------
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/FrontEnd/src/app/footer/footer.component.html b/FrontEnd/src/app/footer/footer.component.html
index 1133d47..c8eee07 100644
--- a/FrontEnd/src/app/footer/footer.component.html
+++ b/FrontEnd/src/app/footer/footer.component.html
@@ -1,3 +1,3 @@
 <div class="footer">
-  © 2019 Punktonerzy
+  © 2020 Punktonerzy
 </div>
\ No newline at end of file
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 7402a86..0966953 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
@@ -3,10 +3,10 @@
   <div class="pytanie">{{question.question}} </div>
   <div class="answers" >
     <div (click)="chooseAnswer('Prawda')">
-      <input type="radio" name="options" id="option1" class="radio-answer" autocomplete="off"><label for="option1">Prawda</label>
+      <input #true type="radio" name="options" id="option1" class="radio-answer" autocomplete="off"><label for="option1">Prawda</label>
     </div>
     <div (click)="chooseAnswer('Fałsz')">
-      <input type="radio" name="options" id="option2" class="radio-answer" autocomplete="off"> <label for="option2">Fałsz</label>
+      <input #false type="radio" name="options" id="option2" class="radio-answer" autocomplete="off"> <label for="option2">Fałsz</label>
     </div>
   </div>
 </div>
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 f1717b8..f1132d9 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
@@ -1,4 +1,4 @@
-import { Component, OnInit, Input, Output, EventEmitter, OnDestroy } from '@angular/core';
+import { Component, OnInit, Input, Output, EventEmitter, OnDestroy, ElementRef, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { TestsService } from '../../../tests.service';
 import * as $ from 'jquery';
@@ -17,6 +17,8 @@ export class TrueFalseComponent implements OnInit, OnDestroy {
   private verifyAnswerSubscription: ISubscription;
   interval: any;
   public timeLeft = 0;
+  @ViewChild('true') true: ElementRef;
+  @ViewChild('false') false: ElementRef;
 
   constructor(private route: ActivatedRoute, private testsService: TestsService) { }
 
@@ -60,6 +62,13 @@ export class TrueFalseComponent implements OnInit, OnDestroy {
     if (this.timeLeft > 0) {
       this.startTimer();
     }
+    if (this.true) {
+      this.true.nativeElement.checked = false;
+    }
+
+    if (this.false) {
+      this.false.nativeElement.checked = false;
+    }
   }
 
   ngOnInit() {}
diff --git a/FrontEnd/src/app/tests/test-details/test-details.component.html b/FrontEnd/src/app/tests/test-details/test-details.component.html
index 3dd3b08..38fadf4 100644
--- a/FrontEnd/src/app/tests/test-details/test-details.component.html
+++ b/FrontEnd/src/app/tests/test-details/test-details.component.html
@@ -5,7 +5,7 @@
       <div class="header">
         <button class="button" (click)="back()"><i class="fas fa-arrow-left"></i> Powrót</button>
         <span>
-          <div *ngIf="currentUser">Twój wynik: {{prevMaxResult}}/{{maxPoints}}</div>
+          <!-- <div *ngIf="currentUser">Twój wynik: {{prevMaxResult}}/{{maxPoints}}</div> -->
           <button title="Usuń" *ngIf="currentUser && currentUser.username === test.owner && (!isStarted || isEnded)" class="btn btn-study-cave" (click)="openPopup()"><i class="fas fa-trash-alt"></i></button>
           <button title="Edytuj" *ngIf="currentUser && currentUser.username === test.owner" class="btn btn-study-cave" (click)="edit()"><i class="fas fa-edit"></i></button>
           <button *ngIf="!isStarted && (test['permission'] !== 'GROUP' || (test['permission'] === 'GROUP' && !test['attempted'] && ((test['dateFrom'] < now && test['dateTo'] > now) || (test['isGroupOwner']))))" title="PDF" class="btn btn-study-cave" (click)="get()"><i class="fas fa-file-pdf"></i></button>
@@ -15,12 +15,6 @@
         <h3>{{test.title}}</h3>
       </div>
 
-      <div *ngIf="prevAnswerResultBool !== undefined && prevAnswerResultBool" class="alert alert-success">
-        Poprzednia odpowiedź była poprawna.
-      </div>
-      <div *ngIf="prevAnswerResultBool !== undefined && !prevAnswerResultBool" class="alert alert-danger">
-        Poprzednia odpowiedź była niepoprawna.
-      </div>
       <div *ngIf="!isStarted && (test['permission'] !== 'GROUP' || (test['permission'] === 'GROUP' && !test['attempted'] && ((test['dateFrom'] < now && test['dateTo'] > now) || (test['isGroupOwner']))))">
         <br /><br />
         <button class="button" (click)="start()"> <i class="far fa-play-circle"></i> Rozpocznij test</button>
@@ -37,6 +31,14 @@
 
 
         <div class="question-view">
+          <br />
+          <div *ngIf="prevAnswerResultBool !== undefined && prevAnswerResultBool" class="alert alert-success">
+            Poprzednia odpowiedź była poprawna.
+          </div>
+          <div *ngIf="prevAnswerResultBool !== undefined && !prevAnswerResultBool" class="alert alert-danger">
+            Poprzednia odpowiedź była niepoprawna.
+          </div>
+          <div *ngIf="currentUser">Twój aktualny wynik: {{points}}/{{maxPoints}}</div>
           <app-question-view [question]="test.body[currentQuestionIndex]" [questionIndex]="currentQuestionIndex" [activeFifty]='lifebuoyTest' (emitNextQuestionRequest)="handleEmitNextQuestionRequest($event)" (lifebuoyTest)="LifebuoyFifty($event)" ></app-question-view>
         </div>