From 4f33ec150ec465d78d92f261c40f2fce5c80ced2 Mon Sep 17 00:00:00 2001 From: law39 Date: Fri, 1 May 2020 12:27:52 +0100 Subject: [PATCH] Translation Assessment use 2 textboxes currently broken --- .../group20/javafx/TranslationController.java | 4 +- .../uk/ac/aber/cs221/group20/translation.fxml | 38 ++++++++++++++----- 2 files changed, 30 insertions(+), 12 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 a14017c..453b0d2 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 @@ -77,9 +77,9 @@ public class TranslationController extends SharedCodeController { submitButton.setImage(new Image("file:src/main/resources/assets/icons/black_icons/50px/right-50.png")); - correctAnswer.setText("Correct answers : " + AssessmentGenerator.getTotalCorrectAnswers()); + correctAnswer.setText(": " + AssessmentGenerator.getTotalCorrectAnswers()); - totalAnswer.setText("Total answers : " + AssessmentGenerator.getTotalAnswers()); + totalAnswer.setText(": " + AssessmentGenerator.getTotalAnswers()); if (AssessmentGenerator.isEnglish) { diff --git a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs221/group20/translation.fxml b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs221/group20/translation.fxml index b8852c4..ff83a56 100644 --- a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs221/group20/translation.fxml +++ b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs221/group20/translation.fxml @@ -141,16 +141,34 @@ - - + + + + + + + + + + + +