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
maj83
d5c249ef1b
Moved checking ansewer and generating questions methods to question and assesment generator classes accordingly. Changed variables to be more neutral.
2020-04-28 11:11:12 +01:00
maj83
f3a739cfa3
Added method to check answers for all tests
2020-04-28 11:08:24 +01:00
maj83
09cc8936f7
Made changes to fx:id to be more neutral
2020-04-28 11:06:52 +01:00
maj83
a582567a72
Made changes to fx:id to be more neutral
2020-04-28 11:03:42 +01:00
Brad Corbett
90a858feeb
Updated translation controller and fxml file.
2020-04-28 10:59:48 +01:00
Brad Corbett
7050b07171
Edited SixMeanings FXML and Java file to be work with JavaFX
2020-04-28 10:41:50 +01:00
ncw
fdaa8dc039
Addition of 'sixmeanings.FXML'.
2020-04-28 10:11:23 +01:00
ncw
2cbd2d6a40
Update SixMeaningsQuestion.java
2020-04-28 05:49:10 +01:00
ncw
16dc887c3e
Addition on SixMeaningsQuestion.class
2020-04-28 05:48:02 +01:00
osp1
4e1bb05b79
Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20
2020-04-27 19:05:53 +01:00
osp1
4528c771d4
Fixed issues in Application, Dictionary, Practise
...
- Fixed Application FXML Loader
- Dictionary and Practise list now load
2020-04-27 19:01:05 +01:00
Brad Corbett
de159b2dfd
Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20
2020-04-27 16:58:58 +01:00
Brad Corbett
2111c1ff31
Added updated TranslationController.
2020-04-27 16:58:15 +01:00
maj83
20b3e0c598
Update Question.java
2020-04-27 16:42:51 +01:00
maj83
8d9545f86b
Changes to queston class
2020-04-27 16:40:56 +01:00
maj83
0517aab09e
Changes to queston class
2020-04-27 16:39:27 +01:00
top19
e387e4dbfb
Integrated sharedcodecontroller with FlashcardScreenController and documented it.
2020-04-27 14:59:00 +01:00
Brad Corbett
ca01f8e525
Changed translationController to work in the project folder.
2020-04-27 11:13:47 +01:00
osp1
b37bc0b5e4
Added all classes for the program in src
...
- With the exception of the 6Meanings test.
2020-04-27 10:43:28 +01:00
kab74
f691e5d32e
Created New Folder For Intergration Starting From Monday
2020-04-27 10:25:19 +01:00
Brad Corbett
6b2680f7ae
Added minutes for 2020-04-27.
2020-04-27 09:54:45 +01:00
