Commit 05e8bc57 authored by Doris Tam's avatar Doris Tam Committed by Robert Lyon
Browse files

Bug 1810990: blocktypes: general attachments for composite type artefacts

for resume, re-order/rename functions to be more user readable

other:
    - other small typos in the feature file
    - tag sorting for blocks

Change-Id: I8f46bb55d8b43a2c450744e58bfd5dc971697273
parent 8c8ac45f
...@@ -248,7 +248,7 @@ class BehatDataGenerators extends BehatBase { ...@@ -248,7 +248,7 @@ class BehatDataGenerators extends BehatBase {
'required' => array('group', 'message', 'user') 'required' => array('group', 'message', 'user')
), ),
'personalinformation' => array( 'personalinformation' => array(
'datagenerator' => 'personalinformation', 'datagenerator' => 'resume_personalinformation',
'available' => array( 'available' => array(
'user' => 'text', 'user' => 'text',
'dateofbirth' => 'text', 'dateofbirth' => 'text',
...@@ -261,17 +261,18 @@ class BehatDataGenerators extends BehatBase { ...@@ -261,17 +261,18 @@ class BehatDataGenerators extends BehatBase {
'required' => array('user', 'dateofbirth') 'required' => array('user', 'dateofbirth')
), ),
'goals and skills' => array( 'goals and skills' => array(
'datagenerator' => 'goals_and_skills', 'datagenerator' => 'resume_goalsandskills',
'available' => array( 'available' => array(
'user' => 'text', 'user' => 'text',
'goaltype/skilltype' => 'text', 'goaltype/skilltype' => 'text',
'title' => 'text', 'title' => 'text',
'description' => 'text', 'description' => 'text',
'attachment' => 'text'
), ),
'required' => array('user','goaltype/skilltype','title') 'required' => array('user','goaltype/skilltype','title')
), ),
'interests' => array( 'interests' => array(
'datagenerator' => 'interests', 'datagenerator' => 'resume_interests',
'available' => array( 'available' => array(
'user' => 'text', 'user' => 'text',
'interest' => 'text', 'interest' => 'text',
...@@ -280,7 +281,7 @@ class BehatDataGenerators extends BehatBase { ...@@ -280,7 +281,7 @@ class BehatDataGenerators extends BehatBase {
'required' => array('user','interest','description') 'required' => array('user','interest','description')
), ),
'coverletters' => array( 'coverletters' => array(
'datagenerator' => 'coverletter', 'datagenerator' => 'resume_coverletter',
'available' => array( 'available' => array(
'user' => 'text', 'user' => 'text',
'content' => 'text' 'content' => 'text'
...@@ -288,7 +289,7 @@ class BehatDataGenerators extends BehatBase { ...@@ -288,7 +289,7 @@ class BehatDataGenerators extends BehatBase {
'required' => array('user','content') 'required' => array('user','content')
), ),
'educationhistory' => array( 'educationhistory' => array(
'datagenerator' => 'educationhistory', 'datagenerator' => 'resume_educationhistory',
'available' => array( 'available' => array(
'user' => 'text', 'user' => 'text',
'startdate' => 'text', 'startdate' => 'text',
...@@ -297,12 +298,13 @@ class BehatDataGenerators extends BehatBase { ...@@ -297,12 +298,13 @@ class BehatDataGenerators extends BehatBase {
'institutionaddress' => 'text', 'institutionaddress' => 'text',
'qualtype' => 'text', 'qualtype' => 'text',
'qualname' => 'text', 'qualname' => 'text',
'qualdescription' => 'text' 'qualdescription' => 'text',
'attachment' => 'text'
), ),
'required' => array('user','startdate','institution') 'required' => array('user','startdate','institution')
), ),
'employmenthistory' => array( 'employmenthistory' => array(
'datagenerator' => 'employmenthistory', 'datagenerator' => 'resume_employmenthistory',
'available' => array( 'available' => array(
'user' => 'text', 'user' => 'text',
'startdate' => 'text', 'startdate' => 'text',
...@@ -310,12 +312,13 @@ class BehatDataGenerators extends BehatBase { ...@@ -310,12 +312,13 @@ class BehatDataGenerators extends BehatBase {
'employer' => 'text', 'employer' => 'text',
'employeraddress' => 'text', 'employeraddress' => 'text',
'jobtitle' => 'text', 'jobtitle' => 'text',
'positiondescription' => 'text' 'positiondescription' => 'text',
'attachment' => 'text'
), ),
'required' => array ('user','startdate','employer','jobtitle') 'required' => array ('user','startdate','employer','jobtitle')
), ),
'contactinformation' => array( 'contactinformation' => array(
'datagenerator' => 'contactinformation', 'datagenerator' => 'resume_contactinformation',
'available' => array( 'available' => array(
'user' => 'text', 'user' => 'text',
'email' => 'text', 'email' => 'text',
...@@ -332,36 +335,39 @@ class BehatDataGenerators extends BehatBase { ...@@ -332,36 +335,39 @@ class BehatDataGenerators extends BehatBase {
), ),
'required' => array('user','email') 'required' => array('user','email')
), ),
'certifications and accreditations' => array( 'achievements' => array(
'datagenerator' => 'certification', 'datagenerator' => 'resume_certification',
'available' => array( 'available' => array(
'user' => 'text', 'user' => 'text',
'date' => 'text', 'date' => 'text',
'title' => 'text', 'title' => 'text',
'description' => 'text' 'description' => 'text',
'attachment' => 'text'
), ),
'required' => array('user','title') 'required' => array('user','title')
), ),
'books and publications' => array( 'books and publications' => array(
'datagenerator' => 'book', 'datagenerator' => 'resume_book',
'available' => array( 'available' => array(
'user' => 'text', 'user' => 'text',
'date' => 'text', 'date' => 'text',
'title' => 'text', 'title' => 'text',
'contribution' => 'text', 'contribution' => 'text',
'description' => 'text', 'description' => 'text',
'url' => 'text' 'url' => 'text',
'attachment' => 'text'
), ),
'required' => array('user','date','title','contribution') 'required' => array('user','date','title','contribution')
), ),
'professionalmemberships' => array( 'professionalmemberships' => array(
'datagenerator' => 'membership', 'datagenerator' => 'resume_membership',
'available' => array( 'available' => array(
'user' => 'text', 'user' => 'text',
'startdate' => 'text', 'startdate' => 'text',
'enddate' => 'text', 'enddate' => 'text',
'title' => 'text', 'title' => 'text',
'description' => 'text' 'description' => 'text',
'attachment' => 'text'
), ),
'required' => array('user','startdate','title') 'required' => array('user','startdate','title')
) )
......
...@@ -29,19 +29,19 @@ Background: ...@@ -29,19 +29,19 @@ Background:
| UserB | 01/01/2018 | Germany | New Zealand | | | | | UserB | 01/01/2018 | Germany | New Zealand | | | |
And the following "goals and skills" exist: And the following "goals and skills" exist:
| user | goaltype/skilltype | title | description | | user | goaltype/skilltype | title | description | attachment |
| UserA | academicgoal | fix lateness | pack bag night before | | UserA | academicgoal | fix lateness | pack bag night before | Image1.jpg |
| UserA | careergoal | meow | cat a lyst | | UserA | careergoal | meow | cat a lyst | users.csv |
| UserA | personalgoal | gym shark | do do do | | UserA | personalgoal | gym shark | do do do | Image2.png |
| UserA | academicskill | alphabet | abc | | UserA | academicskill | alphabet | abc | groups.csv |
| UserA | personalskill | whistle | *inset whistle noise | | UserA | personalskill | whistle | *inset whistle noise | Image1.jpg |
| UserA | workskill | team work | axe throwing? | | UserA | workskill | team work | axe throwing? | users.csv |
| UserB | academicgoal | academi doooo| de sc ri p t i o n nn | | UserB | academicgoal | academi doooo| description goal/skill| Image2.png |
| UserB | careergoal | careerg doooo| de sc ri p t i o n nn | | UserB | careergoal | careerg doooo| description goal/skill| groups.csv |
| UserB | personalgoal | persona doooo| de sc ri p t i o n nn | | UserB | personalgoal | persona doooo| description goal/skill| Image1.jpg |
| UserB | academicskill | academi doooo| de sc ri p t i o n nn | | UserB | academicskill | academi doooo| description goal/skill| users.csv |
| UserB | personalskill | persona doooo| de sc ri p t i o n nn | | UserB | personalskill | persona doooo| description goal/skill| Image2.png |
| UserB | workskill | workski doooo| de sc ri p t i o n nn | | UserB | workskill | workski doooo| description goal/skill| groups.csv |
And the following "interests" exist: And the following "interests" exist:
# Available fields: user*, interest*, description # Available fields: user*, interest*, description
...@@ -57,16 +57,18 @@ Background: ...@@ -57,16 +57,18 @@ Background:
| UserB |UserB In Te Reo Māori, "mahara" means "to think, thinking, thought" and that fits the purpose of Mahara very well. Having been started in New Zealand, it was fitting to choose a Māori word to signify the concept of the ePortfolio system | | UserB |UserB In Te Reo Māori, "mahara" means "to think, thinking, thought" and that fits the purpose of Mahara very well. Having been started in New Zealand, it was fitting to choose a Māori word to signify the concept of the ePortfolio system |
And the following "educationhistory" exist: And the following "educationhistory" exist:
| user | institution | startdate | enddate | qualdescription | # Available fields: user, startdate, enddate, institution, institutionaddress, qualtype, qualname,qualdescription,attachment
| UserA | Catalystania | 12/12/12 | 12/12/21 | 9 years | | user | institution | startdate | enddate | qualdescription | attachment |
| UserB | Catalystonia | 21/10/21 | 10/12/26 | educationnn | | UserA | Catalystania | 12/12/12 | 12/12/21 | 9 years | Image2.png |
| UserA | Catalyst High| 12/12/20 | 12/12/21 | 9 years | | UserB | Catalystonia | 21/10/21 | 10/12/26 | educationnn | Image2.png |
| UserB | Catalyst High| 21/10/20 | 10/12/26 | educationnn | | UserA | Catalyst High| 12/12/20 | 12/12/21 | 9 years | Image2.png |
| UserB | Catalyst High| 21/10/20 | 10/12/26 | educationnn | Image2.png |
And the following "employmenthistory" exist: And the following "employmenthistory" exist:
| user | employer | startdate | enddate | jobtitle | positiondescription | # Available fields: user, startdate, enddate, employer, employeraddress, jobtitle, positiondescription
| UserA | Eggman | 01/02/03 | | crystal dr | locating magic crystals| | user | employer | startdate | enddate | jobtitle | positiondescription | attachment |
| UserB | Cat | 02/02/00 | | Cat sitter | pat kittens | | UserA | Eggman | 01/02/03 | | crystal dr | locating magic crystals| Image1.jpg |
| UserB | Cat | 02/02/00 | | Cat sitter | pat kittens | Image1.jpg |
And the following "contactinformation" exist: And the following "contactinformation" exist:
# Available fields: user*, email*, officialwebsite, personalwebsite, blogaddress, town, city/region, country, homenumber, # Available fields: user*, email*, officialwebsite, personalwebsite, blogaddress, town, city/region, country, homenumber,
...@@ -74,20 +76,23 @@ Background: ...@@ -74,20 +76,23 @@ Background:
| user | email | mobilenumber | | user | email | mobilenumber |
| UserA | userA@mahara.com | 01234567890 | | UserA | userA@mahara.com | 01234567890 |
And the following "certifications and accreditations" exist: And the following "achievements" exist:
| user | date | title | description | # Available fields: user, date, title, description, attachment
| UserA | 02/02/80 | European Witchcraft | While the streets may be education enough for real gangsters, this course aims to teach students about the history and culture of the mafia around the world. [Williams College] | | user | date | title | attachment | description |
| UserB | 02/02/80 | European Witchcraft | While the streets may be education enough for real gangsters, this course aims to teach students about the history and culture of the mafia around the world. [Williams College] | | UserA | 02/02/80 | European Witchcraft | Image3.png | While the streets may be education enough for real gangsters, this course aims to teach students about the history and culture of the mafia around the world. [Williams College] |
| UserB | 02/02/80 | Western Witchcraft | mahara_about.pdf | While the streets may be education enough for real gangsters, this course aims to teach students about the history and culture of the mafia around the world. [Williams College] |
And the following "books and publications" exist: And the following "books and publications" exist:
| user | date | title | contribution| description | # Available fields: user, date, title, contribution, description, url, attachment
| UserA | 05/05/50 | The Life-Changing Magic of not Tidying Up | co-author | seven million copies worldwide and have been translated into thirty-eight languages.| | user | date | title | contribution| description | attachment |
| UserB | 05/05/50 | The Life-Changing Magic of not Tidying Up | co-author | seven million copies worldwide and have been translated into thirty-eight languages.| | UserA | 05/05/50 | The Life-Changing Magic of not Tidying Up | co-author | seven million copies worldwide and have been translated into thirty-eight languages.| Image3.png |
| UserB | 05/05/50 | The Life-Changing Magic of not Tidying Up | co-author | seven million copies worldwide and have been translated into thirty-eight languages.| Image3.png |
And the following "professionalmemberships" exist: And the following "professionalmemberships" exist:
| user | startdate | title | description | # Available fields: user, startdate, enddate, title, description, attachment
| UserA | 20/02/2008 | cat art company coordinator | catch up with cats | | user | startdate | title | description | attachment |
| UserB | 20/02/2008 | cat art company catcher | catch fish for cats| | UserA | 20/02/2008 | cat art company coordinator | catch up with cats | Image3.png |
| UserB | 20/02/2008 | cat art company catcher | catch fish for cats| Image3.png |
And the following "forums" exist: And the following "forums" exist:
...@@ -126,7 +131,7 @@ Background: ...@@ -126,7 +131,7 @@ Background:
# Available fields: owner*, ownertype*, title*, description, tags # Available fields: owner*, ownertype*, title*, description, tags
| owner | ownertype | title | description | tags | | owner | ownertype | title | description | tags |
| UserA | user | journal1| this is journal1 | amber,brown,cobalt | | UserA | user | journal1| this is journal1 | amber,brown,cobalt |
| Group1| group | journal2| this is journal1 | amber,brown,cobalt | | Group1| group | journal2| this is journal2 | amber,brown,cobalt |
And the following "journalentries" exist: And the following "journalentries" exist:
# Available fields: owner*, ownertype*, title*, entry*, blog, tags, draft # Available fields: owner*, ownertype*, title*, entry*, blog, tags, draft
...@@ -221,9 +226,6 @@ Background: ...@@ -221,9 +226,6 @@ Background:
| Tagged journal entries| taggedposts | Page Four A | no | tags=cats; maxposts=5;showfullentries=yes;copytype=nocopy | | Tagged journal entries| taggedposts | Page Four A | no | tags=cats; maxposts=5;showfullentries=yes;copytype=nocopy |
| Open Badges |openbadgedisplayer| Page Four A | no | | | Open Badges |openbadgedisplayer| Page Four A | no | |
And the following "blocks" exist: And the following "blocks" exist:
# Page One B # Page One B
| title | type | page |retractable | data | | title | type | page |retractable | data |
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment