noble/uni-group-project
noble/uni-group-project
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
347 commits 1 branch 0 tags 58 MiB
Commit graph

165 commits

Author SHA1 Message Date
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
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
899a0eb97f Assessment Generator now delegates answer selection to methods 2020-04-29 11:12:35 +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
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
7dda924cd7 Added Flashcard and removed unused classes 2020-04-29 10:07:37 +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
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
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
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
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
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
2111c1ff31 Added updated TranslationController. 2020-04-27 16:58:15 +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
osp1
19f8c439e6 Remastered old icons and added new icons, changed dir structure for icons 2020-04-25 13:55:14 +01:00
osp1
8e214baefd Added 'resources' directory and added icons in both black and white 
- Added '/src/resources' directory for resources to be used in the program
or any future documentation
- Added 'src/resources/icons' directory which holds all the icons needed
for the program
- Added black versions of the icons
- Added white versions of the icons
 2020-04-24 22:47:45 +01:00
Brad Corbett
bb0211a551 Added 'Translation' test demo project. 2020-04-07 03:27:12 +01:00
law39
1015736283 Added Programming Project 
Added base template project including:
basic javadoc comments.
Maven JavaFX setup.
Placeholder JavaFX controllers and FXML files.
 2020-04-01 02:41:00 +01:00
ncw
739cd2ed0b Setting Up Git Repository. 2020-02-12 14:48:58 +00:00