From 96546c7419dad9459eaeefa87c23fd4ef3b982de Mon Sep 17 00:00:00 2001 From: law39 Date: Fri, 1 May 2020 15:16:52 +0100 Subject: [PATCH 1/8] Updated translation controller SE.QA.09 Issues #51 --- .../group20/javafx/TranslationController.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java index 271e985..0808b16 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java @@ -1,3 +1,11 @@ +/** + +@(#) TranslationController.java 1.1 2020/05/01 + + +Copyright (c) 2020 Aberystwyth University. +All rights reserved. +*/ package uk.ac.aber.cs221.group20.javafx; import javafx.event.ActionEvent; @@ -83,16 +91,20 @@ public class TranslationController extends SharedCodeController { @FXML private void initialize() { setup(); + + //Setup of image on screen currentPageIcon.setImage(new Image("file:src/main/resources/assets/icons/white_icons/50px/pass-fail-50.png")); currentPageText.setText("Study"); + //Setup of image on screen studyIcon.setImage(new Image("file:src/main/resources/assets/icons/black_icons/50px/pass-fail-50.png")); studyText.setFill(Color.BLACK); + //Setup of image on screen submitButton.setImage(new Image("file:src/main/resources/assets/icons/black_icons/50px/right-50.png")); + //Sets answer counters to correct values correctAnswer.setText(": " + AssessmentGenerator.getTotalCorrectAnswers()); - totalAnswer.setText(": " + AssessmentGenerator.getTotalAnswers()); @@ -111,14 +123,16 @@ public class TranslationController extends SharedCodeController { @FXML void translateWord() { + //Creates ArrayList of answers and ArrayList of user answers to check ArrayList usersInput = new ArrayList<>(); usersInput.add(translationBox.getText()); - ArrayList correctTranslation = new ArrayList<>(); correctTranslation.add(answer); + //check user answers against correct answers Question.checkAnswer(correctTranslation, usersInput, AssessmentGenerator.isEnglish()); + //Open the next question of the assessment. AssessmentGenerator.goToNextQuestion(); From 1311bd5c0d527aa58b952c1aea25d4bfa34432f8 Mon Sep 17 00:00:00 2001 From: law39 Date: Fri, 1 May 2020 15:17:44 +0100 Subject: [PATCH 2/8] Corrected version number @ Translation Controller --- .../uk/ac/aber/cs221/group20/javafx/TranslationController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java index 0808b16..71a080f 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java @@ -29,7 +29,7 @@ package uk.ac.aber.cs221.group20.javafx; * Controller for the translationTest fxml file. * * @author Brad Corbett brc9 - * @version 0.1 + * @version 1.1 */ public class TranslationController extends SharedCodeController { From 679caace986450ad2813eaebaeff17488ea93aec Mon Sep 17 00:00:00 2001 From: law39 Date: Fri, 1 May 2020 15:20:52 +0100 Subject: [PATCH 3/8] Moved copyright notice above package @ matchmeaning controller --- .../aber/cs221/group20/javafx/MatchTheMeaningController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java index 1f297b1..1f49009 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java @@ -1,10 +1,11 @@ -package uk.ac.aber.cs221.group20.javafx; /** * @(#) MyController.java 0,1 2020/04/07 *

