MDL-53700 competency: Migrating other competency related plugins

diff --git a/admin/tool/cohortroles/classes/api.php b/admin/tool/cohortroles/classes/api.php
index 53057bc..e610e35 100644 (file)
--- a/admin/tool/cohortroles/classes/api.php
+++ b/admin/tool/cohortroles/classes/api.php
@@ -25,7 +25,7 @@ namespace tool_cohortroles;
 
 use stdClass;
 use context_system;
-use tool_lp\invalid_persistent_exception;
+use core_competency\invalid_persistent_exception;
 
 /**
  * Class for doing things with cohort roles.

diff --git a/admin/tool/cohortroles/classes/cohort_role_assignment.php b/admin/tool/cohortroles/classes/cohort_role_assignment.php
index 6c1e4a1..08ac464 100644 (file)
--- a/admin/tool/cohortroles/classes/cohort_role_assignment.php
+++ b/admin/tool/cohortroles/classes/cohort_role_assignment.php
@@ -24,7 +24,7 @@
 namespace tool_cohortroles;
 
 use lang_string;
-use tool_lp\persistent;
+use core_competency\persistent;
 
 /**
  * Class for loading/storing cohort_role_assignments from the DB.

diff --git a/admin/tool/cohortroles/tests/api_test.php b/admin/tool/cohortroles/tests/api_test.php
index ab08e5e..27c4cd8 100644 (file)
--- a/admin/tool/cohortroles/tests/api_test.php
+++ b/admin/tool/cohortroles/tests/api_test.php
@@ -75,7 +75,7 @@ class tool_cohortroles_api_testcase extends advanced_testcase {
     }
 
     public function test_create_cohort_role_assignment_with_invalid_data() {
-        $this->setExpectedException('tool_lp\invalid_persistent_exception');
+        $this->setExpectedException('core_competency\invalid_persistent_exception');
         $this->setAdminUser();
         $params = (object) array(
             'userid' => $this->userassignto->id,

diff --git a/admin/tool/lpmigrate/classes/framework_mapper.php b/admin/tool/lpmigrate/classes/framework_mapper.php
index 56664c0..83090fe 100644 (file)
--- a/admin/tool/lpmigrate/classes/framework_mapper.php
+++ b/admin/tool/lpmigrate/classes/framework_mapper.php
@@ -25,7 +25,7 @@
 namespace tool_lpmigrate;
 defined('MOODLE_INTERNAL') || die();
 
-use tool_lp\api;
+use core_competency\api;
 
 /**
  * Framework mapper class.

diff --git a/admin/tool/lpmigrate/classes/framework_processor.php b/admin/tool/lpmigrate/classes/framework_processor.php
index 697b47c..7c4f394 100644 (file)
--- a/admin/tool/lpmigrate/classes/framework_processor.php
+++ b/admin/tool/lpmigrate/classes/framework_processor.php
@@ -27,10 +27,10 @@ defined('MOODLE_INTERNAL') || die();
 
 use coding_exception;
 use moodle_exception;
-use tool_lp\api;
-use tool_lp\competency;
-use tool_lp\course_competency;
-use tool_lp\course_module_competency;
+use core_competency\api;
+use core_competency\competency;
+use core_competency\course_competency;
+use core_competency\course_module_competency;
 
 /**
  * Processor class.

diff --git a/admin/tool/lpmigrate/classes/output/migrate_framework_results.php b/admin/tool/lpmigrate/classes/output/migrate_framework_results.php
index 405023f..065f63a 100644 (file)
--- a/admin/tool/lpmigrate/classes/output/migrate_framework_results.php
+++ b/admin/tool/lpmigrate/classes/output/migrate_framework_results.php
@@ -31,8 +31,10 @@ use moodle_url;
 use renderable;
 use templatable;
 use stdClass;
-use tool_lp\competency;
-use tool_lp\competency_framework;
+use core_competency\competency;
+use core_competency\competency_framework;
+use core_competency\external\competency_exporter;
+use core_competency\external\competency_framework_exporter;
 use tool_lpmigrate\framework_processor;
 
 /**
@@ -95,9 +97,9 @@ class migrate_framework_results implements renderable, templatable {
         $data->unmappedfrom = array();
         $data->unmappedto = array();
 
-        $exporter = new \tool_lp\external\competency_framework_exporter($this->frameworkfrom);
+        $exporter = new competency_framework_exporter($this->frameworkfrom);
         $data->frameworkfrom = $exporter->export($output);
-        $exporter = new \tool_lp\external\competency_framework_exporter($this->frameworkto);
+        $exporter = new competency_framework_exporter($this->frameworkto);
         $data->frameworkto = $exporter->export($output);
 
         $fromcontext = $this->frameworkfrom->get_context();
@@ -105,12 +107,12 @@ class migrate_framework_results implements renderable, templatable {
 
         $compcontext = null;
         foreach ($this->unmappedfrom as $comp) {
-            $exporter = new \tool_lp\external\competency_exporter($comp, array('context' => $fromcontext));
+            $exporter = new competency_exporter($comp, array('context' => $fromcontext));
             $data->unmappedfrom[] = $exporter->export($output);
         }
 
         foreach ($this->unmappedto as $comp) {
-            $exporter = new \tool_lp\external\competency_exporter($comp, array('context' => $tocontext));
+            $exporter = new competency_exporter($comp, array('context' => $tocontext));
             $data->unmappedto[] = $exporter->export($output);
         }
 

diff --git a/admin/tool/lpmigrate/frameworks.php b/admin/tool/lpmigrate/frameworks.php
index 58fd3ac..a5edea4 100644 (file)
--- a/admin/tool/lpmigrate/frameworks.php
+++ b/admin/tool/lpmigrate/frameworks.php
@@ -67,7 +67,8 @@ if ($form->is_cancelled()) {
     $unmappedfrom = $mapper->get_unmapped_objects_from();
     $unmappedto = $mapper->get_unmapped_objects_to();
     $renderable = new \tool_lpmigrate\output\migrate_framework_results($context, $processor,
-        \tool_lp\api::read_framework($data->from), \tool_lp\api::read_framework($data->to), $unmappedfrom, $unmappedto);
+        \core_competency\api::read_framework($data->from), \core_competency\api::read_framework($data->to),
+        $unmappedfrom, $unmappedto);
     echo $output->render($renderable);
 
 } else {

diff --git a/admin/tool/lpmigrate/settings.php b/admin/tool/lpmigrate/settings.php
index d8636be..26b3622 100644 (file)
--- a/admin/tool/lpmigrate/settings.php
+++ b/admin/tool/lpmigrate/settings.php
@@ -23,7 +23,9 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-if (\tool_lp\api::is_enabled()) {
+if (\core_competency\api::is_enabled()) {
+
+    $parentname = 'competencies';
 
     // Manage competency frameworks page.
     $temp = new admin_externalpage(
@@ -32,6 +34,6 @@ if (\tool_lp\api::is_enabled()) {
         new moodle_url('/admin/tool/lpmigrate/frameworks.php'),
         array('tool/lpmigrate:frameworksmigrate')
     );
-    $ADMIN->add('toollprootpage', $temp);
+    $ADMIN->add($parentname, $temp);
 
 }

diff --git a/admin/tool/lpmigrate/tests/processor_test.php b/admin/tool/lpmigrate/tests/processor_test.php
index 816cde1..441c446 100644 (file)
--- a/admin/tool/lpmigrate/tests/processor_test.php
+++ b/admin/tool/lpmigrate/tests/processor_test.php
@@ -25,10 +25,10 @@
 defined('MOODLE_INTERNAL') || die();
 global $CFG;
 
-use \tool_lp\course_competency;
-use \tool_lp\course_module_competency;
-use \tool_lpmigrate\framework_mapper;
-use \tool_lpmigrate\framework_processor;
+use core_competency\course_competency;
+use core_competency\course_module_competency;
+use tool_lpmigrate\framework_mapper;
+use tool_lpmigrate\framework_processor;
 
 /**
  * Framework processor testcase.
@@ -49,7 +49,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase {
     public function setUp() {
         $this->resetAfterTest(true);
         $dg = $this->getDataGenerator();
-        $lpg = $dg->get_plugin_generator('tool_lp');
+        $lpg = $dg->get_plugin_generator('core_competency');
 
         $f1 = $lpg->create_framework(array('idnumber' => 'BIO2015'));
         $f2 = $lpg->create_framework(array('idnumber' => 'BIO2016'));
@@ -313,7 +313,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase {
 
     public function test_destination_competency_exists() {
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         // Pre-add the new competency to course 1.
         $lpg->create_course_competency(array('courseid' => $this->c1->id, 'competencyid' => $this->f2comps['A1']->get_id()));
@@ -361,7 +361,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase {
 
     public function test_destination_competency_exists_remove_original() {
         $this->setAdminUser();
-        $lpg = $this->getDataGenerator()->get_plugin_generator('tool_lp');
+        $lpg = $this->getDataGenerator()->get_plugin_generator('core_competency');
 
         // Pre-add the new competency to course 1.
         $lpg->create_course_competency(array('courseid' => $this->c1->id, 'competencyid' => $this->f2comps['A1']->get_id()));
@@ -410,7 +410,7 @@ class tool_lpmigrate_framework_processor_testcase extends advanced_testcase {
 
         $dg->enrol_user($u->id, $this->c1->id, 'editingteacher');
         $dg->enrol_user($u->id, $this->c2->id, 'editingteacher');
-        assign_capability('tool/lp:coursecompetencymanage', CAP_PROHIBIT, $role, $sysctx->id);
+        assign_capability('moodle/competency:coursecompetencymanage', CAP_PROHIBIT, $role, $sysctx->id);
         role_assign($role, $u->id, context_course::instance($this->c1->id)->id);
         role_assign($role, $u->id, context_module::instance($this->cms[$this->c2->id]['F1']->cmid)->id);
 

diff --git a/admin/tool/lpmigrate/version.php b/admin/tool/lpmigrate/version.php
index 5ef920c..8c3976b 100644 (file)
--- a/admin/tool/lpmigrate/version.php
+++ b/admin/tool/lpmigrate/version.php
@@ -28,5 +28,5 @@ $plugin->version   = 2016022401; // The current plugin version (Date: YYYYMMDDXX
 $plugin->requires  = 2014110400; // Requires this Moodle version.
 $plugin->component = 'tool_lpmigrate'; // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(
-    'tool_lp' => 2016020904
+    'tool_lp' => ANY_VERSION
 );

diff --git a/blocks/lp/block_lp.php b/blocks/lp/block_lp.php
index e7f0d1b..7093a4d 100644 (file)
--- a/blocks/lp/block_lp.php
+++ b/blocks/lp/block_lp.php
@@ -60,6 +60,7 @@ class block_lp extends block_base {
         if (isset($this->content)) {
             return $this->content;
         }
+        $this->content = new stdClass();
 
         $summary = new \block_lp\output\summary();
         if (!$summary->has_content()) {
@@ -67,7 +68,6 @@ class block_lp extends block_base {
         }
 
         $renderer = $this->page->get_renderer('block_lp');
-        $this->content = new stdClass();
         $this->content->text = $renderer->render($summary);
         $this->content->footer = '';
 

diff --git a/blocks/lp/classes/output/competencies_to_review_page.php b/blocks/lp/classes/output/competencies_to_review_page.php
index 3616995..233ab63 100644 (file)
--- a/blocks/lp/classes/output/competencies_to_review_page.php
+++ b/blocks/lp/classes/output/competencies_to_review_page.php
@@ -28,11 +28,11 @@ use renderable;
 use templatable;
 use renderer_base;
 use stdClass;
-use tool_lp\api;
-use tool_lp\external\competency_exporter;
-use tool_lp\external\user_competency_exporter;
-use tool_lp\external\user_summary_exporter;
 use moodle_url;
+use core_competency\api;
+use core_competency\external\competency_exporter;
+use core_competency\external\user_competency_exporter;
+use core_competency\external\user_summary_exporter;
 
 /**
  * Competencies to review renderable class.

diff --git a/blocks/lp/classes/output/plans_to_review_page.php b/blocks/lp/classes/output/plans_to_review_page.php
index e12ea7e..4920f1f 100644 (file)
--- a/blocks/lp/classes/output/plans_to_review_page.php
+++ b/blocks/lp/classes/output/plans_to_review_page.php
@@ -28,10 +28,10 @@ use renderable;
 use templatable;
 use renderer_base;
 use stdClass;
-use tool_lp\api;
-use tool_lp\external\plan_exporter;
-use tool_lp\external\user_summary_exporter;
 use moodle_url;
+use core_competency\api;
+use core_competency\external\plan_exporter;
+use core_competency\external\user_summary_exporter;
 
 /**
  * Plans to review renderable class.

diff --git a/blocks/lp/classes/output/summary.php b/blocks/lp/classes/output/summary.php
index fde4126..ff6459d 100644 (file)
--- a/blocks/lp/classes/output/summary.php
+++ b/blocks/lp/classes/output/summary.php
@@ -25,11 +25,12 @@
 namespace block_lp\output;
 defined('MOODLE_INTERNAL') || die();
 
-use tool_lp\api;
-use tool_lp\external\competency_exporter;
-use tool_lp\external\plan_exporter;
-use tool_lp\external\user_competency_exporter;
-use tool_lp\external\user_summary_exporter;
+use core_competency\api;
+use core_competency\external\competency_exporter;
+use core_competency\external\plan_exporter;
+use core_competency\external\user_competency_exporter;
+use core_competency\external\user_summary_exporter;
+use core_competency\plan;
 use renderable;
 use renderer_base;
 use templatable;
@@ -81,7 +82,7 @@ class summary implements renderable, templatable {
             if (count($plans) >= 3) {
                 break;
             }
-            if ($plan->get_status() == \tool_lp\plan::STATUS_ACTIVE) {
+            if ($plan->get_status() == plan::STATUS_ACTIVE) {
                 $plans[] = $plan;
             }
         }

diff --git a/blocks/lp/version.php b/blocks/lp/version.php
index f9ed86b..31fe05c 100644 (file)
--- a/blocks/lp/version.php
+++ b/blocks/lp/version.php
@@ -28,5 +28,5 @@ $plugin->version   = 2016011100;
 $plugin->requires  = 2014110400;
 $plugin->component = 'block_lp';
 $plugin->dependencies = array(
-    'tool_lp' => 2015111035
+    'tool_lp' => ANY_VERSION
 );

diff --git a/report/competency/amd/build/grading_popup.min.js b/report/competency/amd/build/grading_popup.min.js
index 7517b12..0bb5cc4 100644 (file)
Binary files a/report/competency/amd/build/grading_popup.min.js and b/report/competency/amd/build/grading_popup.min.js differ

diff --git a/report/competency/amd/src/grading_popup.js b/report/competency/amd/src/grading_popup.js
index 829aec2..305f708 100644 (file)
--- a/report/competency/amd/src/grading_popup.js
+++ b/report/competency/amd/src/grading_popup.js
@@ -61,7 +61,7 @@ define(['jquery', 'core/notification', 'core/str', 'core/ajax', 'core/log', 'cor
         // Log the user competency viewed in course event.
         requests[0].then(function(){
             ajax.call([{
-                methodname : 'tool_lp_user_competency_viewed_in_course',
+                methodname : 'core_competency_user_competency_viewed_in_course',
                 args: { userid: userId, competencyid: competencyId, courseid: courseId },
                 fail: notification.exception
             }]);

diff --git a/report/competency/classes/external.php b/report/competency/classes/external.php
index 44e7411..01630d6 100644 (file)
--- a/report/competency/classes/external.php
+++ b/report/competency/classes/external.php
@@ -33,10 +33,10 @@ use external_function_parameters;
 use external_multiple_structure;
 use external_single_structure;
 use external_value;
+use core_competency\external\user_competency_course_exporter;
+use core_competency\external\user_summary_exporter;
 use tool_lp\external\competency_summary_exporter;
 use tool_lp\external\course_summary_exporter;
-use tool_lp\external\user_competency_course_exporter;
-use tool_lp\external\user_summary_exporter;
 
 /**
  * This is the external API for this report.
@@ -88,7 +88,7 @@ class external extends external_api {
         );
         $context = context_course::instance($params['courseid']);
         self::validate_context($context);
-        if (!is_enrolled($context, $params['userid'], 'tool/lp:coursecompetencygradable')) {
+        if (!is_enrolled($context, $params['userid'], 'moodle/competency:coursecompetencygradable')) {
             throw new coding_exception('invaliduser');
         }
 

diff --git a/report/competency/classes/output/report.php b/report/competency/classes/output/report.php
index 6ae3c77..59322c9 100644 (file)
--- a/report/competency/classes/output/report.php
+++ b/report/competency/classes/output/report.php
@@ -24,18 +24,18 @@
 namespace report_competency\output;
 
 use context_course;
-use tool_lp\external\competency_summary_exporter;
-use tool_lp\external\course_summary_exporter;
-use tool_lp\external\user_competency_course_exporter;
-use tool_lp\external\user_summary_exporter;
-use tool_lp\user_competency;
 use renderable;
 use core_user;
 use templatable;
 use renderer_base;
 use moodle_url;
 use stdClass;
-use tool_lp\api;
+use core_competency\api;
+use core_competency\external\user_competency_course_exporter;
+use core_competency\external\user_summary_exporter;
+use core_competency\user_competency;
+use tool_lp\external\competency_summary_exporter;
+use tool_lp\external\course_summary_exporter;
 
 /**
  * Class containing data for learning plan template competencies page

diff --git a/report/competency/classes/output/user_course_navigation.php b/report/competency/classes/output/user_course_navigation.php
index 9f71c7c..6b7a62b 100644 (file)
--- a/report/competency/classes/output/user_course_navigation.php
+++ b/report/competency/classes/output/user_course_navigation.php
@@ -27,7 +27,7 @@ use renderable;
 use renderer_base;
 use templatable;
 use context_course;
-use \tool_lp\external\user_summary_exporter;
+use core_competency\external\user_summary_exporter;
 use stdClass;
 
 /**
@@ -78,7 +78,7 @@ class user_course_navigation implements renderable, templatable {
         $data->baseurl = $this->baseurl;
         $data->groupselector = '';
 
-        if (has_capability('tool/lp:coursecompetencymanage', $context)) {
+        if (has_capability('moodle/competency:coursecompetencymanage', $context)) {
             $course = $DB->get_record('course', array('id' => $this->courseid));
             $currentgroup = groups_get_course_group($course, true);
             if ($currentgroup !== false) {
@@ -93,7 +93,7 @@ class user_course_navigation implements renderable, templatable {
             // Fetch current active group.
             $groupmode = groups_get_course_groupmode($course);
 
-            $users = get_enrolled_users($context, 'tool/lp:coursecompetencygradable', $currentgroup,
+            $users = get_enrolled_users($context, 'moodle/competency:coursecompetencygradable', $currentgroup,
                                         'u.*', null, 0, 0, $showonlyactiveenrol);
 
             $data->users = array();

diff --git a/report/competency/db/services.php b/report/competency/db/services.php
index efa9be0..dc13464 100644 (file)
--- a/report/competency/db/services.php
+++ b/report/competency/db/services.php
@@ -36,7 +36,7 @@ $functions = array(
         'classpath'    => '',
         'description'  => 'Load the data for the competency report in a course.',
         'type'         => 'read',
-        'capabilities' => 'tool/lp:coursecompetencyview',
+        'capabilities' => 'moodle/competency:coursecompetencyview',
         'ajax'         => true,
     )
 );

diff --git a/report/competency/index.php b/report/competency/index.php
index 71c4c63..656619a 100644 (file)
--- a/report/competency/index.php
+++ b/report/competency/index.php
@@ -36,14 +36,14 @@ $currentuser = optional_param('user', null, PARAM_INT);
 $groupmode = groups_get_course_groupmode($course);
 $currentgroup = groups_get_course_group($course, true);
 if (empty($currentuser)) {
-    $gradable = get_enrolled_users($context, 'tool/lp:coursecompetencygradable', $currentgroup, 'u.id', null, 0, 1);
+    $gradable = get_enrolled_users($context, 'moodle/competency:coursecompetencygradable', $currentgroup, 'u.id', null, 0, 1);
     if (empty($gradable)) {
         $currentuser = 0;
     } else {
         $currentuser = array_pop($gradable)->id;
     }
 } else {
-    $gradable = get_enrolled_users($context, 'tool/lp:coursecompetencygradable', $currentgroup, 'u.id');
+    $gradable = get_enrolled_users($context, 'moodle/competency:coursecompetencygradable', $currentgroup, 'u.id');
     if (count($gradable) == 0) {
         $currentuser = 0;
     } else if (!in_array($currentuser, array_keys($gradable))) {

diff --git a/report/competency/lib.php b/report/competency/lib.php
index 9f9a54a..35bd488 100644 (file)
--- a/report/competency/lib.php
+++ b/report/competency/lib.php
@@ -34,7 +34,7 @@ defined('MOODLE_INTERNAL') || die;
  * @param stdClass $context The context of the course
  */
 function report_competency_extend_navigation_course($navigation, $course, $context) {
-    if (has_capability('tool/lp:coursecompetencyview', $context)) {
+    if (has_capability('moodle/competency:coursecompetencyview', $context)) {
         $url = new moodle_url('/report/competency/index.php', array('id' => $course->id));
         $name = get_string('pluginname', 'report_competency');
         $navigation->add($name, $url, navigation_node::TYPE_SETTING, null, null, new pix_icon('i/report', ''));