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

Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20

Browse source
This commit is contained in:
top19 2020-04-30 12:46:47 +01:00
commit 5b1ac5896d
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -133,20 +133,30 @@ public class MatchTheMeaningController extends SharedCodeController {
*/
public void checkAnswers(){
ArrayList<DictionaryEntry> answers = new ArrayList<>();
ArrayList<String> listOfAnswers = new ArrayList<>();
answers.add(answer.get(Integer.parseInt(word1.getValue())-1));
answers.add(answer.get(Integer.parseInt(word2.getValue())-1));
answers.add(answer.get(Integer.parseInt(word3.getValue())-1));
answers.add(answer.get(Integer.parseInt(word4.getValue())-1));
if(isEnglish){
listOfAnswers.add(RightWord1.getText());
listOfAnswers.add(RightWord2.getText());
listOfAnswers.add(RightWord3.getText());
listOfAnswers.add(RightWord4.getText());
}else {
listOfAnswers.add(LeftWord1.getText());
listOfAnswers.add(LeftWord2.getText());
listOfAnswers.add(LeftWord3.getText());
listOfAnswers.add(LeftWord4.getText());
}else {
listOfAnswers.add(RightWord1.getText());
listOfAnswers.add(RightWord2.getText());
listOfAnswers.add(RightWord3.getText());
listOfAnswers.add(RightWord4.getText());
}
Question.checkAnswer(answer,listOfAnswers,isEnglish);
Question.checkAnswer(answers,listOfAnswers,isEnglish);
answer.clear();