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

315 commits

Author SHA1 Message Date
top19
31936e7ff4 Fixed issue where 10 tests werent being generated. 2020-05-01 09:56:22 +01:00
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
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
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