Commit graph

581 commits

Author SHA1 Message Date
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
Brad Corbett
4c9b03b04f Added refactoring for SixMeanings and MatchTheMeaning. 2020-04-28 17:25:14 +01:00
maj83
fea97eb8b5 Update matchthemeaning.fxml 2020-04-28 17:05:04 +01:00
ncw
95bbf51d86 Replace sixmeanings.fxml 2020-04-28 17:03:16 +01:00
ncw
2baf754c66 Delete SixMeaningsQuestion.java 2020-04-28 17:02:43 +01:00
ncw
d0e7fee5a2 Upload of refactored SixMeaningsQuestion now called SixMeaningsController. 2020-04-28 17:02:13 +01:00
ncw
cec730bfba Replace SixMeaningsQuestion.java 2020-04-28 16:41:53 +01:00
osp1
2733c38511 Added jackson to pom 2020-04-28 16:31:34 +01:00
osp1
3efd12de7f Removed .idea and resources 2020-04-28 16:08:38 +01:00
Henry Dugmore
ded93411a1 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-28 15:41:31 +01:00
Henry Dugmore
7564bf1649 Removed prints used for testing and changed addword.fxml to remove version error
Edited the Saved success pop up to show the entry that has been added to the dictionary. Also removed the print statements that were used for initial testing and also changed the version in addword.fxml to remove the version error that came up every time.
2020-04-28 15:38:02 +01:00
maj83
4ab1600cc5 Tidied up the code 2020-04-28 15:27:42 +01:00
Brad Corbett
bb41340481 Uploaded currently unfinished Assessment Generator class for others to look at. 2020-04-28 13:59:38 +01:00
osp1
0b8d11f207 Added practistList to Application 2020-04-28 13:33:40 +01:00
ncw
c8840bb251 Replace sixmeanings.fxml 2020-04-28 13:28:13 +01:00
ncw
82f02e5e16 Replace SixMeaningsQuestion.java 2020-04-28 13:27:17 +01:00
Henry Dugmore
25f21ccef3 Integrated AddWordController
Fixed null pointer exception in the one or more blanks check.
Created addwordtest
2020-04-28 12:23:12 +01:00
ncw
307b0a18b1 Spelling changes to SixMeaningsQuestion.java 2020-04-28 12:04:13 +01:00
maj83
cf5e47b58c Added method to generate questions for match the meaning 2020-04-28 11:21:43 +01:00
ncw
ab7f1bec7d Updated SixMeaningsQuestion.java 2020-04-28 11:15:32 +01:00
ncw
31c1a501b0 Updated sixmeanings.fxml 2020-04-28 11:14:25 +01:00