From d5b83532f20054ba850cd9bafff90df2b65d8058 Mon Sep 17 00:00:00 2001 From: Brad Corbett Date: Wed, 29 Apr 2020 13:15:33 +0100 Subject: [PATCH] Added goToNextQuestion to controllers. --- .../cs22120/group20/selfassessment/SixMeaningsController.java | 4 +++- .../cs22120/group20/selfassessment/TranslationController.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/SixMeaningsController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/SixMeaningsController.java index a33a212..29c0e7d 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/SixMeaningsController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/SixMeaningsController.java @@ -153,7 +153,7 @@ public class SixMeaningsController implements Initializable { answer.add(wordCounterpart); - checkAnswer(wordSet,answer,isEnglish); + Question.checkAnswer(wordSet,answer,isEnglish); correctAnswer.setText(Integer.toString(Question.correctAnswers)); @@ -161,6 +161,8 @@ public class SixMeaningsController implements Initializable { wordSet.clear(); + AssessmentGenerator.goToNextQuestion(); + } diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/TranslationController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/TranslationController.java index 8e0b46b..dd5e2a0 100644 --- a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/TranslationController.java +++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/TranslationController.java @@ -90,6 +90,8 @@ public class TranslationController { Question.checkAnswer(correctTranslation, usersInput, AssessmentGenerator.isEnglish); + AssessmentGenerator.goToNextQuestion(); + } }