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

120 commits

Author SHA1 Message Date
top19
6cab2a0264 Integrated sharedcodecontroller with the self assessments. 2020-04-30 09:48:06 +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
top19
134e942740 Made SharedCodeController properly switch to the self assessments when clicking 'Study'. 2020-04-30 09:22:39 +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