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

315 commits

Author SHA1 Message Date
top19
7a35413498 Removde tilted pane from translation and sixmeanings fxml. 2020-04-30 13:45:07 +01:00
top19
643de20ef9 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-30 13:18:00 +01:00
top19
2ff007d378 Make the practice and dictionary sort by language sort by default 2020-04-30 13:17:28 +01:00
Brad Corbett
467a54f2c0 Updated QuestionTest class. 2020-04-30 13:02:12 +01:00
law39
dd987ba58b Merge remote-tracking branch 'origin/master' 2020-04-30 12:48:43 +01:00
law39
8a9de02e74 Assessment now gives a final score in percentage 
Percentage is preferable rather than display the arbitrary number of wrong answers generated by the six meaning assessment.
 2020-04-30 12:48:38 +01:00
top19
5b1ac5896d Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-30 12:46:47 +01:00
top19
70edefd4a6 Updated flashcard to display based on the language sort. 2020-04-30 12:46:19 +01:00
maj83
becf069f04 Changed checkAnswer method. 2020-04-30 12:39:44 +01:00
law39
0c56cfd033 Merge remote-tracking branch 'origin/master' 2020-04-30 12:34:09 +01:00
law39
fdf09aba31 Added Feedback to assessment 
At the end of each assessment, the user is told the correct answer, and if their answer was correct
 2020-04-30 12:34:03 +01:00
osp1
937b6beee8 Made wordType enum and added words are now in PL 2020-04-30 12:33:18 +01:00
Brad Corbett
c19822023a Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-30 12:24:00 +01:00
Brad Corbett
c8ccba45db Added updated QuestionTest class. 2020-04-30 12:23:25 +01:00
osp1
31bbd11187 Refactored practiseList>practiceList in Flashcard 2020-04-30 12:16:39 +01:00
osp1
d8ef5b0b2e Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-30 12:14:36 +01:00
osp1
e7d1d09130 Refactored practiseList->practiceList in Generator 2020-04-30 12:13:31 +01:00
law39
ddeb1b60b8 Merge remote-tracking branch 'origin/master' 2020-04-30 12:12:55 +01:00
law39
3ace4ac40d Added TestFX to module.info 
TestFX is now exported to the test package.
 2020-04-30 12:12:52 +01:00
osp1
37d597f356 Refactored practiseList to practiceList 2020-04-30 12:11:41 +01:00
top19
86ac605086 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-30 12:04:55 +01:00
top19
1d40ac93a8 Changed flashcard to flip an image instead of a rectangle. 2020-04-30 12:04:05 +01:00
law39
0d54e54d99 Fixed Assessment Generator 
Assessment would not run due to a logic error causing a null reference exception, this is now fixed.
 2020-04-30 12:03:57 +01:00
law39
05b7c10014 Merge remote-tracking branch 'origin/master' 2020-04-30 11:47:09 +01:00
law39
0d38840842 Fixed broken JUnit setup 2020-04-30 11:46:55 +01:00
osp1
c1984b6c97 Added flashcard image 2020-04-30 11:46:35 +01:00
law39
3beb45941c Merge remote-tracking branch 'origin/master' 2020-04-30 11:26:49 +01:00
law39
740f7b5206 Added TestFX 
TestFX is now setup and ready to use.
Junit 4 has been removed.
Junit Jupiter (5) is now the only version available.
Tests using Junit 4 have been updated to use Jupiter.
 2020-04-30 11:26:43 +01:00
maj83
d482fb7090 Updated MatchTheMeaningController.java 2020-04-30 11:25:23 +01:00
maj83
d6dddef6e2 Updated SixMeaningsController.java 2020-04-30 11:22:12 +01:00
top19
fb2c9f0272 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-30 11:16:00 +01:00
top19
37302654f4 Documented SharedCodeController. 2020-04-30 11:15:12 +01:00
law39
d5ef05b76e Merge remote-tracking branch 'origin/master' 2020-04-30 10:42:36 +01:00
law39
defb64e6e0 Fixed bug is AssessmentGenerator 
After controllers move to JavaFX assessment generator no longer had them imported, this is now corrected.
 2020-04-30 10:42:29 +01:00
