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

493 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
osp1
be12adbe53 Fixed a few issues with sorting in Dictionary page 
- The alpha sort button now changes correctly.
 2020-04-26 21:51:34 +01:00
osp1
14e1e52f25 Added fully functional Dictionary & Practice pages 
Dictionary and Practice pages both are 100% functional.
The only a few changes need to still be made:
- Commenting
- Alpha sort icons needs to change on click
- Highlighted words need to have white text (CSS)
- Headers need to be removed (CSS)
 2020-04-26 18:26:49 +01:00
Brad Corbett
ff50a385a3 Added JavaDoc for TranslationTest 2020-04-26 16:24:08 +01:00
maj83
8a03c06357 Applied changes for SE.QA.09 compliance 2020-04-26 14:40:29 +01:00
maj83
bffd28d20d Add new directory 2020-04-26 14:26:34 +01:00
law39
08a4f5e4bc Updated sharedcodecontroller 
Shared code compiler now runs to show main screen, if it didn't already.
 2020-04-25 22:08:43 +01:00
top19
530d038c33 Added updated sharedcodecontroller that also features the menus FXML. 2020-04-25 21:48:50 +01:00
Henry Dugmore
3c61739104 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-25 18:24:18 +01:00
Henry Dugmore
5102439215 Added Add Word Screen 
Added fully functional add word screen that displays errors for existing entry and blank fields.
Adds words to dictionary list if no errors.
 2020-04-25 18:20:42 +01:00
kab74
2996adc409 Added a template for program. Added a list of issues. The template is not yet complete, needs some ironing out. 2020-04-25 16:30:49 +01:00
osp1
ddbf6c31b9 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-25 13:55:22 +01:00
osp1
19f8c439e6 Remastered old icons and added new icons, changed dir structure for icons 2020-04-25 13:55:14 +01:00
kab74
c76ae83470 Created template for WelshVocabularyTutor. And a list of issues to add to git. Plus there are still some issues needing resolving with the template, 
but I'll speak to osp1 about it.
 2020-04-25 10:46:33 +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
law39
51d6b9692f Applied changes for SE.QA.09 compliance in live search 
Applied changes to ensure compliance with the SE.QA.09 Java Coding Standards
 2020-04-24 16:03:41 +01:00
law39
069e6df96a Added IntelliJ gitignore 
Added IntelliJ gitignore to ignore files not required to be uploaded to GitLab, taken from https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
 2020-04-22 19:17:47 +01:00
law39
b0a9ec99da Live search with verbs improved 
Live search now matches both ['to' + a word] or [a word] if the word is a verb
 2020-04-22 19:04:58 +01:00