@@ -66,7 +70,7 @@
{{/canmanagecoursecompetencies}}
{{#competency}}
-
+ {{#str}}userplans, competency{{/str}}
+
+
{{#usercompetencycourse}}
{{#str}}proficient, tool_lp{{/str}}
diff --git a/admin/tool/lp/tests/behat/plan_crud.feature b/admin/tool/lp/tests/behat/plan_crud.feature
index d2ca869842c..0fbbfd183a0 100644
--- a/admin/tool/lp/tests/behat/plan_crud.feature
+++ b/admin/tool/lp/tests/behat/plan_crud.feature
@@ -130,3 +130,35 @@ Feature: Manage plearning plan
When I click on "Delete" "button" in the "Confirm" "dialogue"
And I wait until the page is ready
Then I should not see "Science plan Year-4"
+
+ Scenario: See a learning plan from a course
+ Given the following lp "plans" exist:
+ | name | user | description |
+ | Science plan Year-manage | admin | science plan description |
+ And the following lp "frameworks" exist:
+ | shortname | idnumber |
+ | Framework 1 | sc-y-2 |
+ And the following lp "competencies" exist:
+ | shortname | framework |
+ | comp1 | sc-y-2 |
+ | comp2 | sc-y-2 |
+ And I follow "Learning plans"
+ And I should see "Science plan Year-manage"
+ And I follow "Science plan Year-manage"
+ And I should see "Add competency"
+ And I press "Add competency"
+ And "Competency picker" "dialogue" should be visible
+ And I select "comp1" of the competency tree
+ When I click on "Add" "button" in the "Competency picker" "dialogue"
+ Then "comp1" "table_row" should exist
+ And I create a course with:
+ | Course full name | New course fullname |
+ | Course short name | New course shortname |
+ And I follow "New course fullname"
+ And I follow "Competencies"
+ And I press "Add competencies to course"
+ And "Competency picker" "dialogue" should be visible
+ And I select "comp1" of the competency tree
+ And I click on "Add" "button" in the "Competency picker" "dialogue"
+ And I should see "Learning plans"
+ And I should see "Science plan Year-manage"
diff --git a/competency/classes/api.php b/competency/classes/api.php
index 9d04083bf49..97edf6390c9 100644
--- a/competency/classes/api.php
+++ b/competency/classes/api.php
@@ -3191,6 +3191,34 @@ class api {
return $plancompetency;
}
+ /**
+ * List the plans with a competency.
+ *
+ * @param int $userid The user id we want the plans for.
+ * @param int $competencyorid The competency, or its ID.
+ * @return array[plan] Array of learning plans.
+ */
+ public static function list_plans_with_competency($userid, $competencyorid) {
+ global $USER;
+
+ static::require_enabled();
+ $competencyid = $competencyorid;
+ $competency = null;
+ if (is_object($competencyid)) {
+ $competency = $competencyid;
+ $competencyid = $competency->get('id');
+ }
+
+ $plans = plan::get_by_user_and_competency($userid, $competencyid);
+ foreach ($plans as $index => $plan) {
+ // Filter plans we cannot read.
+ if (!$plan->can_read()) {
+ unset($plans[$index]);
+ }
+ }
+ return $plans;
+ }
+
/**
* List the competencies in a user plan.
*
diff --git a/competency/tests/api_test.php b/competency/tests/api_test.php
index 705a32a65fa..3ecf3e9942d 100644
--- a/competency/tests/api_test.php
+++ b/competency/tests/api_test.php
@@ -4631,4 +4631,38 @@ class core_competency_api_testcase extends advanced_testcase {
$this->assertEquals($uc1b->get('id'), $result['competencies'][0]->usercompetency->get('id'));
$this->assertEquals($uc1c->get('id'), $result['competencies'][1]->usercompetency->get('id'));
}
+
+ /**
+ * Test we can get all of a users plans with a competency.
+ */
+ public function test_list_plans_with_competency() {
+ $this->resetAfterTest(true);
+ $this->setAdminUser();
+ $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
+
+ $u1 = $this->getDataGenerator()->create_user();
+ $tpl = $this->getDataGenerator()->get_plugin_generator('core_competency')->create_template();
+
+ // Create a framework and assign competencies.
+ $framework = $lpg->create_framework();
+ $c1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id')));
+
+ // Create two plans and assign the competency to each.
+ $plan1 = $lpg->create_plan(array('userid' => $u1->id));
+ $plan2 = $lpg->create_plan(array('userid' => $u1->id));
+
+ $lpg->create_plan_competency(array('planid' => $plan1->get('id'), 'competencyid' => $c1->get('id')));
+ $lpg->create_plan_competency(array('planid' => $plan2->get('id'), 'competencyid' => $c1->get('id')));
+
+ // Create one more plan without the competency.
+ $plan3 = $lpg->create_plan(array('userid' => $u1->id));
+
+ $plans = api::list_plans_with_competency($u1->id, $c1);
+
+ $this->assertEquals(2, count($plans));
+
+ $this->assertEquals(reset($plans)->get('id'), $plan1->get('id'));
+ $this->assertEquals(end($plans)->get('id'), $plan2->get('id'));
+ }
+
}
diff --git a/lang/en/competency.php b/lang/en/competency.php
index 42377c73682..404798791d3 100644
--- a/lang/en/competency.php
+++ b/lang/en/competency.php
@@ -107,6 +107,7 @@ $string['invalidpersistenterror'] = 'Error: {$a}';
$string['invalidplan'] = 'Invalid learning plan';
$string['invalidtaxonomy'] = 'Invalid taxonomy: {$a}';
$string['invalidurl'] = 'The URL is not valid. Make sure it starts with \'http://\' or \'https://\'.';
+$string['nouserplanswithcompetency'] = 'No learning plans contain this competency.';
$string['planstatusactive'] = 'Active';
$string['planstatuscomplete'] = 'Complete';
$string['planstatusdraft'] = 'Draft';
{{{competency.shortname}}} {{competency.idnumber}}
@@ -95,16 +99,30 @@ {{/canmanagecoursecompetencies}}-
-
+ {{#str}}activities{{/str}}
+
{{name}}
{{/coursemodules}}
{{^coursemodules}}
- - {{#str}}noactivities, tool_lp{{/str}} +
- {{#str}}noactivities, tool_lp{{/str}} {{/coursemodules}}
-
{{#coursemodules}}
+
{{/competencies}}
diff --git a/admin/tool/lp/templates/user_competency_summary_in_course.mustache b/admin/tool/lp/templates/user_competency_summary_in_course.mustache
index 22cf96d6005..ce80bbbd5a4 100644
--- a/admin/tool/lp/templates/user_competency_summary_in_course.mustache
+++ b/admin/tool/lp/templates/user_competency_summary_in_course.mustache
@@ -65,6 +65,19 @@
{{/user}}
{{/displayuser}}
+ + {{#str}}userplans, core_competency{{/str}} +
-
+ {{#plans}}
+
- {{{name}}} + {{/plans}} + {{^plans}} +
- {{#str}}nouserplanswithcompetency, core_competency{{/str}} + {{/plans}} +
+
-
+ {{#plans}}
+
- {{{name}}} + {{/plans}} + {{^plans}} +
- {{#str}}nouserplanswithcompetency, competency{{/str}} + {{/plans}} +