Brad Corbett
b4ee0f7f60 Added current TranslationControllerTest class. 2020-04-30 10:42:01 +01:00
law39
807faab075 Merge remote-tracking branch 'origin/master' 2020-04-30 10:39:24 +01:00
law39
8eb6346e61 Added Assessment Generator test 
Added Assessment Generator test
 2020-04-30 10:39:20 +01:00
osp1
87a1be429e Fixed loading of images, Dictionary 2020-04-30 10:30:52 +01:00
osp1
09dc720b37 Fixed button scalling in AddWord 2020-04-30 10:30:12 +01:00
top19
4923206ed8 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-30 09:49:11 +01:00
top19
6cab2a0264 Integrated sharedcodecontroller with the self assessments. 2020-04-30 09:48:06 +01:00
law39
16279ee39b Merge remote-tracking branch 'origin/master' 2020-04-30 09:37:30 +01:00
law39
2ac44cbf39 Updated behaviour in Assessment generator 
Assessment generator now requires only a minimum of 5 practice words, rather than 10
 2020-04-30 09:36:16 +01:00
Henry Dugmore
9e0176d643 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-30 09:28:31 +01:00
law39
76e69d2859 Assessment Generator behaviour update 
On not enough practice words the screen is no longer force to switch to the dictionary and remains on the previously selected one
 2020-04-30 09:26:51 +01:00
Henry Dugmore
4d768483bd Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-30 09:25:53 +01:00
top19
134e942740 Made SharedCodeController properly switch to the self assessments when clicking 'Study'. 2020-04-30 09:22:39 +01:00
Henry Dugmore
75b3d5f6fa Pushed updated addword.fxml 
Wrong version was causing an error in the console every time the code was run
 2020-04-30 09:22:14 +01:00
top19
832c90f81c Removed the placeholder screenswitching buttons. 2020-04-30 09:20:33 +01:00
law39
2f3cf1100e Merge remote-tracking branch 'origin/master' 2020-04-29 18:15:58 +01:00
Brad Corbett
f07dbc4951 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-29 17:52:27 +01:00
law39
06da67d84c Merge remote-tracking branch 'origin/master' 2020-04-29 17:52:02 +01:00
Brad Corbett
2e9a455092 Added current test class for TranslationController. 2020-04-29 17:51:58 +01:00
law39
ddedd57988 Reduced code duplication 
Reduced code duplication in Assessment Generator
 2020-04-29 17:51:57 +01:00
top19
528e540122 Integrated add word controller with menu. 2020-04-29 17:51:41 +01:00
top19
98ab901a51 Integrated flashcard with menu 2020-04-29 17:41:57 +01:00
law39
72a14f51c1 Merge remote-tracking branch 'origin/master' 2020-04-29 17:40:39 +01:00
law39
ace0217f62 Added trim to Dictionary Entry 
Added trim to Dictionary Entry, this removes white space preceding and following strings. This has been applied to the English, Welsh and Word Type Strings.
 2020-04-29 17:40:28 +01:00
top19
329b6b61ad Integrated practice screen with menu. 2020-04-29 17:28:40 +01:00
law39
b17eedcaae Merge remote-tracking branch 'origin/master' 2020-04-29 17:20:53 +01:00
law39
a494ed58bf Made isEnglish public 
Made isEnglish public so Brad can perform his tests
 2020-04-29 17:20:46 +01:00
top19
e69991a4ac Integrated dictionary screen with the menu.c 2020-04-29 17:19:42 +01:00
law39
5d9a1d4084 Fixed Special Characters test 
Fixed special characters test, was comparing a String with a textbox rather than the String with the textbox contents
 2020-04-29 17:08:40 +01:00
