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

Current Assessment is now incremented in Assessment gen

Browse source 
Current Assessment is now incremented in Assessment gen, so now the same test doesn't loop over and over
This commit is contained in:
law39 2020-04-29 13:50:11 +01:00
parent 3c10311a4d
commit 447ba58b7e
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);
}
AssessmentGenerator.listOfAssessment = listOfAssessment;
goToNextQuestion();
return listOfAssessment;
}
@ -130,7 +131,7 @@ public class AssessmentGenerator {
Question currentQuestion = listOfAssessment.get(currentAssessment);
if(currentQuestion instanceof MatchTheMeaningQuestion){
MatchTheMeaningController.answer = (ArrayList<DictionaryEntry>) Arrays.asList(((MatchTheMeaningQuestion) currentQuestion).getCorrectAnswer());
MatchTheMeaningController.answer = ((MatchTheMeaningQuestion) currentQuestion).getCorrectAnswer();
ScreenSwitch.swap(ScreenSwitch.SceneEnum.matchMeaningScene);
}else if (currentQuestion instanceof SixMeaningsQuestion){
SixMeaningsController.allQuestions = ((SixMeaningsQuestion) currentQuestion).getCorrectAnswer();
@ -143,6 +144,7 @@ public class AssessmentGenerator {
System.err.println(currentQuestion);
}
currentAssessment++;
}