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
ncw
86f62e76cd
fixed iSSUE #10
...
-Removed (Use Case 5.1 Start ’Match The Meaning’ test)
-Removed (Use Case 5.2 Start ’6 Meanings’ test)
-Removed (Use Case 5.3 Start ’Translation ’ test)
-Added small section to (Use Case 5 Start a test) that outlines the three possible tests that can be selected at random.
2020-04-29 17:16:41 +01:00
ncw
bbffe4526a
Fixed Issue #10
...
-Removed (Use Case 5.1 Start ’Match The Meaning’ test)
-Removed (Use Case 5.2 Start ’6 Meanings’ test)
-Removed (Use Case 5.3 Start ’Translation ’ test)
-Added small section to (Use Case 5 Start a test) that outlines the three possible tests that can be selected at random.
2020-04-29 17:11:43 +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