Henry Dugmore
ea5ef1c5f1 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-29 17:00:57 +01:00
Henry Dugmore
b290e0faa1 Adding AddWordControllerTest again 
added a method for luke to look at :)
 2020-04-29 16:59:45 +01:00
kab74
05d2f829f8 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-29 16:52:42 +01:00
maj83
dd59c2a9fd Update MatchTheMeaningController.java 2020-04-29 16:51:31 +01:00
law39
64cc28c8ee Merge remote-tracking branch 'origin/master' 2020-04-29 16:50:44 +01:00
law39
29554247c0 Updated user prompt at end of assessment 
At the end of assessment, the user will be prompted to ask if they wish to continue assessment, or if they would like to stop.
This dialogue box now appears with Yes/No options rather than Okay/Cancel.
 2020-04-29 16:49:17 +01:00
law39
7655b70fcd Added error message if Assessment is run without enough words 
If assessment is attempted to be run without at least 10 words, an error message will appear prompting the user to add more.
 2020-04-29 16:47:48 +01:00
top19
ed93affd9c Added shared code controller. 2020-04-29 16:46:36 +01:00
law39
bc9cce00e2 Merge remote-tracking branch 'origin/master' 2020-04-29 16:07:11 +01:00
law39
1858c23217 Updated Assessment generator 
Assessment generator now uses practice list passed to it.
Added message box at end of assessment giving a score and asking if the user wants to retry.
Updated FlashcardController to pass the practice list to the assessment generator
 2020-04-29 16:02:25 +01:00
kab74
6aee835a9d Add DictionaryEntryTest 2020-04-29 15:46:33 +01:00
Brad Corbett
e670f7ca5c Changed controllers to properly track right and wrong answers. 2020-04-29 15:46:30 +01:00
Henry Dugmore
cd083bcd1b Changed AddWordController to start words as practice words 
Changed false to true so words added to the dictionary will be added as practice words by default
 2020-04-29 15:37:21 +01:00
top19
2bc2c415af Updated flashcard initialize method and added some documentation. 2020-04-29 15:31:24 +01:00
law39
d8808a3b9e Updated FlashCard Controller 
FlashCard next scene button now loads up assignments
 2020-04-29 14:09:11 +01:00
law39
b4f63d2500 Updated Screen Switch to give better error logging on failed load 2020-04-29 14:07:47 +01:00
law39
9e7b691970 Updated module info to add JavaFX to selfassessment package 2020-04-29 14:07:26 +01:00
law39
8c4bb12d46 Match the meaning now uses lists rather than arrays 2020-04-29 14:06:34 +01:00
top19
80b5ac99b7 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-29 13:51:42 +01:00
top19
52692f6b78 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-29 13:50:48 +01:00
Brad Corbett
3f23ee09e5 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-29 13:50:39 +01:00
law39
447ba58b7e Current Assessment is now incremented in Assessment gen 
Current Assessment is now incremented in Assessment gen, so now the same test doesn't loop over and over
 2020-04-29 13:50:11 +01:00
Brad Corbett
6f6d84db32 Swapped around the if statements for isEnglish. 2020-04-29 13:50:09 +01:00
top19
a8afcf3560 Fixed JSONTest's NullPointer error. 2020-04-29 13:49:38 +01:00
maj83
3c10311a4d Updated SixMeaningsController.java 2020-04-29 13:32:22 +01:00
law39
98dfa72e40 Updated AssessmentGenerator 
Assessment Generator now controls the switching of assessments and the setup of assessments.
 2020-04-29 13:24:52 +01:00
law39
ff27d91b81 Updated Six Meanings Assessment to be compatible 
This assessment now correctly uses the AssessmentGenerator.
 2020-04-29 13:23:46 +01:00
maj83
332cfc6e7b Updated MatchTheMeaningController.java 2020-04-29 13:17:40 +01:00
Brad Corbett
d5b83532f2 Added goToNextQuestion to controllers. 2020-04-29 13:15:33 +01:00
law39
e826ee6159 Merge remote-tracking branch 'origin/master' 2020-04-29 13:12:07 +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
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
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