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

Added changes for refactoring SixMeanings and MatchTheMeaning.

Browse source
This commit is contained in:
Brad Corbett 2020-04-28 17:43:51 +01:00
commit 46382d281b
5 changed files with 45 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Welsh Vocabulary Tutor/.gitignore vendored Normal file
View file

@ -0,0 +1,5 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# Oscar's Custom
.idea/

7
src/Welsh Vocabulary Tutor/pom.xml
View file

@ -20,6 +20,11 @@
<artifactId>javafx-fxml</artifactId>
<version>11</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.4</version>
</dependency>
</dependencies>
<build>
<plugins>
@ -36,7 +41,7 @@
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.1</version>
<configuration>
<mainClass>uk.ac.aber.cs22120.group20.App</mainClass>
<mainClass>uk.ac.aber.cs22120.group20.Application</mainClass>
</configuration>
</plugin>
</plugins>

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

@ -39,7 +39,8 @@ public class SixMeaningsController extends TranslationController implements Init
private ArrayList<Integer> orderList = new ArrayList<>(Arrays.asList(0, 1, 2, 3, 4, 5));
private int correct = 0;
private int incorrect = 0;
private String englishCounterpart;
private String wordCounterpart;
@FXML
private Text correctAnswer;
@ -70,6 +71,7 @@ public class SixMeaningsController extends TranslationController implements Init
@FXML
void temp(MouseEvent event) {
checkAnswers();
}
@ -108,13 +110,11 @@ public class SixMeaningsController extends TranslationController implements Init
}
private void setWords(LinkedList<DictionaryEntry> questions, ArrayList<Integer> orderList) {
private void setWordsE(LinkedList<DictionaryEntry> questions, ArrayList<Integer> orderList) {
//WelshWord1 Is the question word and as a result is always right.
wordToTranslate.setText(questions.get(0).getWelsh());
//This stores the correct answer for the english word.
englishCounterpart = questions.get(0).getEnglish();
wordCounterpart = questions.get(0).getEnglish();
possibleAnswer1.setText(questions.get(orderList.get(0)).getEnglish());
possibleAnswer2.setText(questions.get(orderList.get(1)).getEnglish());
possibleAnswer3.setText(questions.get(orderList.get(2)).getEnglish());
@ -123,7 +123,21 @@ public class SixMeaningsController extends TranslationController implements Init
possibleAnswer6.setText(questions.get(orderList.get(5)).getEnglish());
Collections.shuffle(orderList); //I know that this does not belong here it was moved here for debug purposes. It lives five lines up.
}
private void setWordsW(LinkedList<DictionaryEntry> questions, ArrayList<Integer> orderList) {
//WelshWord1 Is the question word and as a result is always right.
wordToTranslate.setText(questions.get(0).getEnglish());
//This stores the correct answer for the english word.
wordCounterpart = questions.get(0).getWelsh();
possibleAnswer1.setText(questions.get(orderList.get(0)).getWelsh());
possibleAnswer2.setText(questions.get(orderList.get(1)).getWelsh());
possibleAnswer3.setText(questions.get(orderList.get(2)).getWelsh());
possibleAnswer4.setText(questions.get(orderList.get(3)).getWelsh());
possibleAnswer5.setText(questions.get(orderList.get(4)).getWelsh());
possibleAnswer6.setText(questions.get(orderList.get(5)).getWelsh());
Collections.shuffle(orderList); //I know that this does not belong here it was moved here for debug purposes. It lives five lines up.
}
@ -135,27 +149,27 @@ public class SixMeaningsController extends TranslationController implements Init
String option5 = possibleAnswer5.toString();
String option6 = possibleAnswer6.toString();
if (option1 == englishCounterpart) {
if (option1 == wordCounterpart) {
correct++;
} else incorrect++;
if (option2 == englishCounterpart) {
if (option2 == wordCounterpart) {
correct++;
} else incorrect++;
if (option3 == englishCounterpart) {
if (option3 == wordCounterpart) {
correct++;
} else incorrect++;
if (option4 == englishCounterpart) {
if (option4 == wordCounterpart) {
correct++;
} else incorrect++;
if (option5 == englishCounterpart) {
if (option5 == wordCounterpart) {
correct++;
} else incorrect++;
if (option6 == englishCounterpart) {
if (option6 == wordCounterpart) {
correct++;
} else incorrect++;
@ -171,8 +185,11 @@ public class SixMeaningsController extends TranslationController implements Init
private void prepare() {
getWords(Application.dictionary);
setWords(wordSet, orderList);
Random rd = new Random();
System.out.println(rd.nextBoolean());
if (rd.nextBoolean() == true) {
setWordsE(wordSet, orderList);
} else setWordsW(wordSet, orderList);
}
@ -181,4 +198,7 @@ public class SixMeaningsController extends TranslationController implements Init
this.prepare();
}
}

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

@ -1,15 +0,0 @@
package uk.ac.aber.cs22120.group20.selfassessment;
import uk.ac.aber.cs22120.group20.json.DictionaryEntry;
import java.util.LinkedList;
public class SixMeaningsQuestion {
DictionaryEntry correctAnswer;
LinkedList<DictionaryEntry dictionary;
public SixMeaningsQuestion(DictionaryEntry correctAnswer, LinkedList<DictionaryEntry> dictionary){
this.correctAnswer = correctAnswer;
this.dictionary = dictionary;
}
}

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

@ -7,7 +7,7 @@
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.Pane?>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="MyController">
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="MatchTheMeaningQuestion">
<children>
<Button fx:id="ConfirmButton" layoutX="271.0" layoutY="321.0" mnemonicParsing="false" text="Confirm" onAction="#checkAnswers" />
<Label layoutX="248.0" layoutY="356.0" text="Match the meaning" />