Commit graph

151 commits

Author SHA1 Message Date
kab74
2996adc409 Added a template for program. Added a list of issues. The template is not yet complete, needs some ironing out. 2020-04-25 16:30:49 +01:00
osp1
ddbf6c31b9 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-25 13:55:22 +01:00
osp1
19f8c439e6 Remastered old icons and added new icons, changed dir structure for icons 2020-04-25 13:55:14 +01:00
kab74
c76ae83470 Created template for WelshVocabularyTutor. And a list of issues to add to git. Plus there are still some issues needing resolving with the template,
but I'll speak to osp1 about it.
2020-04-25 10:46:33 +01:00
osp1
8e214baefd Added 'resources' directory and added icons in both black and white
- Added '/src/resources' directory for resources to be used in the program
or any future documentation
- Added 'src/resources/icons' directory which holds all the icons needed
for the program
- Added black versions of the icons
- Added white versions of the icons
2020-04-24 22:47:45 +01:00
law39
51d6b9692f Applied changes for SE.QA.09 compliance in live search
Applied changes to ensure compliance with the SE.QA.09 Java Coding Standards
2020-04-24 16:03:41 +01:00
law39
069e6df96a Added IntelliJ gitignore
Added IntelliJ gitignore to ignore files not required to be uploaded to GitLab, taken from https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
2020-04-22 19:17:47 +01:00
law39
b0a9ec99da Live search with verbs improved
Live search now matches both ['to' + a word] or [a word] if the word is a verb
2020-04-22 19:04:58 +01:00
law39
f281d46ffa Fixed table highlighting
Fixed live search table highlighting bug which caused random highlighted rows to appear
2020-04-21 22:30:13 +01:00
law39
60e85fe782 Live Search demo added
Currently breaks the row highlighting to show if it's a practice word or not.
2020-04-21 22:11:30 +01:00
maj83
c24215dea5 Small changes to randomizing questions and how they appear 2020-04-21 14:54:19 +01:00
Brad Corbett
502605464e Uploaded minutes for 21-04-2020. 2020-04-21 14:30:38 +01:00
maj83
f537f3a25b Added loading from dictionary. 2020-04-21 12:49:45 +01:00
maj83
4c1eccb458 Added loading from dictionary. 2020-04-21 12:49:27 +01:00
Brad Corbett
e3f0f9d2b9 Fixed image in translationTest, and loads from dictionary.
Replaced submit button with an arrow, and words are now drawn from practice list.
2020-04-21 12:37:53 +01:00
Brad Corbett
15b5afae18 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-21 12:14:55 +01:00
Brad Corbett
3d168594d8 Added changes to TranslationTest. 2020-04-21 07:43:48 +01:00
top19
5201776c6b Added updated sharedcodecontroller with methods ready to be implemented. 2020-04-20 22:42:57 +01:00
osp1
bdfe4305ba Delete 2020-04-14_minutes.txt 2020-04-20 21:49:08 +01:00
osp1
aced2fba1b Amended 2020-04-14 minutes, based on Waylen's response 2020-04-20 21:47:16 +01:00
maj83
d530f6c79a Added method for checking answers 2020-04-20 18:20:03 +01:00
maj83
b0866ff3c2 Added method for checking answers 2020-04-20 18:15:43 +01:00
maj83
9c67c40eec Added method for checking answers 2020-04-20 18:15:23 +01:00
top19
fbde4e6ec4 Added flashcard project that implements the arrow buttons 2020-04-19 16:37:24 +01:00
osp1
630f089ac0 Added flashcard icon, renamed and resorted the icons. 2020-04-18 18:26:16 +01:00
top19
730645e832 Added updated version of flashcard demo that includes arrow buttons and updated JSON code that handles practice words. 2020-04-16 16:58:49 +01:00
Brad Corbett
8a984edecb Added minutes for 14-04-2020. 2020-04-14 21:12:58 +01:00
osp1
1b01686a44 Added directory for this working week 2020-04-14 16:02:15 +01:00
osp1
47ee823ea8 Dictionary practise words now persistent with highliting and FR10 2020-04-14 15:09:22 +01:00
kab74
62196ea5d4 Made JSONprocessor comply with QA 9 Java Coding Standards 2020-04-14 13:17:24 +01:00
kab74
7e6cb6178a Made JSON package comply with QA 9 Java Standards 2020-04-14 11:36:54 +01:00
maj83
e9c420402a Match the meaning concept 2020-04-14 11:32:01 +01:00
top19
d0e259e637 Added initial sharedcode controller. 2020-04-14 00:23:51 +01:00
Brad Corbett
9763362765 Completed spikework on Translation Test 2020-04-13 23:42:38 +01:00
maj83
caf1fb2508 Delete encodings.xml 2020-04-13 23:01:00 +01:00
maj83
c23b82af4c Upload New File 2020-04-13 23:00:39 +01:00
maj83
c98d6a9d27 Add new directory 2020-04-13 22:59:35 +01:00
maj83
9a849bb52f Delete Match_the_meaning.iml 2020-04-13 22:57:25 +01:00
maj83
1bce0dcb75 Upload New File 2020-04-13 22:57:16 +01:00
maj83
1390f1c15e Match the meaning code concept 2020-04-13 22:49:11 +01:00
top19
9bdee19cf7 Fixed compiler errors when trying to use JSONExample on other computers. 2020-04-13 10:27:04 +01:00
kab74
8b508a4f81 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-04-13 10:05:08 +01:00
top19
3012358b56 Added updated example of the JSON that works with practice words 2020-04-10 19:05:25 +01:00
osp1
435e099237 Updated minutes from 2020-04-07 after receiving update on the work Luke and Brad have done this week. 2020-04-08 17:46:51 +01:00
osp1
043e6109d4 Added directory for this week and add Dictionary Page work from last week 2020-04-07 16:03:14 +01:00
osp1
b1dcd269a2 Added minutes for 2020-04-07 2020-04-07 14:04:43 +01:00
Brad Corbett
bb0211a551 Added 'Translation' test demo project. 2020-04-07 03:27:12 +01:00
top19
aac3f3df6c Added flashcard demo project 2020-04-06 13:04:02 +01:00
top19
e4638542eb Added flashcard demo 2020-04-06 09:47:23 +01:00
osp1
60858aca43 Added my work on the Dictionary page from this week 2020-04-05 22:21:04 +01:00