noble/uni-group-project
noble/uni-group-project
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Updated Match Meaning controller

Browse source 
Match Meaning controller now goes to next Assessment automatically
This commit is contained in:
law39 2020-04-29 13:12:02 +01:00
parent 861390c016
commit 8ae94fd397
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/selfassessment/MatchTheMeaningController.java
View file

@ -33,7 +33,7 @@ import java.util.*;
public class MatchTheMeaningController implements Initializable{ public class MatchTheMeaningController implements Initializable{
private ArrayList<DictionaryEntry> answer =new ArrayList<>(); public static ArrayList<DictionaryEntry> answer =new ArrayList<>();
private ArrayList<Integer> orderList = new ArrayList<>(Arrays.asList(0,1,2,3)); private ArrayList<Integer> orderList = new ArrayList<>(Arrays.asList(0,1,2,3));
private boolean isEnglish; private boolean isEnglish;
@ -84,11 +84,11 @@ public class MatchTheMeaningController implements Initializable{
/** /**
* Pick randomly dictionary entry and add it to question list where are stored questions for this test. * Pick randomly dictionary entry and add it to question list where are stored questions for this test.
*/ */
private void getQuestions(){ // private void getQuestions(){
//
answer.addAll(AssessmentGenerator.generateWordMatch()); // answer.addAll(AssessmentGenerator.generateWordMatch());
//
} // }
/** /**
* Set chosen words from dictionary on the scene. * Set chosen words from dictionary on the scene.
@ -153,7 +153,7 @@ public class MatchTheMeaningController implements Initializable{
WrongAnswer.setText(Integer.toString(Question.wrongAnswers)); WrongAnswer.setText(Integer.toString(Question.wrongAnswers));
answer.clear(); answer.clear();
this.prepare(); AssessmentGenerator.goToNextQuestion();
} }
@ -161,7 +161,7 @@ public class MatchTheMeaningController implements Initializable{
* Method responsible for preparing questions and scene. * Method responsible for preparing questions and scene.
*/ */
private void prepare(){ private void prepare(){
getQuestions(); // getQuestions();
setWords(answer,orderList); setWords(answer,orderList);
} }