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-29 13:50:48 +01:00
commit 52692f6b78
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,6 +67,7 @@ public class AssessmentGenerator {
listOfAssessment.add(generatedAssessment); listOfAssessment.add(generatedAssessment);
} }
AssessmentGenerator.listOfAssessment = listOfAssessment; AssessmentGenerator.listOfAssessment = listOfAssessment;
goToNextQuestion();
return listOfAssessment; return listOfAssessment;
} }
@ -130,7 +131,7 @@ public class AssessmentGenerator {
Question currentQuestion = listOfAssessment.get(currentAssessment); Question currentQuestion = listOfAssessment.get(currentAssessment);
if(currentQuestion instanceof MatchTheMeaningQuestion){ if(currentQuestion instanceof MatchTheMeaningQuestion){
MatchTheMeaningController.answer = (ArrayList<DictionaryEntry>) Arrays.asList(((MatchTheMeaningQuestion) currentQuestion).getCorrectAnswer()); MatchTheMeaningController.answer = ((MatchTheMeaningQuestion) currentQuestion).getCorrectAnswer();
ScreenSwitch.swap(ScreenSwitch.SceneEnum.matchMeaningScene); ScreenSwitch.swap(ScreenSwitch.SceneEnum.matchMeaningScene);
}else if (currentQuestion instanceof SixMeaningsQuestion){ }else if (currentQuestion instanceof SixMeaningsQuestion){
SixMeaningsController.allQuestions = ((SixMeaningsQuestion) currentQuestion).getCorrectAnswer(); SixMeaningsController.allQuestions = ((SixMeaningsQuestion) currentQuestion).getCorrectAnswer();
@ -143,6 +144,7 @@ public class AssessmentGenerator {
System.err.println(currentQuestion); System.err.println(currentQuestion);
} }
currentAssessment++;
} }