diff --git a/admin/tool/lp/tests/behat/course_competencies.feature b/admin/tool/lp/tests/behat/course_competencies.feature index b0e443bc1ae..ddf92705022 100644 --- a/admin/tool/lp/tests/behat/course_competencies.feature +++ b/admin/tool/lp/tests/behat/course_competencies.feature @@ -5,8 +5,8 @@ Feature: See the competencies for an activity on the course competencies page. Background: Given the following "core_competency > frameworks" exist: - | shortname | idnumber | - | Test-Framework | ID-FW1 | + | shortname | idnumber | + | Test-Framework | ID-FW1 | And the following "core_competency > competencies" exist: | shortname | competencyframework | | Test-Comp1 | ID-FW1 | diff --git a/admin/tool/lp/tests/behat/framework_crud.feature b/admin/tool/lp/tests/behat/framework_crud.feature index c290a905a2f..67777aa0e05 100644 --- a/admin/tool/lp/tests/behat/framework_crud.feature +++ b/admin/tool/lp/tests/behat/framework_crud.feature @@ -30,8 +30,8 @@ Feature: Manage competency frameworks Scenario: Read a framework Given the following "core_competency > frameworks" exist: - | shortname | idnumber | - | Science Year-2 | sc-y-2 | + | shortname | idnumber | + | Science Year-2 | sc-y-2 | And I navigate to "Competencies > Competency frameworks" in site administration And I should see "Science Year-2" When I click on "Science Year-2" "link" @@ -39,8 +39,8 @@ Feature: Manage competency frameworks Scenario: Edit a framework Given the following "core_competency > frameworks" exist: - | shortname | idnumber | - | Science Year-3 | sc-y-3 | + | shortname | idnumber | + | Science Year-3 | sc-y-3 | And I navigate to "Competencies > Competency frameworks" in site administration And I should see "Science Year-3" And I click on "Edit" of edit menu in the "Science Year-3" row @@ -53,8 +53,8 @@ Feature: Manage competency frameworks Scenario: Delete a framework Given the following "core_competency > frameworks" exist: - | shortname | idnumber | - | Science Year-4 | sc-y-4 | + | shortname | idnumber | + | Science Year-4 | sc-y-4 | And I navigate to "Competencies > Competency frameworks" in site administration And I should see "Science Year-4" And I should see "sc-y-4" @@ -71,23 +71,23 @@ Feature: Manage competency frameworks Scenario: Edit a framework with competencies in user competency Given the following "core_competency > frameworks" exist: - | shortname | idnumber | - | Science Year-5 | sc-y-5 | + | shortname | idnumber | + | Science Year-5 | sc-y-5 | And the following "core_competency > competencies" exist: - | shortname | competencyframework | - | Comp1 | sc-y-5 | - | Comp2 | sc-y-5 | + | shortname | competencyframework | idnumber | + | Comp1 | sc-y-5 | Comp1 | + | Comp2 | sc-y-5 | Comp2 | And the following "core_competency > plans" exist: - | name | user | description | + | name | user | description | | Plan Science-5 | admin | Plan description | - And the following lp "plancompetencies" exist: - | plan | competency | - | Plan Science-5 | Comp1 | - | Plan Science-5 | Comp2 | - And the following lp "usercompetencies" exist: - | user | competency | - | admin | Comp1 | - | admin | Comp2 | + And the following "core_competency > plan_competency" exist: + | plan | competency | + | Plan Science-5 | Comp1 | + | Plan Science-5 | Comp2 | + And the following "core_competency > user_competency" exist: + | user | competency | + | admin | Comp1 | + | admin | Comp2 | And I navigate to "Competencies > Competency frameworks" in site administration And I should see "Science Year-5" And I click on "Edit" of edit menu in the "Science Year-5" row @@ -101,23 +101,23 @@ Feature: Manage competency frameworks Scenario: Edit a framework with competencies in user competency plan Given the following "core_competency > frameworks" exist: - | shortname | idnumber | - | Science Year-6 | sc-y-6 | + | shortname | idnumber | + | Science Year-6 | sc-y-6 | And the following "core_competency > competencies" exist: - | shortname | competencyframework | - | Comp1 | sc-y-6 | - | Comp2 | sc-y-6 | + | shortname | competencyframework | idnumber | + | Comp1 | sc-y-6 | Comp1 | + | Comp2 | sc-y-6 | Comp2 | And the following "core_competency > plans" exist: - | name | user | description | + | name | user | description | | Plan Science-6 | admin | Plan description | - And the following lp "plancompetencies" exist: - | plan | competency | - | Plan Science-6 | Comp1 | - | Plan Science-6 | Comp2 | - And the following lp "usercompetencyplans" exist: - | user | competency | plan | - | admin | Comp1 | Plan Science-6 | - | admin | Comp2 | Plan Science-6 | + And the following "core_competency > plan_competency" exist: + | plan | competency | + | Plan Science-6 | Comp1 | + | Plan Science-6 | Comp2 | + And the following "core_competency > user_competency_plans" exist: + | user | competency | plan | + | admin | Comp1 | Plan Science-6 | + | admin | Comp2 | Plan Science-6 | And I navigate to "Competencies > Competency frameworks" in site administration And I should see "Science Year-6" And I click on "Edit" of edit menu in the "Science Year-6" row diff --git a/admin/tool/lp/tests/behat/plan_crud.feature b/admin/tool/lp/tests/behat/plan_crud.feature index ae6bb8d7a78..7dd38b6d18f 100644 --- a/admin/tool/lp/tests/behat/plan_crud.feature +++ b/admin/tool/lp/tests/behat/plan_crud.feature @@ -22,8 +22,8 @@ Feature: Manage plearning plan And I should see "Science plan" Scenario: Create a learning plan based on template - Given the following lp "templates" exist: - | shortname | description | + Given the following "core_competency > templates" exist: + | shortname | description | | Science template | science template description | And I am on homepage And I navigate to "Competencies > Learning plan templates" in site administration @@ -36,8 +36,8 @@ Feature: Manage plearning plan And I should see "Admin User" in the "Science template" "table_row" Scenario: Create a learning plan from template cohort - Given the following lp "templates" exist: - | shortname | description | + Given the following "core_competency > templates" exist: + | shortname | description | | Science template cohort | science template description | And the following "users" exist: | username | firstname | lastname | email | @@ -63,7 +63,7 @@ Feature: Manage plearning plan Scenario: Read a learning plan Given the following "core_competency > plans" exist: - | name | user | description | + | name | user | description | | Science plan Year-1 | admin | science plan description | And I follow "Learning plans" And I should see "Science plan Year-1" @@ -73,7 +73,7 @@ Feature: Manage plearning plan Scenario: Manage a learning plan competencies Given the following "core_competency > plans" exist: - | name | user | description | + | name | user | description | | Science plan Year-manage | admin | science plan description | And the following "core_competency > frameworks" exist: | shortname | idnumber | @@ -99,7 +99,7 @@ Feature: Manage plearning plan Scenario: Edit a learning plan Given the following "core_competency > plans" exist: - | name | user | description | + | name | user | description | | Science plan Year-2 | admin | science plan description | | Science plan Year-3 | admin | science plan description | And I follow "Learning plans" @@ -114,7 +114,7 @@ Feature: Manage plearning plan Scenario: Delete a learning plan Given the following "core_competency > plans" exist: - | name | user | description | + | name | user | description | | Science plan Year-4 | admin | science plan description | And I follow "Learning plans" And I should see "Science plan Year-4" @@ -131,11 +131,11 @@ Feature: Manage plearning plan Scenario: See a learning plan from a course Given the following "core_competency > plans" exist: - | name | user | description | + | name | user | description | | Science plan Year-manage | admin | science plan description | And the following "core_competency > frameworks" exist: - | shortname | idnumber | - | Framework 1 | sc-y-2 | + | shortname | idnumber | + | Framework 1 | sc-y-2 | And the following "core_competency > competencies" exist: | shortname | competencyframework | | comp1 | sc-y-2 | diff --git a/admin/tool/lp/tests/behat/plan_workflow.feature b/admin/tool/lp/tests/behat/plan_workflow.feature index 7f350bb604c..f9b811df6d1 100644 --- a/admin/tool/lp/tests/behat/plan_workflow.feature +++ b/admin/tool/lp/tests/behat/plan_workflow.feature @@ -32,18 +32,18 @@ Feature: Manage plan workflow | user2 | usermanageownplan | System | | | manager1 | manageplan | System | | And the following "core_competency > frameworks" exist: - | shortname | idnumber | - | Test-Framework | ID-FW1 | + | shortname | idnumber | + | Test-Framework | ID-FW1 | And the following "core_competency > competencies" exist: - | shortname | competencyframework | - | Test-Comp1 | ID-FW1 | - | Test-Comp2 | ID-FW1 | + | shortname | competencyframework | idnumber | + | Test-Comp1 | ID-FW1 | Test-Comp1 | + | Test-Comp2 | ID-FW1 | Test-Comp2 | And the following "core_competency > plans" exist: - | name | user | description | - | Test-Plan1 | user1 | Description of plan for user 1 | - | Test-Plan2 | user2 | Description of plan for user 2 | - And the following lp "plancompetencies" exist: - | plan | competency | + | name | user | description | reviewer | status | + | Test-Plan1 | user1 | Description of plan for user 1 | user1 | draft | + | Test-Plan2 | user2 | Description of plan for user 2 | user2 | draft | + And the following "core_competency > plan_competency" exist: + | plan | competency | | Test-Plan1 | Test-Comp1 | | Test-Plan1 | Test-Comp2 | | Test-Plan2 | Test-Comp1 | @@ -89,18 +89,18 @@ Feature: Manage plan workflow And I log out Scenario: Manager can see learning plan with status waiting for review - Given the following "core_competency > plans" exist: - | name | user | description | status | + Given the following "core_competency > plans" exist: + | name | user | description | status | | Test-Plan3 | user2 | Description of plan 3 for user 1 | waiting for review | - | Test-Plan4 | user1 | Description of plan 3 for user 1 | draft | + | Test-Plan4 | user1 | Description of plan 3 for user 1 | draft | When I log in as "manager1" Then I should see "Test-Plan3" And I should not see "Test-Plan4" And I log out Scenario: Manager can start review of learning plan with status waiting for review - Given the following "core_competency > plans" exist: - | name | user | description | status | + Given the following "core_competency > plans" exist: + | name | user | description | status | | Test-Plan3 | user1 | Description of plan 3 for user 1 | waiting for review | And I log in as "manager1" And I follow "Test-Plan3" @@ -111,8 +111,8 @@ Feature: Manage plan workflow And I log out Scenario: Manager can reject a learning plan with status in review - Given the following "core_competency > plans" exist: - | name | user | description | status | reviewer | + Given the following "core_competency > plans" exist: + | name | user | description | status | reviewer | | Test-Plan3 | user1 | Description of plan 3 for user 1 | in review | manager1 | And I log in as "manager1" And I follow "Test-Plan3" @@ -124,8 +124,8 @@ Feature: Manage plan workflow And I log out Scenario: Manager can accept a learning plan with status in review - Given the following "core_competency > plans" exist: - | name | user | description | status | reviewer | + Given the following "core_competency > plans" exist: + | name | user | description | status | reviewer | | Test-Plan3 | user1 | Description of plan 3 for user 1 | in review | manager1 | And I log in as "manager1" And I follow "Test-Plan3" @@ -137,8 +137,8 @@ Feature: Manage plan workflow And I log out Scenario: Manager send back to draft an active learning plan - Given the following "core_competency > plans" exist: - | name | user | description | status | reviewer | + Given the following "core_competency > plans" exist: + | name | user | description | status | reviewer | | Test-Plan3 | user1 | Description of plan 3 for user 1 | active | manager1 | | Test-Plan4 | user1 | Description of plan 4 for user 1 | active | manager1 | And I am on the "user1" "user > profile" page logged in as "manager1" @@ -153,8 +153,8 @@ Feature: Manage plan workflow And I log out Scenario: Manager change an active learning plan to completed - Given the following "core_competency > plans" exist: - | name | user | description | status | reviewer | + Given the following "core_competency > plans" exist: + | name | user | description | status | reviewer | | Test-Plan3 | user1 | Description of plan 3 for user 1 | active | manager1 | | Test-Plan4 | user1 | Description of plan 4 for user 1 | active | manager1 | And I am on the "user1" "user > profile" page logged in as "manager1" @@ -172,8 +172,8 @@ Feature: Manage plan workflow And I log out Scenario: Manager reopen a complete learning plan - Given the following "core_competency > plans" exist: - | name | user | description | status | reviewer | + Given the following "core_competency > plans" exist: + | name | user | description | status | reviewer | | Test-Plan3 | user1 | Description of plan 3 for user 1 | complete | manager1 | | Test-Plan4 | user1 | Description of plan 4 for user 1 | complete | manager1 | And I am on the "user1" "user > profile" page logged in as "manager1" diff --git a/admin/tool/lp/tests/behat/template_crud.feature b/admin/tool/lp/tests/behat/template_crud.feature index a5386ffccb9..158626b5245 100644 --- a/admin/tool/lp/tests/behat/template_crud.feature +++ b/admin/tool/lp/tests/behat/template_crud.feature @@ -21,8 +21,8 @@ Feature: Manage plearning plan templates And I should see "Science template" Scenario: Read a learning plan template - Given the following lp "templates" exist: - | shortname | description | + Given the following "core_competency > templates" exist: + | shortname | description | | Science template Year-2 | science template description | And I navigate to "Competencies > Learning plan templates" in site administration And I should see "Science template Year-2" @@ -31,8 +31,8 @@ Feature: Manage plearning plan templates And I should see "Learning plan template competencies" Scenario: Edit a learning plan template - Given the following lp "templates" exist: - | shortname | description | + Given the following "core_competency > templates" exist: + | shortname | description | | Science template Year-3 | science template description | And I navigate to "Competencies > Learning plan templates" in site administration And I should see "Science template Year-3" @@ -44,8 +44,8 @@ Feature: Manage plearning plan templates And I should see "Science template Year-3 Edited" Scenario: Delete a learning plan template - Given the following lp "templates" exist: - | shortname | description | + Given the following "core_competency > templates" exist: + | shortname | description | | Science template Year-4 | science template description | And I navigate to "Competencies > Learning plan templates" in site administration And I should see "Science template Year-4" diff --git a/admin/tool/lp/tests/behat/user_evidence_comp_link.feature b/admin/tool/lp/tests/behat/user_evidence_comp_link.feature index 20db85cc54d..ab7ed711f54 100644 --- a/admin/tool/lp/tests/behat/user_evidence_comp_link.feature +++ b/admin/tool/lp/tests/behat/user_evidence_comp_link.feature @@ -6,21 +6,21 @@ Feature: Manage competencies linked to evidence of prior learning Background: Given the following "core_competency > frameworks" exist: - | shortname | idnumber | - | Test-Framework | ID-FW1 | + | shortname | idnumber | + | Test-Framework | ID-FW1 | And the following "core_competency > competencies" exist: - | shortname | competencyframework | - | Test-Comp1 | ID-FW1 | - | Test-Comp2 | ID-FW1 | + | shortname | competencyframework | idnumber | + | Test-Comp1 | ID-FW1 | Test-Comp1 | + | Test-Comp2 | ID-FW1 | Test-Comp2 | And the following "core_competency > plans" exist: - | name | user | description | + | name | user | description | | Test-Plan | admin | Plan description | - And the following lp "plancompetencies" exist: - | plan | competency | + And the following "core_competency > plan_competency" exist: + | plan | competency | | Test-Plan | Test-Comp1 | | Test-Plan | Test-Comp2 | - And the following lp "userevidence" exist: - | name | description | user | + And the following "core_competency > user_evidence" exist: + | name | description | user | | Test-Evidence | Description evidence | admin | When I log in as "admin" And I follow "Profile" in the user menu @@ -51,12 +51,12 @@ Feature: Manage competencies linked to evidence of prior learning Then "Test-Comp2" "table_row" should exist Scenario: Unlink competency from evidence of prior learning - Given the following lp "userevidencecompetencies" exist: - | userevidence | competency | + Given the following "core_competency > user_evidence_competency" exist: + | userevidence | competency | | Test-Evidence | Test-Comp1 | | Test-Evidence | Test-Comp2 | - Given the following lp "usercompetencies" exist: - | user | competency | + And the following "core_competency > user_competency" exist: + | user | competency | | admin | Test-Comp1 | | admin | Test-Comp2 | And I follow "Evidence of prior learning" diff --git a/admin/tool/lp/tests/behat/user_evidence_crud.feature b/admin/tool/lp/tests/behat/user_evidence_crud.feature index 6effaae37d4..478e9e1d088 100644 --- a/admin/tool/lp/tests/behat/user_evidence_crud.feature +++ b/admin/tool/lp/tests/behat/user_evidence_crud.feature @@ -24,8 +24,8 @@ Feature: Manage evidence of prior learning And I should see "Evidence-1" Scenario: Read an evidence of prior learning - Given the following lp "userevidence" exist: - | name | description | user | + Given the following "core_competency > user_evidence" exist: + | name | description | user | | Evidence-2 | Evidence-2 description | user1 | And I follow "Evidence of prior learning" And I should see "List of evidence" @@ -34,8 +34,8 @@ Feature: Manage evidence of prior learning Then I should see "Evidence-2" Scenario: Edit an evidence of prior learning - Given the following lp "userevidence" exist: - | name | description | user | + Given the following "core_competency > user_evidence" exist: + | name | description | user | | Evidence-3 | Evidence-3 description | user1 | And I follow "Evidence of prior learning" And I should see "List of evidence" @@ -47,8 +47,8 @@ Feature: Manage evidence of prior learning And I should see "Evidence-3 Edited" Scenario: Delete an evidence of prior learning - Given the following lp "userevidence" exist: - | name | description | user | + Given the following "core_competency > user_evidence" exist: + | name | description | user | | Evidence-4 | Evidence-4 description | user1 | And I follow "Evidence of prior learning" And I should see "List of evidence" @@ -62,10 +62,10 @@ Feature: Manage evidence of prior learning Scenario: List evidences of prior learning Given the following "users" exist: - | username | firstname | lastname | email | - |user2 | User | 2 | user2@example.com | - And the following lp "userevidence" exist: - | name | description | user | + | username | firstname | lastname | email | + | user2 | User | 2 | user2@example.com | + And the following "core_competency > user_evidence" exist: + | name | description | user | | Evidence-5 | Evidence-5 description | user1 | | Evidence-6 | Evidence-6 description | user2 | And I follow "Evidence of prior learning" diff --git a/admin/tool/lp/tests/behat/view_competencies.feature b/admin/tool/lp/tests/behat/view_competencies.feature index addbff17320..118fc5f4e52 100644 --- a/admin/tool/lp/tests/behat/view_competencies.feature +++ b/admin/tool/lp/tests/behat/view_competencies.feature @@ -40,9 +40,9 @@ Feature: View competencies | competency | relatedcompetency | | desserts | cakes | And the following "core_competency > plans" exist: - | name | description | competencies | user | - | Cookery | Cookery is important | salads, desserts, cakes | student1 | - | Literacy | Literacy is important | reading, writing | student1 | + | name | description | competencies | user | status | + | Cookery | Cookery is important | salads, desserts, cakes | student1 | active | + | Literacy | Literacy is important | reading, writing | student1 | active | And the following "core_competency > course_competencies" exist: | course | competency | | C1 | salads | diff --git a/badges/tests/behat/criteria_competency.feature b/badges/tests/behat/criteria_competency.feature index a0f9034e110..7a1effb50c1 100644 --- a/badges/tests/behat/criteria_competency.feature +++ b/badges/tests/behat/criteria_competency.feature @@ -15,8 +15,8 @@ Feature: Award badges based on competency completion | user | course | role | | user1 | C1 | student | And the following "core_competency > frameworks" exist: - | shortname | idnumber | - | Framework 1 | sc-y-2 | + | shortname | idnumber | + | Framework 1 | sc-y-2 | And the following "core_competency > competencies" exist: | shortname | competencyframework | | comp1 | sc-y-2 | diff --git a/competency/tests/generator/behat_core_competency_generator.php b/competency/tests/generator/behat_core_competency_generator.php index 687a35abad7..2d2f9cb1ad5 100644 --- a/competency/tests/generator/behat_core_competency_generator.php +++ b/competency/tests/generator/behat_core_competency_generator.php @@ -57,7 +57,13 @@ class behat_core_competency_generator extends behat_generator_base { 'singular' => 'plan', 'datagenerator' => 'plan', 'required' => ['name'], - 'switchids' => ['user' => 'userid'], + 'switchids' => ['user' => 'userid', 'status' => 'status'], + ], + 'plan_competencies' => [ + 'singular' => 'plan_competency', + 'datagenerator' => 'plan_competency', + 'required' => ['plan', 'competency'], + 'switchids' => ['competency' => 'competencyid', 'plan' => 'planid'], ], 'related_competencies' => [ 'singular' => 'related_competency', @@ -83,14 +89,32 @@ class behat_core_competency_generator extends behat_generator_base { 'required' => ['plan', 'competency', 'user'], 'switchids' => ['plan' => 'planid', 'competency' => 'competencyid', 'user' => 'userid'], ], + 'user_evidence' => [ + 'singular' => 'user_evidence', + 'datagenerator' => 'user_evidence', + 'required' => ['user', 'name'], + 'switchids' => ['user' => 'userid'], + ], + 'user_evidence_competency' => [ + 'singular' => 'user_evidence_competency', + 'datagenerator' => 'user_evidence_competency', + 'required' => ['userevidence', 'competency'], + 'switchids' => ['userevidence' => 'userevidenceid', 'competency' => 'competencyid'], + ], + 'templates' => [ + 'singular' => 'template', + 'datagenerator' => 'template', + 'required' => ['shortname'], + 'switchids' => ['context' => 'contextid'], + ], ]; } /** - * Get the competecy framework id using an idnumber. + * Get the competency framework id using an idnumber. * * @param string $idnumber - * @return int The competecy framework id + * @return int The competency framework id */ protected function get_competencyframework_id(string $idnumber): int { global $DB; @@ -103,10 +127,10 @@ class behat_core_competency_generator extends behat_generator_base { } /** - * Get the competecy id using an idnumber. + * Get the competency id using an idnumber. * * @param string $idnumber - * @return int The competecy id + * @return int The competency id */ protected function get_competency_id(string $idnumber): int { global $DB; @@ -135,10 +159,10 @@ class behat_core_competency_generator extends behat_generator_base { } /** - * Get the related competecy id using an idnumber. + * Get the related competency id using an idnumber. * * @param string $idnumber - * @return int The related competecy id + * @return int The related competency id */ protected function get_relatedcompetency_id(string $idnumber): int { return $this->get_competency_id($idnumber); @@ -208,6 +232,8 @@ class behat_core_competency_generator extends behat_generator_base { * @return array Processed data. */ protected function preprocess_plan(array $data): array { + global $DB, $USER; + if (isset($data['competencies'])) { $competencies = array_map('trim', str_getcsv($data['competencies'])); $data['competencyids'] = array_map([$this, 'get_competency_id'], $competencies); @@ -215,11 +241,20 @@ class behat_core_competency_generator extends behat_generator_base { unset($data['competencies']); } - global $USER; + if (isset($data['reviewer'])) { + if (is_number($data['reviewer'])) { + $data['reviewerid'] = $data['reviewer']; + } else { + if (!$userid = $DB->get_field('user', 'id', ['username' => $data['reviewer']])) { + throw new Exception('The specified user "' . $data['reviewer'] . '" could not be found.'); + } + $data['reviewerid'] = $userid; + } + unset($data['reviewer']); + } return $data + [ 'userid' => $USER->id, - 'status' => plan::STATUS_ACTIVE, ]; } @@ -258,4 +293,81 @@ class behat_core_competency_generator extends behat_generator_base { protected function get_data_generator(): core_competency_generator { return $this->componentdatagenerator; } + + /** + * Get the user evidence id using a name. + * + * @param string $name User evidence name. + * @return int The user evidence id + */ + protected function get_userevidence_id(string $name): int { + global $DB; + + if (!$id = $DB->get_field('competency_userevidence', 'id', ['name' => $name])) { + throw new Exception('The specified user evidence with name "' . $name . '" could not be found.'); + } + + return $id; + } + + /** + * Get the template competency id using a name. + * + * @param string $name Template competency name. + * @return int The template competency id + */ + protected function get_templatecompetency_id(string $name): int { + global $DB; + + if (!$id = $DB->get_field('competency_template', 'id', ['name' => $name])) { + throw new Exception('The specified template competency with name "' . $name . '" could not be found.'); + } + + return $id; + } + + /** + * Get the context id using a contextid. + * + * @param string $contextid Context id. + * @return int The context id + */ + protected function get_context_id(string $contextid): int { + global $DB; + + if (!$id = $DB->get_field('context', 'id', ['id' => $contextid])) { + throw new Exception('The specified context with id "' . $contextid . '" could not be found.'); + } + + return $id; + } + + /** + * Get the status id by status name. + * + * @param string $name Status name. + * @return int + */ + protected function get_status_id(string $name): int { + + switch ($name) { + case 'draft': + $status = plan::STATUS_DRAFT; + break; + case 'in review': + $status = plan::STATUS_IN_REVIEW; + break; + case 'waiting for review': + $status = plan::STATUS_WAITING_FOR_REVIEW; + break; + case 'complete': + $status = plan::STATUS_COMPLETE; + break; + default: + $status = plan::STATUS_ACTIVE; + break; + } + + return $status; + } } diff --git a/report/competency/tests/behat/breakdown_by_activity.feature b/report/competency/tests/behat/breakdown_by_activity.feature index 0cbc1bfce17..2608cd87ed4 100644 --- a/report/competency/tests/behat/breakdown_by_activity.feature +++ b/report/competency/tests/behat/breakdown_by_activity.feature @@ -6,8 +6,8 @@ Feature: See the competencies for an activity Background: Given the following "core_competency > frameworks" exist: - | shortname | idnumber | - | Test-Framework | ID-FW1 | + | shortname | idnumber | + | Test-Framework | ID-FW1 | And the following "core_competency > competencies" exist: | shortname | competencyframework | | Test-Comp1 | ID-FW1 |