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

325 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
aaf9e648a3 Merge remote-tracking branch 'origin/master' 2020-04-29 13:12:19 +01:00
law39
e826ee6159 Merge remote-tracking branch 'origin/master' 2020-04-29 13:12:07 +01:00
ncw
975f4289de Fixed Issue #19 
-Subject line to be changed from "Word Template" to "Test Specification"
-Config Ref: Updated to (DesignSpecGroup20).
-Status: Set to (Release).
 2020-04-29 13:12:05 +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
ncw
68a8ac7e8c Fixed issue #19 
-Subject line to be changed from "Word Template" to "Test Specification"
-Config Ref: Updated to (DesignSpecGroup20).
-Status: Set to (Release).
 2020-04-29 13:02:50 +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
ncw
c4a79d4cd5 Fixes issue #12 
-Replaced instances of WelshDictionary to Dictionary Entry.
-Version Number Updated
-CCF # updated.
 2020-04-29 11:35:42 +01:00
ncw
10b7395ee5 Fixes issue #12 
-Replaced instances of WelshDictionary to Dictionary Entry.
-Version Number Updated
-CCF # updated.
 2020-04-29 11:35:20 +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
ddb70a042c Merge remote-tracking branch 'origin/master' 2020-04-29 11:12:43 +01:00