* Copyright (c) 2020 Aberystwyth University. * All rights reserved. */ +package uk.ac.aber.cs221.group20.javafx; + import javafx.fxml.FXML; import javafx.scene.control.Alert; From d0ce117ac4c1c73c5890af60e97a94b22fa0b762 Mon Sep 17 00:00:00 2001 From: law39 Date: Fri, 1 May 2020 15:21:31 +0100 Subject: [PATCH 4/8] Corrected copyright notice @ matchmeaningcontroller --- .../ac/aber/cs221/group20/javafx/MatchTheMeaningController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java index 1f49009..8c0056b 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/MatchTheMeaningController.java @@ -1,5 +1,5 @@ /** - * @(#) MyController.java 0,1 2020/04/07 + * @(#) MatchTheMeaningController.java 0,1 2020/04/07 *

* Copyright (c) 2020 Aberystwyth University. * All rights reserved. From 88ac365b3306cfaca422091fd468eaf595e51ae8 Mon Sep 17 00:00:00 2001 From: law39 Date: Fri, 1 May 2020 15:23:07 +0100 Subject: [PATCH 5/8] Moved Copyright notice above package @ScreenSwitch --- .../java/uk/ac/aber/cs221/group20/javafx/ScreenSwitch.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/ScreenSwitch.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/ScreenSwitch.java index 47be3d1..02250f4 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/ScreenSwitch.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/ScreenSwitch.java @@ -1,10 +1,11 @@ -package uk.ac.aber.cs221.group20.javafx; /** * @(#) ScreenSwitch.java 0.1 2020/04/07 *

* Copyright (c) 2020 Aberystwyth University. * All rights reserved. */ +package uk.ac.aber.cs221.group20.javafx; + import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; From bb7890f715d8f21a90ee1f87dd0556a673a1a7dc Mon Sep 17 00:00:00 2001 From: law39 Date: Fri, 1 May 2020 15:24:02 +0100 Subject: [PATCH 6/8] Moved copyright notice above package @ jsonProcessing --- .../java/uk/ac/aber/cs221/group20/json/JsonProcessing.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/JsonProcessing.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/JsonProcessing.java index e658539..058f712 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/JsonProcessing.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/json/JsonProcessing.java @@ -1,4 +1,3 @@ -package uk.ac.aber.cs221.group20.json; /** * @(#) JsonProcessing.java 0,1 2020/04/27 *

@@ -6,6 +5,8 @@ package uk.ac.aber.cs221.group20.json; * All rights reserved. */ +package uk.ac.aber.cs221.group20.json; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; From 6e27ea7bea30315f5486289513298055a871ff55 Mon Sep 17 00:00:00 2001 From: Henry Dugmore Date: Fri, 1 May 2020 15:25:11 +0100 Subject: [PATCH 7/8] Issue #46 fixed copyright notice fixed copyright notice on addwordcontroller and questiontest --- .../uk/ac/aber/cs221/group20/javafx/AddWordController.java | 2 +- .../java/uk/ac/aber/cs221/group20/test/QuestionTest.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/AddWordController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/AddWordController.java index 997831c..3fb7d19 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/AddWordController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/AddWordController.java @@ -1,5 +1,5 @@ /** - * @(#) AddWordController.java 0,1 2020/04/30 + * @(#) AddWordController.java 0,1 2020/05/01 *

* Copyright (c) 2020 Aberystwyth University. * All rights reserved. diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/QuestionTest.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/QuestionTest.java index 3c90a6c..1c8c639 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/QuestionTest.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/test/QuestionTest.java @@ -1,3 +1,10 @@ +/** + * @(#) QuestionTest.java 0,1 2020/05/01 + *

+ * Copyright (c) 2020 Aberystwyth University. + * All rights reserved. + */ + package uk.ac.aber.cs221.group20.test; import org.junit.jupiter.api.Test; From dc9958bc889d95931f62c92604548c2ca110adad Mon Sep 17 00:00:00 2001 From: law39 Date: Fri, 1 May 2020 15:25:12 +0100 Subject: [PATCH 8/8] Added copyright notice @ AssessmentGenerator --- .../cs221/group20/selfassessment/AssessmentGenerator.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/AssessmentGenerator.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/AssessmentGenerator.java index 34a7a4d..f23a4a8 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/AssessmentGenerator.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/selfassessment/AssessmentGenerator.java @@ -1,3 +1,10 @@ +/** + * @(#) AssessmentGenerator.java 0,1 2020/05/01 + *

+ * Copyright (c) 2020 Aberystwyth University. + * All rights reserved. + */ + package uk.ac.aber.cs221.group20.selfassessment; import javafx.scene.control.Alert;