Commit graph

551 commits

Author SHA1 Message Date
ncw
975f4289de Fixed Issue #19
-Subject line to be changed from "Word Template" to "Test Specification"
-Config Ref: Updated to (DesignSpecGroup20).
-Status: Set to (Release).
2020-04-29 13:12:05 +01:00
law39
8ae94fd397 Updated Match Meaning controller
Match Meaning controller now goes to next Assessment automatically
2020-04-29 13:12:02 +01:00
top19
5b3cf54750 Added the JSON JUnit tests. 2020-04-29 13:10:03 +01:00
ncw
68a8ac7e8c Fixed issue #19
-Subject line to be changed from "Word Template" to "Test Specification"
-Config Ref: Updated to (DesignSpecGroup20).
-Status: Set to (Release).
2020-04-29 13:02:50 +01:00
law39
861390c016 Added Six Meanings test to screen switcher
The screen switcher is now able to switch screens to the Six Meanings test
2020-04-29 13:01:08 +01:00
Brad Corbett
4aa2621043 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-29 12:59:29 +01:00
Brad Corbett
c220a5376f Changed controllers to work with static variables and functions. 2020-04-29 12:59:09 +01:00
osp1
932ff1cbc7 Deleted AddWordText.java
The test was accidentally created
2020-04-29 12:58:43 +01:00
maj83
53eb04e12c Changes to variable names and types 2020-04-29 12:48:41 +01:00
osp1
b4577b99f4 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-29 12:26:16 +01:00
osp1
a4b8c91d7c Changed classes to use screenSwitch
- Application
- DictionaryController
- PracticeListController
- FlashcardController
2020-04-29 12:24:11 +01:00
law39
e67abcffa2 Merge remote-tracking branch 'origin/master' 2020-04-29 12:22:31 +01:00
Brad Corbett
9bd1330513 Changed the variable name for answers to be consistent across controllers. 2020-04-29 12:13:32 +01:00
law39
a0254f5259 Updated Questions to use standard getters
Questions now have standard getters to get the correct answers
2020-04-29 12:11:41 +01:00
maj83
3af75ebaf7 Changes to onClick events 2020-04-29 12:10:19 +01:00
maj83
aeaea902c2 Changed code to be more compatibile with other clasess 2020-04-29 12:06:19 +01:00
top19
f88f1ded44 Updated DictionaryEntry to override the default Java equals method. 2020-04-29 12:05:43 +01:00
Brad Corbett
ef8ce148ef Update SixMeaningsQuestion controller to be public. 2020-04-29 11:58:22 +01:00
top19
ce18020eae Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-29 11:49:39 +01:00
Brad Corbett
99e7635b12 Changed constructor to reflect deisgn spec. 2020-04-29 11:46:16 +01:00
top19
70dd1a57d8 Updated module-info to work with junit in the test package. 2020-04-29 11:45:25 +01:00
ncw
c4a79d4cd5 Fixes issue #12
-Replaced instances of WelshDictionary to Dictionary Entry.
-Version Number Updated
-CCF # updated.
2020-04-29 11:35:42 +01:00
ncw
10b7395ee5 Fixes issue #12
-Replaced instances of WelshDictionary to Dictionary Entry.
-Version Number Updated
-CCF # updated.
2020-04-29 11:35:20 +01:00
law39
1ccc033759 Added question navigation
Use AssessmentGenerator.goToNextQuestion() to go to the next assessment queued in the list.
2020-04-29 11:25:51 +01:00
Brad Corbett
1b8cc34bf8 Added changes to TranslationController.java to work with eventual implementation of AssessmentGenerator. 2020-04-29 11:22:02 +01:00
law39
ddb70a042c Merge remote-tracking branch 'origin/master' 2020-04-29 11:12:43 +01:00
law39
899a0eb97f Assessment Generator now delegates answer selection to methods 2020-04-29 11:12:35 +01:00
osp1
7886249438 Centered the logo in README.md
- Used divs to center the logo in the readme file.
2020-04-29 11:11:53 +01:00
law39
4a650ffd79 Merge remote-tracking branch 'origin/master' 2020-04-29 11:11:09 +01:00
law39
e66c79cc61 Question Classes now extend the Question Superclass
Question classes specific to assessment types now extend the Super class
2020-04-29 11:10:59 +01:00
Brad Corbett
a8b05f574a Added changes to TranslationController. 2020-04-29 11:08:22 +01:00
ncw
5d8f643f6a File has been amended to adjust for multiple issues. CCF numbers have been changed to reflect issue numbers along with updates to the Document History. Version number has been updated to 1.0 in line with issue #11 on the git lab. PDF VERSION. 2020-04-29 10:46:14 +01:00
ncw
79e2a11060 File has been amended to adjust for multiple issues. CCF numbers have been changed to reflect issue numbers along with updates to the Document History. Version number has been updated to 1.0 in line with issue #11 on the git lab. 2020-04-29 10:45:43 +01:00
law39
909b7430d0 Updated Assessment Generator
Added isEnglish boolean to assessment generator
2020-04-29 10:42:25 +01:00
Brad Corbett
4122589f53 Added constructors for different types of questions. 2020-04-29 10:12:30 +01:00
osp1
429417e7f6 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-29 10:07:56 +01:00
osp1
7dda924cd7 Added Flashcard and removed unused classes 2020-04-29 10:07:37 +01:00
ncw
0cf433e79e Updated Test Specification to adjust for issue raised in GitlLab #8. 2020-04-29 10:03:49 +01:00
ncw
7afd590374 Updated Test Specification to adjust for issue raised in GitlLab #8. 2020-04-29 10:03:29 +01:00
ncw
72790a5ffb Addition of Test Specification.docx inline with Issue #7 in the GitLab. 2020-04-29 09:54:50 +01:00
osp1
fab019a69d Added Junit library to project 2020-04-29 09:54:05 +01:00
law39
11bdc8cb48 Added Scenes to SceneEnum
Added Scenes to SceneEnum, so now all all FXML should be there.
2020-04-29 09:23:22 +01:00
law39
c6568eea94 Added new system for switching screens
Added new ScreenSwitcher, will warn if you use the legacy system for switching screens.
The old method has now been depreciated and you should switch over ASAP.
2020-04-28 21:42:06 +01:00
Brad Corbett
e202b18d31 Added classes for the MatchTheMeaningQuestion and SixMeaningsQuestion. 2020-04-28 17:59:01 +01:00
Brad Corbett
8ad18bfa42 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-28 17:56:27 +01:00
maj83
b681b485af Upload New File 2020-04-28 17:51:54 +01:00
maj83
b3dbacb57f Delete MatchTheMeaningQuestion.java 2020-04-28 17:51:41 +01:00
Brad Corbett
46382d281b Added changes for refactoring SixMeanings and MatchTheMeaning. 2020-04-28 17:43:51 +01:00
maj83
8f16314814 Changes to fx:id controller 2020-04-28 17:40:40 +01:00
maj83
a073a21b28 Refactored MatchTheMeaningQuestion to MatchTheMeaningController 2020-04-28 17:38:16 +01:00