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-05-01 11:31:38 +01:00
commit 3c3db4202b
7 changed files with 87 additions and 103 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/cs221/group20/javafx/MatchTheMeaningController.java
View file

@ -46,8 +46,8 @@ public class MatchTheMeaningController extends SharedCodeController {
// Instance variables. //
// /////////////////// //
private ArrayList<Integer> orderList = new ArrayList<>(Arrays.asList(0,1,2,3));
private boolean isEnglish = AssessmentGenerator.isEnglish;
private final ArrayList<Integer> orderList = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
private final boolean isEnglish = AssessmentGenerator.isEnglish;
@FXML
private ComboBox<String> word1;
@ -86,10 +86,10 @@ public class MatchTheMeaningController extends SharedCodeController {
private Label RightWord4;
@FXML
private Label CorrectAnswer;
private Label correctAnswer;
@FXML
private Label WrongAnswer;
private Label totalAnswer;
// //////// //
// Methods. //
@ -178,6 +178,7 @@ public class MatchTheMeaningController extends SharedCodeController {
AssessmentGenerator.goToNextQuestion();
}
}
private boolean checkForDuplicates(ArrayList<DictionaryEntry> wordSet) {
boolean result = false;
Set<DictionaryEntry> set = new HashSet<>(wordSet);
@ -189,7 +190,6 @@ public class MatchTheMeaningController extends SharedCodeController {
}
@FXML
private void initialize() {
setup();
@ -200,8 +200,10 @@ public class MatchTheMeaningController extends SharedCodeController {
studyText.setFill(Color.BLACK);
setWords(answer, orderList);
CorrectAnswer.setText(Integer.toString(AssessmentGenerator.getTotalCorrectAnswers()));
WrongAnswer.setText(Integer.toString(AssessmentGenerator.getTotalAnswers()));
correctAnswer.setText("Correct answers : " + AssessmentGenerator.getTotalCorrectAnswers());
totalAnswer.setText("Total answers : " + AssessmentGenerator.getTotalAnswers());
}
}

26
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/SixMeaningsController.java
View file

@ -16,7 +16,9 @@ import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs221.group20.selfassessment.Question;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
/**
* A class that generate questions and check answers for match the meaning test.
@ -45,16 +47,16 @@ public class SixMeaningsController extends SharedCodeController {
// Instance variables. //
// /////////////////// //
private ArrayList<DictionaryEntry> wordSet = new ArrayList<>();
private ArrayList<Integer> orderList = new ArrayList<>(Arrays.asList(0, 1, 2, 3, 4, 5));
private final ArrayList<DictionaryEntry> wordSet = new ArrayList<>();
private final ArrayList<Integer> orderList = new ArrayList<>(Arrays.asList(0, 1, 2, 3, 4, 5));
private String wordCounterpart;
private boolean isEnglish = AssessmentGenerator.isEnglish;
private final boolean isEnglish = AssessmentGenerator.isEnglish;
@FXML
private Text correctAnswer;
private Label correctAnswer;
@FXML
private Text wrongAnswer;
private Label totalAnswer;
@FXML
private Label wordToTranslate;
@ -86,26 +88,31 @@ public class SixMeaningsController extends SharedCodeController {
wordCounterpart = possibleAnswer1.getText();
checkAnswers();
}
@FXML
void answer2(MouseEvent event) {
wordCounterpart = possibleAnswer2.getText();
checkAnswers();
}
@FXML
void answer3(MouseEvent event) {
wordCounterpart = possibleAnswer3.getText();
checkAnswers();
}
@FXML
void answer4(MouseEvent event) {
wordCounterpart = possibleAnswer4.getText();
checkAnswers();
}
@FXML
void answer5(MouseEvent event) {
wordCounterpart = possibleAnswer5.getText();
checkAnswers();
}
@FXML
void answer6(MouseEvent event) {
wordCounterpart = possibleAnswer6.getText();
@ -113,7 +120,6 @@ public class SixMeaningsController extends SharedCodeController {
}
public void setWords(ArrayList<DictionaryEntry> questions, ArrayList<Integer> orderList) {
if (isEnglish) {
@ -153,7 +159,6 @@ public class SixMeaningsController extends SharedCodeController {
}
public void checkAnswers() {
ArrayList<String> answer = new ArrayList<>();
@ -163,7 +168,6 @@ public class SixMeaningsController extends SharedCodeController {
Question.checkAnswer(wordSet, answer, isEnglish);
wordSet.clear();
AssessmentGenerator.goToNextQuestion();
@ -182,9 +186,9 @@ public class SixMeaningsController extends SharedCodeController {
setWords(allQuestions, orderList);
correctAnswer.setText(Integer.toString(AssessmentGenerator.getTotalCorrectAnswers()));
correctAnswer.setText("Correct answers : " + AssessmentGenerator.getTotalCorrectAnswers());
wrongAnswer.setText(Integer.toString(AssessmentGenerator.getTotalAnswers()));
totalAnswer.setText("Total answers : " + AssessmentGenerator.getTotalAnswers());
}

20
src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs221/group20/javafx/TranslationController.java
View file

@ -1,26 +1,25 @@
package uk.ac.aber.cs221.group20.javafx;
import javafx.fxml.FXML;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.paint.Color;
import javafx.scene.text.Text;
import java.util.ArrayList;
import java.util.Random;
import uk.ac.aber.cs221.group20.json.DictionaryEntry;
import uk.ac.aber.cs221.group20.selfassessment.AssessmentGenerator;
import uk.ac.aber.cs221.group20.selfassessment.Question;
import java.util.ArrayList;
import java.util.Random;
/**
* Controller for the translationTest fxml file.
*
* @author Brad Corbett brc9
* @version 0.1
*
*/
public class TranslationController extends SharedCodeController {
@ -48,10 +47,10 @@ public class TranslationController extends SharedCodeController{
private Text wordToTranslate;
@FXML
private Text correctGuesses;
private Label correctAnswer;
@FXML
private Text incorrectGuesses;
private Label totalAnswer;
@FXML
private ImageView submitButton;
@ -78,15 +77,14 @@ public class TranslationController extends SharedCodeController{
submitButton.setImage(new Image("file:src/main/resources/assets/icons/black_icons/50px/right-50.png"));
correctGuesses.setText("Correct answers: " + AssessmentGenerator.getTotalCorrectAnswers());
incorrectGuesses.setText("Total answers: " + AssessmentGenerator.getTotalAnswers());
correctAnswer.setText("Correct answers : " + AssessmentGenerator.getTotalCorrectAnswers());
totalAnswer.setText("Total answers : " + AssessmentGenerator.getTotalAnswers());
if (AssessmentGenerator.isEnglish) {
wordToTranslate.setText(answer.getEnglish());
}
else{
} else {
wordToTranslate.setText(answer.getWelsh());
}
}

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

@ -93,7 +93,6 @@ public class AssessmentGenerator {
// wordsToTranslate.add(Application.practiseList.get(wordToTranslatePlace));
// wordsToTranslate.toArray();
// }
System.out.println(practiseList.size());
if(practiseList.size() > 3) {
if (((listOfAssessment.isEmpty()) || !(listOfAssessment.getLast() instanceof MatchTheMeaningQuestion))) {
generatedAssessment = generateMatchMeaning(practiseList);

18
src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs221/group20/matchthemeaning.fxml
View file

@ -128,28 +128,18 @@
<children>
<HBox alignment="TOP_RIGHT" prefHeight="0.0" prefWidth="583.0">
<children>
<Label text="Correct answers:">
<Label fx:id="correctAnswer">
<font>
<Font size="17.0" />
</font>
</Label>
<Label fx:id="CorrectAnswer" text="0">
<font>
<Font size="17.0" />
<Font name="Consolas" size="17.0" />
</font>
</Label>
</children>
</HBox>
<HBox alignment="TOP_RIGHT" layoutX="10.0" layoutY="33.0" prefHeight="1.0" prefWidth="583.0">
<children>
<Label text="Total answers:">
<Label fx:id="totalAnswer" layoutX="405.0" layoutY="50.0">
<font>
<Font size="17.0" />
</font>
</Label>
<Label fx:id="WrongAnswer" text="0">
<font>
<Font size="17.0" />
<Font name="Consolas" size="17.0" />
</font>
</Label>
</children>

18
src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs221/group20/sixmeanings.fxml
View file

@ -150,24 +150,14 @@
<font>
<Font size="14.0" />
</font></Text>
<Text fx:id="wrongAnswer" layoutX="554.0" layoutY="69.0" strokeType="OUTSIDE" strokeWidth="0.0" text="0" wrappingWidth="22.46875">
<Label fx:id="totalAnswer" layoutX="405.0" layoutY="50.0">
<font>
<Font size="17.0" />
</font>
</Text>
<Label layoutX="405.0" layoutY="50.0" text="Incorrect answers:">
<font>
<Font size="17.0" />
<Font name="Consolas" size="17.0" />
</font>
</Label>
<Text fx:id="correctAnswer" layoutX="554.0" layoutY="43.0" strokeType="OUTSIDE" strokeWidth="0.0" text="0">
<Label fx:id="correctAnswer" layoutX="405.0" layoutY="24.0">
<font>
<Font size="17.0" />
</font>
</Text>
<Label layoutX="411.0" layoutY="24.0" text="Correct answers:">
<font>
<Font size="17.0" />
<Font name="Consolas" size="17.0" />
</font>
</Label>
</children>

13
src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs221/group20/translation.fxml
View file

@ -13,6 +13,7 @@
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.text.Text?>
<?import javafx.scene.text.Font?>
<?import javafx.scene.control.Label?>
<BorderPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="uk.ac.aber.cs221.group20.javafx.TranslationController"
@ -140,16 +141,16 @@
<Font size="33.0" />
</font>
</Text>
<Text fx:id="correctGuesses" layoutX="407.0" layoutY="20.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Correct Guesses: 0" wrappingWidth="227.18359375">
<Label fx:id="totalAnswer" layoutX="405.0" layoutY="50.0">
<font>
<Font size="17.0" />
<Font name="Consolas" size="17.0" />
</font>
</Text>
<Text fx:id="incorrectGuesses" layoutX="407.0" layoutY="43.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Incorrect Guesses: 0">
</Label>
<Label fx:id="correctAnswer" layoutX="405.0" layoutY="24.0">
<font>
<Font size="17.0" />
<Font name="Consolas" size="17.0" />
</font>
</Text>
</Label>
<ImageView fx:id="submitButton" fitHeight="46.0" fitWidth="69.0" layoutX="398.0" layoutY="199.0" onMouseClicked="#translateWord" pickOnBounds="true" preserveRatio="true" />
</children>
</AnchorPane>