Commit graph

547 commits

Author SHA1 Message Date
top19
2129fc016b Updated addwordcontroller. 2020-05-01 09:51:39 +01:00
top19
5dcafb889f Fixed issue where you can add words with empty boxes. 2020-05-01 09:50:30 +01:00
top19
ea4dc91914 Fixed the issue where you can add the same word twice. 2020-05-01 09:36:48 +01:00
osp1
0bcd37a860 Removed headers on Dictionary and PracticeList. 2020-04-30 22:13:39 +01:00
maj83
277278377f "Fix" with overlapping text 2020-04-30 22:09:51 +01:00
law39
acaeac8f86 Updated ScreenSwitch
Screen Switch now uses the resources in the new cs221 package
2020-04-30 20:43:19 +01:00
law39
67e9ddd0b7 Moved resources
Moved resources to the cs221 directory
2020-04-30 20:42:34 +01:00
law39
dbf5d74ee8 Updated Translation Controller
Translation Controller now uses 3 space tabbing consistently
2020-04-30 19:09:42 +01:00
law39
6b5cf0e457 Updated ScreenSwitch Class
ScreenSwitch Class now uses 3 space tabbing consistently
2020-04-30 19:07:14 +01:00
law39
4198844932 Six meanings fxml updated
Six meanings fxml now references the refactored Controller name
2020-04-30 19:00:27 +01:00
law39
17aa379c58 Updated match the meaning fxml
Match the meaning fxml now references the refactored Controller name
2020-04-30 18:59:51 +01:00
law39
68eb646f58 Updated Assessment Generator
Assessment Generator now generates tests if the practice list is at least greater than 1
2020-04-30 18:59:01 +01:00
law39
258f433d71 Refactored classes into cs221
Classes now reside in the cs221 package rather than cs22120
2020-04-30 18:51:02 +01:00
osp1
dcb108ed75 Fixed self assessments fxml errors
- Fixed errors form using newer versions.
2020-04-30 18:24:52 +01:00
osp1
42579b785e Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-30 17:59:56 +01:00
osp1
2c7f4609c5 Updated the search & ordering on the PracticeList 2020-04-30 17:59:20 +01:00
top19
1e02fc446f Updated Applications documentation. 2020-04-30 17:46:21 +01:00
law39
e523f0f21a Merge remote-tracking branch 'origin/master' 2020-04-30 17:32:22 +01:00
law39
dde7702eab Search in Dictionary Controller updated
Search in Dictionary Controller now displays verbs by the search term to when you enter "to " only.
2020-04-30 17:32:03 +01:00
top19
fb1b3c4052 Updated most the controllers with comment blocks to describe each section of the class. 2020-04-30 17:17:28 +01:00
kab74
72c8ccf479 Fixed issue 15 and issue 14 2020-04-30 17:12:37 +01:00
law39
659ddba130 Resolution to Issue #21 - Search updated in Dictionary Controller
Search now only searches the language selected for sort, even after a language switch while searching.
2020-04-30 17:09:08 +01:00
osp1
b515c12bf8 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-30 17:06:10 +01:00
osp1
923db93fb3 Fixed ordering on Dictionary page 2020-04-30 17:05:55 +01:00
top19
706ff1085d Updated documentation for Flashcard and SharedCodeController. 2020-04-30 16:55:42 +01:00
top19
05fb74f9e8 Fixed and documented JSONTest. 2020-04-30 16:40:19 +01:00
osp1
fa72ad88cb Dictionary search is now closer to AT1
- Search now searches the beginning of words based on search language.
2020-04-30 16:30:29 +01:00
maj83
d108d1d028 Update SixMeaningsController.java 2020-04-30 16:14:25 +01:00
maj83
8bfdfd1c8b Update matchthemeaning.fxml 2020-04-30 16:13:09 +01:00
law39
c2e93150e7 Updated Assessment Generator
Assessment Generator has now been re-indented to have 3 spaces instead of 4
2020-04-30 16:11:08 +01:00
law39
a04d40af17 Merge remote-tracking branch 'origin/master' 2020-04-30 15:58:42 +01:00
law39
7d66185e82 Updated Translation Question Class
Corrected Javadoc tag.
Removed redundant imports.
Made variables final if possible.
2020-04-30 15:58:33 +01:00
law39
7cf9e2cfd6 Updated Six Meanings Class
Corrected Javadoc tag
Made variables final if possible
Removed redundant imports
2020-04-30 15:57:28 +01:00
top19
def72d7efc Fixed a number of warnings in the fxml files. 2020-04-30 15:54:52 +01:00
law39
ef6b6bca11 Updated Question Class
Switched from StringBuilder to String as simpler and  easier to maintain
2020-04-30 15:49:57 +01:00
Henry Dugmore
3cdaa7d442 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-30 15:49:36 +01:00
Henry Dugmore
d0259e29cb Added javadoc for addwordcontroller
added javadoc for addwordcontroller
2020-04-30 15:48:48 +01:00
law39
6c4d4834c4 Updated Match the Meaning Question Class
Made all variable I can final and corrected mistake in Javadoc tag
2020-04-30 15:48:29 +01:00
law39
b26a0d31a6 Updated Assessment Generator Class
Assessment Generator now only has warnings related to JavaDoc
2020-04-30 15:40:32 +01:00
law39
a2a79f4745 Added JavaDoc to selfassessment package
Added JavaDocs to classes in the selfassessment package as provided by Brad Corbett (brc9)
2020-04-30 15:32:05 +01:00
law39
8a8a4f1277 Removed Primary and Secondary FXML
Primary and Secondary FXML are no longer used and have been removed.
2020-04-30 15:21:47 +01:00
law39
4cc0451b73 Merge remote-tracking branch 'origin/master' 2020-04-30 15:11:14 +01:00
maj83
ec896b5952 Updated sixmeanings.fxml 2020-04-30 15:08:55 +01:00
maj83
e0d8414a7e Updated matchthemeaning.fxml 2020-04-30 15:08:31 +01:00
law39
f1d7cd1ea1 Translation Controller updated
Translation Controller now uses terminology consistent with other Questions by displaying Correct and total answers, rather than correct and wrong answers.
2020-04-30 14:43:56 +01:00
law39
1fc178be0c Assessment Generator Updated
Assessment Generator now stores the total correct answers and the total number of answers attempted.
It also displays the final score as a percentage with a maximum of two decimal places.
2020-04-30 14:42:09 +01:00
law39
20d6e5e874 Updated Six Meanings Controller
Six Meanings Controller is now consistent with other Questions in displaying correct and total answers from the Assessment Generator
2020-04-30 14:38:36 +01:00
law39
49a8d54bc5 Match the Meaning Controller Updated
Match the Meaning Controller now contains an Alert which is displayed if the user attempts to submit answers to the question with duplicate answers
2020-04-30 14:35:31 +01:00
law39
03e2a824bc Question Class Updated
Question Class now handles a dialogue box containing the User's feedback much better.
Now provides a breakdown of each question and which the user got correct.
2020-04-30 14:34:24 +01:00
law39
366c10984b Updated Match the meaning FXML
Now reads total answers than Wrong answers
2020-04-30 14:32:53 +01:00